15 files changed, 43 insertions, 10 deletions
diff --git a/sys/cdrom/gstcdplayer.h b/sys/cdrom/gstcdplayer.h
index 39aaaf43..7c6c4bf9 100644
--- a/sys/cdrom/gstcdplayer.h
+++ b/sys/cdrom/gstcdplayer.h
@@ -20,10 +20,6 @@
 #ifndef __CDPLAYER_H__
 #define __CDPLAYER_H__
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib.h>
 #include <gst/gst.h>
 
diff --git a/sys/cdrom/gstcdplayer_ioctl.c b/sys/cdrom/gstcdplayer_ioctl.c
index f137d953..22ef22be 100644
--- a/sys/cdrom/gstcdplayer_ioctl.c
+++ b/sys/cdrom/gstcdplayer_ioctl.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gstcdplayer_ioctl.h"
 
 #include <sys/types.h>
diff --git a/sys/cdrom/gstcdplayer_ioctl.h b/sys/cdrom/gstcdplayer_ioctl.h
index 986d1b2d..65bc2c66 100644
--- a/sys/cdrom/gstcdplayer_ioctl.h
+++ b/sys/cdrom/gstcdplayer_ioctl.h
@@ -20,10 +20,6 @@
 #ifndef __CDPLAYER_LL_H__
 #define __CDPLAYER_LL_H__
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <glib.h>
 
 #define LEADOUT 0
diff --git a/sys/dxr3/ac3_padder.c b/sys/dxr3/ac3_padder.c
index f6ff270b..bee59895 100644
--- a/sys/dxr3/ac3_padder.c
+++ b/sys/dxr3/ac3_padder.c
@@ -19,6 +19,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/sys/glsink/gstgl_rgbimage.c b/sys/glsink/gstgl_rgbimage.c
index a09e7a25..ab856bbc 100644
--- a/sys/glsink/gstgl_rgbimage.c
+++ b/sys/glsink/gstgl_rgbimage.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gst/gst.h>
 
 /* gcc -ansi -pedantic on GNU/Linux causes warnings and errors
diff --git a/sys/glsink/gstglxwindow.c b/sys/glsink/gstglxwindow.c
index 3f9d3df9..3d173b2b 100644
--- a/sys/glsink/gstglxwindow.c
+++ b/sys/glsink/gstglxwindow.c
@@ -1,5 +1,9 @@
 /* This stores the common OpenGL initialization stuff for all instances */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* gcc -ansi -pedantic on GNU/Linux causes warnings and errors
  * unless this is defined:
  * warning: #warning "Files using this header must be compiled with _SVID_SOURCE or _XOPEN_SOURCE"
diff --git a/sys/glsink/regcomb_yuvrgb.c b/sys/glsink/regcomb_yuvrgb.c
index 39c86a0f..d06427f4 100644
--- a/sys/glsink/regcomb_yuvrgb.c
+++ b/sys/glsink/regcomb_yuvrgb.c
@@ -1,5 +1,10 @@
 // these includes don't do a lot in Linux, they are more needed in Win32 (for the OpenGL function call pointers)
 // but they are used at least for checking if the necessary extensions are present
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ARB_multitexture.h"
 #include "NV_register_combiners.h"
 #include "EXT_paletted_texture.h"
diff --git a/sys/qcam/dark.c b/sys/qcam/dark.c
index 15dbbb4e..70acf979 100644
--- a/sys/qcam/dark.c
+++ b/sys/qcam/dark.c
@@ -38,6 +38,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 	establishing shots need only be done once per camera.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
diff --git a/sys/qcam/exposure.c b/sys/qcam/exposure.c
index 66574f32..b393bdb7 100644
--- a/sys/qcam/exposure.c
+++ b/sys/qcam/exposure.c
@@ -36,6 +36,10 @@ SOFTWARE.
 
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include "qcam.h"
 #include "qcamip.h"
diff --git a/sys/qcam/gstqcamsrc.h b/sys/qcam/gstqcamsrc.h
index de884d4d..0bd201c8 100644
--- a/sys/qcam/gstqcamsrc.h
+++ b/sys/qcam/gstqcamsrc.h
@@ -22,7 +22,6 @@
 #define __GST_QCAMSRC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #ifdef __cplusplus
diff --git a/sys/qcam/qcam-Linux.c b/sys/qcam/qcam-Linux.c
index f6383e01..e73933d9 100644
--- a/sys/qcam/qcam-Linux.c
+++ b/sys/qcam/qcam-Linux.c
@@ -29,6 +29,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/sys/qcam/qcam-lib.c b/sys/qcam/qcam-lib.c
index f3b49fb0..cacd5d08 100644
--- a/sys/qcam/qcam-lib.c
+++ b/sys/qcam/qcam-lib.c
@@ -33,6 +33,10 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sys/qcam/qcam-os.c b/sys/qcam/qcam-os.c
index f6383e01..e73933d9 100644
--- a/sys/qcam/qcam-os.c
+++ b/sys/qcam/qcam-os.c
@@ -29,6 +29,9 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index 521196cf..576b0c0b 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/sys/vcd/vcdsrc.h b/sys/vcd/vcdsrc.h
index a5ab43c0..ab2c74da 100644
--- a/sys/vcd/vcdsrc.h
+++ b/sys/vcd/vcdsrc.h
@@ -22,7 +22,6 @@
 #define __VCDSRC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #include <linux/cdrom.h>