Update copyright dates

61 files changed, 750 insertions, 218 deletions

diff --git a/gtk/po/cs.po b/gtk/po/cs.po
index 1f63fa4e7..d864a4cdb 100644
--- a/gtk/po/cs.po
+++ b/gtk/po/cs.po
@@ -428,9 +428,9 @@ msgid "About HandBrake"
 msgstr "O programu HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Autorské právo © 2008 - 2013 John Stebbins\nAutorské právo © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Autorské právo © 2008 - 2016 John Stebbins\nAutorské právo © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/da.po b/gtk/po/da.po
index 75bb1971a..a9cca7369 100644
--- a/gtk/po/da.po
+++ b/gtk/po/da.po
@@ -424,8 +424,8 @@ msgid "About HandBrake"
 msgstr ""
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
 msgstr ""
 
 msgid ""
diff --git a/gtk/po/de.po b/gtk/po/de.po
index 6982b2424..934ea8fc0 100644
--- a/gtk/po/de.po
+++ b/gtk/po/de.po
@@ -425,9 +425,9 @@ msgid "About HandBrake"
 msgstr "Über HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake-Entwickler"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake-Entwickler"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/es.po b/gtk/po/es.po
index d3ca56430..2a69329f6 100644
--- a/gtk/po/es.po
+++ b/gtk/po/es.po
@@ -425,9 +425,9 @@ msgid "About HandBrake"
 msgstr "Acerca de HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/fr.po b/gtk/po/fr.po
index c45bf21e3..a8b15ea84 100644
--- a/gtk/po/fr.po
+++ b/gtk/po/fr.po
@@ -429,9 +429,9 @@ msgid "About HandBrake"
 msgstr "A  propos d'HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/it_IT.po b/gtk/po/it_IT.po
index 3455d8030..f04abe5a3 100644
--- a/gtk/po/it_IT.po
+++ b/gtk/po/it_IT.po
@@ -425,8 +425,8 @@ msgid "About HandBrake"
 msgstr "Info su HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
 msgstr ""
 
 msgid ""
diff --git a/gtk/po/ja_JP.po b/gtk/po/ja_JP.po
index ab4da76f2..adfc52558 100644
--- a/gtk/po/ja_JP.po
+++ b/gtk/po/ja_JP.po
@@ -423,8 +423,8 @@ msgid "About HandBrake"
 msgstr "HandBrake について"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
 msgstr ""
 
 msgid ""
diff --git a/gtk/po/ko.po b/gtk/po/ko.po
index e34815500..0a7535f48 100644
--- a/gtk/po/ko.po
+++ b/gtk/po/ko.po
@@ -424,9 +424,9 @@ msgid "About HandBrake"
 msgstr "HandBrake 정보"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/no.po b/gtk/po/no.po
index e791f989b..fa3963e2c 100644
--- a/gtk/po/no.po
+++ b/gtk/po/no.po
@@ -424,9 +424,9 @@ msgid "About HandBrake"
 msgstr "Om HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Kopibeskyttet © 2008 - 2013 John Stebbins\nKopibeskyttet © 2004 - 2013 HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Kopibeskyttet © 2008 - 2016 John Stebbins\nKopibeskyttet © 2004 - 2016 HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/pt_BR.po b/gtk/po/pt_BR.po
index 0e580620a..65908cfe6 100644
--- a/gtk/po/pt_BR.po
+++ b/gtk/po/pt_BR.po
@@ -424,9 +424,9 @@ msgid "About HandBrake"
 msgstr "Sobre HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Copyright © 2008-2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Copyright © 2008-2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/ro_RO.po b/gtk/po/ro_RO.po
index fcf043df7..a0d4ae811 100644
--- a/gtk/po/ro_RO.po
+++ b/gtk/po/ro_RO.po
@@ -424,9 +424,9 @@ msgid "About HandBrake"
 msgstr "Despre Handbrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/ru.po b/gtk/po/ru.po
