diff -Nuar dvdauthor.orig/src/compat.h dvdauthor/src/compat.h
--- dvdauthor.orig/src/compat.h	2012-06-01 03:21:30.000000000 +0200
+++ dvdauthor/src/compat.h	2014-12-23 21:00:14.229049175 +0100
@@ -1,6 +1,8 @@
 // basic headers
 #define _GNU_SOURCE /* really just for strndup */
 
+#include "config.h"
+
 #ifdef HAVE_STDBOOL_H
 # include <stdbool.h>
 #else
diff -Nuar dvdauthor.orig/src/conffile.c dvdauthor/src/conffile.c
--- dvdauthor.orig/src/conffile.c	2010-12-07 00:35:41.000000000 +0100
+++ dvdauthor/src/conffile.c	2014-12-23 21:01:48.289050697 +0100
@@ -21,7 +21,6 @@
  * USA
  */
 
-#include "config.h"
 #include "compat.h"
 #include <errno.h>
 #include "conffile.h"
diff -Nuar dvdauthor.orig/src/dvdauthor.c dvdauthor/src/dvdauthor.c
--- dvdauthor.orig/src/dvdauthor.c	2011-05-31 09:12:24.000000000 +0200
+++ dvdauthor/src/dvdauthor.c	2014-12-23 21:02:04.574050960 +0100
@@ -20,8 +20,6 @@
  * USA
  */
 
-#include "config.h"
-
 #include "compat.h"
 
 #include <sys/types.h>
diff -Nuar dvdauthor.orig/src/dvdcompile.c dvdauthor/src/dvdcompile.c
--- dvdauthor.orig/src/dvdcompile.c	2010-11-04 05:23:17.000000000 +0100
+++ dvdauthor/src/dvdcompile.c	2014-12-23 21:02:21.425051233 +0100
@@ -20,8 +20,6 @@
  * USA
  */
 
-#include "config.h"
-
 #include "compat.h"
 #include <assert.h>
 
diff -Nuar dvdauthor.orig/src/dvdpgc.c dvdauthor/src/dvdpgc.c
--- dvdauthor.orig/src/dvdpgc.c	2011-05-31 07:51:52.000000000 +0200
+++ dvdauthor/src/dvdpgc.c	2014-12-23 21:02:41.710051561 +0100
@@ -20,7 +20,6 @@
  * USA
  */
 
-#include "config.h"
 #include "compat.h"
 #include <errno.h>
 #include <assert.h>
diff -Nuar dvdauthor.orig/src/dvdunauthor.c dvdauthor/src/dvdunauthor.c
--- dvdauthor.orig/src/dvdunauthor.c	2011-01-27 00:39:16.000000000 +0100
+++ dvdauthor/src/dvdunauthor.c	2014-12-23 21:03:20.645052191 +0100
@@ -23,8 +23,6 @@
  * USA
  */
 
-#include "config.h"
-
 #include "compat.h"
 
 #include <ctype.h>
diff -Nuar dvdauthor.orig/src/dvduncompile.c dvdauthor/src/dvduncompile.c
--- dvdauthor.orig/src/dvduncompile.c	2010-04-20 06:16:08.000000000 +0200
+++ dvdauthor/src/dvduncompile.c	2014-12-23 21:03:37.030052456 +0100
@@ -21,7 +21,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "config.h"
 #include "compat.h"
 
 #include <stdio.h>
diff -Nuar dvdauthor.orig/src/dvdvob.c dvdauthor/src/dvdvob.c
--- dvdauthor.orig/src/dvdvob.c	2012-04-03 04:54:52.000000000 +0200
+++ dvdauthor/src/dvdvob.c	2014-12-23 21:03:54.789052744 +0100
@@ -20,8 +20,6 @@
  * USA
  */
 
-#include "config.h"
-
 #include "compat.h"
 
 #include <assert.h>
diff -Nuar dvdauthor.orig/src/readxml.c dvdauthor/src/readxml.c
--- dvdauthor.orig/src/readxml.c	2010-11-03 02:52:45.000000000 +0100
+++ dvdauthor/src/readxml.c	2014-12-23 21:04:12.640053032 +0100
@@ -20,8 +20,6 @@
  * USA
  */
 
-#include "config.h"
-
 #include "compat.h"
 
 #include <assert.h>
diff -Nuar dvdauthor.orig/src/spuunmux.c dvdauthor/src/spuunmux.c
--- dvdauthor.orig/src/spuunmux.c	2011-10-31 00:10:03.000000000 +0100
+++ dvdauthor/src/spuunmux.c	2014-12-23 21:04:28.475053289 +0100
@@ -31,7 +31,6 @@
  * USA
  */
 
-#include "config.h"
 #include "compat.h"
 
 #include <fcntl.h>
diff -Nuar dvdauthor.orig/src/subgen-encode.c dvdauthor/src/subgen-encode.c
--- dvdauthor.orig/src/subgen-encode.c	2010-05-09 13:16:46.000000000 +0200
+++ dvdauthor/src/subgen-encode.c	2014-12-23 21:04:45.317053561 +0100
@@ -21,8 +21,6 @@
  * USA
  */
 
-#include "config.h"
-
 #include "compat.h"
 
 #include <assert.h>