index 55071f769..3ca4ef990 100644
--- a/gtk/po/ru.po
+++ b/gtk/po/ru.po
@@ -426,9 +426,9 @@ msgid "About HandBrake"
 msgstr "О программе"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "Copyright © 2008 - 2013 John Stebbins\nCopyright © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "Copyright © 2008 - 2016 John Stebbins\nCopyright © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/th.po b/gtk/po/th.po
index 6311827f5..1869d26c7 100644
--- a/gtk/po/th.po
+++ b/gtk/po/th.po
@@ -425,9 +425,9 @@ msgid "About HandBrake"
 msgstr "เกี่ยวกับ HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2013 John Stebbins\n"
-"Copyright © 2004 - 2013, HandBrake Devs"
-msgstr "สงวนลิขสิทธิ์ © 2008 - 2013 John Stebbins\nสงวนลิขสิทธิ์ © 2004 - 2013, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
+msgstr "สงวนลิขสิทธิ์ © 2008 - 2016 John Stebbins\nสงวนลิขสิทธิ์ © 2004 - 2016, HandBrake Devs"
 
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
diff --git a/gtk/po/zh_CN.po b/gtk/po/zh_CN.po
index 7d9b585ea..b91d47e8f 100644
--- a/gtk/po/zh_CN.po
+++ b/gtk/po/zh_CN.po
@@ -455,11 +455,11 @@ msgid "About HandBrake"
 msgstr "关于 HandBrake"
 
 msgid ""
-"Copyright © 2008 - 2015 John Stebbins\n"
-"Copyright © 2004 - 2015, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
 msgstr ""
-"Copyright © 2008 - 2015 John Stebbins\n"
-"Copyright © 2004 - 2015, HandBrake Devs"
+"Copyright © 2008 - 2016 John Stebbins\n"
+"Copyright © 2004 - 2016, HandBrake Devs"
 
 msgid "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr "HandBrake 是一个遵循GPL许可，多平台，多线程的视频编码器。"
diff --git a/gtk/src/appcast.c b/gtk/src/appcast.c
index 43e45b6a9..1132f6615 100644
--- a/gtk/src/appcast.c
+++ b/gtk/src/appcast.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * appcast.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * appcast.c is free software.
  *
@@ -9,6 +9,17 @@
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
+ *
+ * appcast.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <stdio.h>
diff --git a/gtk/src/appcast.h b/gtk/src/appcast.h
index 06e54fa03..8d32a3da7 100644
--- a/gtk/src/appcast.h
+++ b/gtk/src/appcast.h
@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * appcast.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * appcast.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * appcast.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #if !defined(_GHB_APPCAST_H_)
 #define _GHB_APPCAST_H_
 
diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 4aef13697..0137b9f2b 100644
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * audiohandler.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * audiohandler.c is free software.
  *
@@ -9,6 +9,17 @@
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
+ *
+ * audiohandler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <glib/gi18n.h>
diff --git a/gtk/src/audiohandler.h b/gtk/src/audiohandler.h
index b0afdac0c..0014c3bd2 100644
--- a/gtk/src/audiohandler.h
+++ b/gtk/src/audiohandler.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * audiohandler.h
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * audiohandler.h is free software.
  *
@@ -10,7 +10,7 @@
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
- * callbacks.h is distributed in the hope that it will be useful,
+ * audiohandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index afe0a560d..e92c7ed7e 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * callbacks.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * callbacks.c is free software.
  *
@@ -9,6 +9,17 @@
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
+ *
+ * callbacks.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h
index 50d30053c..31dd16a35 100644
--- a/gtk/src/callbacks.h
+++ b/gtk/src/callbacks.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * callbacks.h
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * callbacks.h is free software.
  *
diff --git a/gtk/src/composite_example.c b/gtk/src/composite_example.c
index 7918b3083..f241edeca 100644
--- a/gtk/src/composite_example.c
+++ b/gtk/src/composite_example.c
@@ -1,3 +1,26 @@
+/*
+ * compositor_example.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * compositor_example.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * compositor_example.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include <gtk/gtk.h>
 #include "ghbcompositor.h"
 
diff --git a/gtk/src/create_resources.c b/gtk/src/create_resources.c
index 3bd3c23f4..47f03b2e1 100644
--- a/gtk/src/create_resources.c
+++ b/gtk/src/create_resources.c
@@ -1,3 +1,26 @@
+/*
+ * create_resources.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * create_resources.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * create_resources.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/gtk/src/ghb-dvd.c b/gtk/src/ghb-dvd.c
index a61604073..0a587d5e9 100644
--- a/gtk/src/ghb-dvd.c
+++ b/gtk/src/ghb-dvd.c
@@ -1,40 +1,24 @@
-/***************************************************************************
- *            ghb-dvd.c
- *
- *  Sat Apr 19 11:12:53 2008
- *  Copyright  2008-2015  John Stebbins
- *  <john at stebbins dot name>
- ****************************************************************************/
-
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ghb-dvd.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * ghb-dvd.c is free software.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
- */
-
-// Well, I waisted a bit of time on this.  It seems libhb has a function for
-// this that I hadn't discovered yet. hb_dvd_name().
-
-// I borrowed most of this from the udev utility vol_id
-// Here is the authors copyright.
-/*
- * volume_id - reads filesystem label and uuid
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  *
- * Copyright (C) 2004 Kay Sievers <[email protected]>
+ * ghb-dvd.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the
- *  Free Software Foundation version 2 of the License.
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #if defined(_WIN32)
diff --git a/gtk/src/ghb-dvd.h b/gtk/src/ghb-dvd.h
index f556d01d6..016adc7e5 100644
--- a/gtk/src/ghb-dvd.h
+++ b/gtk/src/ghb-dvd.h
@@ -1,17 +1,24 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ghb-dvd.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * ghb-dvd.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghb-dvd.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #if !defined(_GHB_DVD_H_)
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index f741f90b0..f406d63af 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -346,8 +346,8 @@ conjunction with the "Forced" option.</property>
     <property name="skip_pager_hint">True</property>
     <property name="program_name">HandBrake</property>
     <property name="version">0.9.2</property>
-    <property name="copyright" translatable="yes">Copyright © 2008 - 2015 John Stebbins
-Copyright © 2004 - 2015, HandBrake Devs</property>
+    <property name="copyright" translatable="yes">Copyright © 2008 - 2016 John Stebbins
+Copyright © 2004 - 2016, HandBrake Devs</property>
     <property name="comments" translatable="yes">HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.</property>
     <property name="website">http://handbrake.fr</property>
     <property name="website_label" translatable="yes">http://handbrake.fr</property>
diff --git a/gtk/src/ghbcellrenderertext.c b/gtk/src/ghbcellrenderertext.c
index deef928df..b110340d5 100644
--- a/gtk/src/ghbcellrenderertext.c
+++ b/gtk/src/ghbcellrenderertext.c
@@ -1,20 +1,25 @@
-/* gtkcellrenderertext.c
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <[email protected]>
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * gtkcellrenderertext.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * ghbcellrenderer.c is free software.
  *
- * This library is distributed in the hope that it will be useful,
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcellrenderer.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <config.h>
diff --git a/gtk/src/ghbcellrenderertext.h b/gtk/src/ghbcellrenderertext.h
index 4d6176f8c..f08eacaf3 100644
--- a/gtk/src/ghbcellrenderertext.h
+++ b/gtk/src/ghbcellrenderertext.h
@@ -16,6 +16,28 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+/*
+ * ghbcellrenderertext.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * callbacks.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcellrenderertext.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
 
 #ifndef __GHB_CELL_RENDERER_TEXT_H__
 #define __GHB_CELL_RENDERER_TEXT_H__
diff --git a/gtk/src/ghbcompat.h b/gtk/src/ghbcompat.h
index 4e95951b0..0c5ddbb33 100644
--- a/gtk/src/ghbcompat.h
+++ b/gtk/src/ghbcompat.h
@@ -1,3 +1,26 @@
+/*
+ * ghbcompat.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * ghbcompat.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcompat.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #if !defined(_GHB_COMPAT_H_)
 #define _GHB_COMPAT_H_
 
diff --git a/gtk/src/ghbcompositor.c b/gtk/src/ghbcompositor.c
index 4e7353da3..a3c08c6f9 100644
--- a/gtk/src/ghbcompositor.c
+++ b/gtk/src/ghbcompositor.c
@@ -25,6 +25,29 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+/*
+ * ghbcompositor.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * compositor.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcompositor.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include <config.h>
 #include <stdlib.h>
 #include "ghbcompat.h"
diff --git a/gtk/src/ghbcompositor.h b/gtk/src/ghbcompositor.h
index 7f6914e93..c298d818e 100644
--- a/gtk/src/ghbcompositor.h
+++ b/gtk/src/ghbcompositor.h
@@ -24,6 +24,30 @@
  * files for a list of changes.  These files are distributed with
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
+
+/*
+ * ghbcompositor.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * ghbcompositor.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ghbcompositor.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #ifndef __GHB_COMPOSITOR_H__
 #define __GHB_COMPOSITOR_H__
 
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index ab8d0dcde..b6f650ef4 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -1,26 +1,26 @@
-/***************************************************************************
- *            hb-backend.c
- *
- *  Fri Mar 28 10:38:44 2008
- *  Copyright  2008-2015  John Stebbins
- *  <john at stebbins dot name>
- ****************************************************************************/
-
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * hb-backend.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * hb-backend.c is free software.
  *
- * This program is distributed in the hope that it will be useful,
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * hb-backend.c is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #define _GNU_SOURCE
 #include <limits.h>
 #include <math.h>
diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index 4d946fc0d..865d71479 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -1,17 +1,24 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * hb-backend.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * hb-backend.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * hb-backend.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #if !defined(_HBBACKEND_H_)
diff --git a/gtk/src/icons.c b/gtk/src/icons.c
index aef0b056d..c27a5c8bb 100644
--- a/gtk/src/icons.c
+++ b/gtk/src/icons.c
@@ -1,3 +1,26 @@
+/*
+ * icons.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * icons.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * icons.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include "ghbcompat.h"
 #include "values.h"
 #include "resources.h"
diff --git a/gtk/src/icons.h b/gtk/src/icons.h
index 2dbe85cf4..2a8687017 100644
--- a/gtk/src/icons.h
+++ b/gtk/src/icons.h
@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * icons.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * icons.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * icons.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #if !defined(_GHB_ICONS_H_)
 #define _GHB_ICONS_H_
 
diff --git a/gtk/src/ini_to_plist.c b/gtk/src/ini_to_plist.c
index fd20323b3..6f7ec542b 100644
--- a/gtk/src/ini_to_plist.c
+++ b/gtk/src/ini_to_plist.c
@@ -1,3 +1,26 @@
+/*
+ * ini_to_plist.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * ini_to_plist.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ini_to_plist.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gstdio.h>
diff --git a/gtk/src/main.c b/gtk/src/main.c
index 8d63dd2a5..d367cc31a 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * main.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * main.c is free software.
  *
diff --git a/gtk/src/marshalers.c b/gtk/src/marshalers.c
index 39c6d363b..eb7079c30 100644
--- a/gtk/src/marshalers.c
+++ b/gtk/src/marshalers.c
@@ -1,3 +1,25 @@
+/*
+ * marshalers.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * marshalers.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * marshalers.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
 
 #include    <glib-object.h>
 
diff --git a/gtk/src/marshalers.h b/gtk/src/marshalers.h
index 0eec752f9..b005c43a5 100644
--- a/gtk/src/marshalers.h
+++ b/gtk/src/marshalers.h
@@ -1,3 +1,25 @@
+/*
+ * marshalers.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * marshalers.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * marshalers.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
 
 #ifndef __ghb_marshal_MARSHAL_H__
 #define __ghb_marshal_MARSHAL_H__
diff --git a/gtk/src/plist.c b/gtk/src/plist.c
index 9581b771f..c1f43f71a 100644
--- a/gtk/src/plist.c
+++ b/gtk/src/plist.c
@@ -1,3 +1,26 @@
+/*
+ * plist.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * plist.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * plist.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/gtk/src/plist.h b/gtk/src/plist.h
index 8b2498826..11ce15900 100644
--- a/gtk/src/plist.h
+++ b/gtk/src/plist.h
@@ -1,3 +1,26 @@
+/*
+ * plist.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * plist.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * plist.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #if !defined(_PLIST_H_)
 #define _PLIST_H_
 
diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 0a6d3dbc7..dc43d0fba 100644
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * presets.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * presets.c is free software.
  *
@@ -10,6 +10,16 @@
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
+ * presets.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/gtk/src/presets.h b/gtk/src/presets.h
index add5eac2b..2dd8849ef 100644
--- a/gtk/src/presets.h
+++ b/gtk/src/presets.h
@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * presets.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * presets.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * presets.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #if !defined(_GHB_PRESETS_H_)
 #define _GHB_PRESETS_H_
 
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 2497e72c0..ddb135f9e 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * preview.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * preview.c is free software.
  *
@@ -10,7 +10,18 @@
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
+ * preview.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #include <unistd.h>
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/gtk/src/preview.h b/gtk/src/preview.h
index bca4b6420..11633334b 100644
--- a/gtk/src/preview.h
+++ b/gtk/src/preview.h
@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * preview.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * preview.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * preview.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #if !defined(_GHB_PREVIEW_H_)
 #define _GHB_PREVIEW_H_
 
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 8069801a1..45c803f83 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -1,14 +1,25 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * callbacks.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * queuehandler.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * callbacks.c is free software.
+ * queuehandler.c is free software.
  *
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
+ *
+ * queuehandler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include "ghbcompat.h"
diff --git a/gtk/src/queuehandler.h b/gtk/src/queuehandler.h
index 2b1a18850..0bbb857e3 100644
--- a/gtk/src/queuehandler.h
+++ b/gtk/src/queuehandler.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * queuehandler.h
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * queuehandler.h is free software.
  *
@@ -10,7 +10,7 @@
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
- * callbacks.h is distributed in the hope that it will be useful,
+ * queuehandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
diff --git a/gtk/src/quotestring.c b/gtk/src/quotestring.c
index f29969bd2..09f0667d7 100644
--- a/gtk/src/quotestring.c
+++ b/gtk/src/quotestring.c
@@ -1,3 +1,26 @@
+/*
+ * quotestring.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * quotestring.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * quotestring.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <libgen.h>
diff --git a/gtk/src/renderer_button.c b/gtk/src/renderer_button.c
index 1eb140831..7b1f05108 100644
--- a/gtk/src/renderer_button.c
+++ b/gtk/src/renderer_button.c
@@ -1,3 +1,26 @@
+/*
+ * render_button.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * render_button.c is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * render_button.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #include "marshalers.h"
 #include "renderer_button.h"
 
diff --git a/gtk/src/renderer_button.h b/gtk/src/renderer_button.h
index 4c2f1f9a8..f8e65f37e 100644
--- a/gtk/src/renderer_button.h
+++ b/gtk/src/renderer_button.h
@@ -1,3 +1,26 @@
+/*
+ * render_button.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
+ *
+ * render_button.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * render_button.h is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
+ */
+
 #ifndef _RENDERER_BUTTON_H_
 #define _RENDERER_BUTTON_H_
 
diff --git a/gtk/src/resources.c b/gtk/src/resources.c
index d0b5dee4b..916c22c2f 100644
--- a/gtk/src/resources.c
+++ b/gtk/src/resources.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * resources.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * resources.c is free software.
  *
@@ -10,7 +10,18 @@
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
+ * resources.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gstdio.h>
diff --git a/gtk/src/resources.h b/gtk/src/resources.h
index c9378acc4..878e8643c 100644
--- a/gtk/src/resources.h
+++ b/gtk/src/resources.h
@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * resources.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * resources.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * resources.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #if !defined(_RESOURCES_H_)
 #define _RESOURCES_H_
 
diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index a12d71c26..738a6dc1d 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * settings.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * settings.c is free software.
  *
@@ -10,7 +10,18 @@
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
+ * settings.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #include <fcntl.h>
 #include <unistd.h>
 #include <glib.h>
diff --git a/gtk/src/settings.h b/gtk/src/settings.h
index 2367bcb6a..e13061467 100644
--- a/gtk/src/settings.h
+++ b/gtk/src/settings.h
@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * settings.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * settings.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * settings.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #if !defined(_SETTINGS_H_)
 #define _SETTINGS_H_
 
diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index f348ff440..fedd85cf5 100644
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * subtitlehandler.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * subtitlehandler.c is free software.
  *
@@ -9,6 +9,17 @@
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
+ *
+ * subtitlehandler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <glib/gi18n.h>
diff --git a/gtk/src/subtitlehandler.h b/gtk/src/subtitlehandler.h
index 597d82f11..ad7d3c4ec 100644
--- a/gtk/src/subtitlehandler.h
+++ b/gtk/src/subtitlehandler.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * subtitlehandler.h
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * audiohandler.h is free software.
+ * subtitlehandler.h is free software.
  *
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
- * callbacks.h is distributed in the hope that it will be useful,
+ * subtitlehandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
diff --git a/gtk/src/values.c b/gtk/src/values.c
index 39f7303d8..f9dc2bea6 100644
--- a/gtk/src/values.c
+++ b/gtk/src/values.c
@@ -1,15 +1,25 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * presets.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * values.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * presets.c is free software.
+ * values.c is free software.
  *
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
+ * values.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <glib.h>
diff --git a/gtk/src/values.h b/gtk/src/values.h
index f58b2dbfb..c1e54a7a3 100644
--- a/gtk/src/values.h
+++ b/gtk/src/values.h
@@ -1,18 +1,26 @@
 /*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * values.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * This program is distributed in the hope that it will be useful,
+ * values.h is free software.
+ *
+ * You may redistribute it and/or modify it under the terms of the
+ * GNU General Public License, as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * values.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ * along with callbacks.h.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
+
 #if !defined(_GHB_VALUES_H_)
 #define _GHB_VALUES_H_
 
diff --git a/gtk/src/videohandler.c b/gtk/src/videohandler.c
index 2f955a3a1..19414eb3a 100644
--- a/gtk/src/videohandler.c
+++ b/gtk/src/videohandler.c
@@ -1,14 +1,25 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * callbacks.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * videohandler.c
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * callbacks.c is free software.
+ * videohandler.c is free software.
  *
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
+ *
+ * videohandler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <glib/gi18n.h>
diff --git a/gtk/src/videohandler.h b/gtk/src/videohandler.h
index b649f9307..da3af3b91 100644
--- a/gtk/src/videohandler.h
+++ b/gtk/src/videohandler.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
- * audiohandler.h
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * videohandler.h
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
- * audiohandler.h is free software.
+ * videohandler.h is free software.
  *
  * You may redistribute it and/or modify it under the terms of the
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
- * callbacks.h is distributed in the hope that it will be useful,
+ * videohandler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 4da46ea1f..53a375739 100644
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * x264handler.c
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * x264handler.c is free software.
  *
@@ -9,6 +9,17 @@
  * GNU General Public License, as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
+ *
+ * x264handler.c is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with main.c.  If not, write to:
+ *  The Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301, USA.
  */
 
 #include <glib/gi18n.h>
diff --git a/gtk/src/x264handler.h b/gtk/src/x264handler.h
index b827e568c..d5a354e39 100644
--- a/gtk/src/x264handler.h
+++ b/gtk/src/x264handler.h
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * x264handler.h
- * Copyright (C) John Stebbins 2008-2015 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2016 <stebbins@stebbins>
  *
  * x264handler.h is free software.
  *
@@ -10,7 +10,7 @@
  * Foundation; either version 2 of the License, or (at your option)
  * any later version.
  *
- * callbacks.h is distributed in the hope that it will be useful,
+ * x264handler.h is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.