Remove all config.h includes from header files, add it to each source file and remove duplicate config.h includes fro...

Original commit message from CVS:
Remove all config.h includes from header files, add it to each source file and remove duplicate config.h includes from several source files

141 files changed, 368 insertions, 76 deletions

diff --git a/ext/arts/gst_arts.h b/ext/arts/gst_arts.h
index 9ecdbaefc..cf0ead064 100644
--- a/ext/arts/gst_arts.h
+++ b/ext/arts/gst_arts.h
@@ -24,7 +24,6 @@
 #define __GST_ARTS_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/ext/arts/gst_artsio_impl.cc b/ext/arts/gst_artsio_impl.cc
index 71cfea851..dff27eb1c 100644
--- a/ext/arts/gst_artsio_impl.cc
+++ b/ext/arts/gst_artsio_impl.cc
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include "artsflow.h"
 #include "stdsynthmodule.h"
diff --git a/ext/audiofile/gstaf.c b/ext/audiofile/gstaf.c
index 7014dad3f..1d05ae3ff 100644
--- a/ext/audiofile/gstaf.c
+++ b/ext/audiofile/gstaf.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gstafsrc.h"
 #include "gstafsink.h"
diff --git a/ext/audiofile/gstafparse.h b/ext/audiofile/gstafparse.h
index 29342fe41..0f636dcd3 100644
--- a/ext/audiofile/gstafparse.h
+++ b/ext/audiofile/gstafparse.h
@@ -25,7 +25,6 @@
 #define __GST_AFPARSE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 #include <audiofile.h>			/* what else are we to do */
diff --git a/ext/audiofile/gstafsink.h b/ext/audiofile/gstafsink.h
index 3e8c868ca..76ce30af3 100644
--- a/ext/audiofile/gstafsink.h
+++ b/ext/audiofile/gstafsink.h
@@ -25,7 +25,6 @@
 #define __GST_AFSINK_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <audiofile.h>			/* what else are we to do */
 
diff --git a/ext/audiofile/gstafsrc.h b/ext/audiofile/gstafsrc.h
index 23e8669c9..c96c20c3d 100644
--- a/ext/audiofile/gstafsrc.h
+++ b/ext/audiofile/gstafsrc.h
@@ -25,7 +25,6 @@
 #define __GST_AFSRC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <audiofile.h>			/* what else are we to do */
 
diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c
index 7ef307056..049691f4e 100644
--- a/ext/divx/gstdivxdec.c
+++ b/ext/divx/gstdivxdec.c
@@ -18,9 +18,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "config.h"
 #endif
 
diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c
index 1384a8883..b5a0458e3 100644
--- a/ext/divx/gstdivxenc.c
+++ b/ext/divx/gstdivxenc.c
@@ -18,9 +18,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "config.h"
 #endif
 
diff --git a/ext/gsm/gstgsm.c b/ext/gsm/gstgsm.c
index fcc72a019..c186ed1b2 100644
--- a/ext/gsm/gstgsm.c
+++ b/ext/gsm/gstgsm.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gstgsmdec.h"
 #include "gstgsmenc.h"
diff --git a/ext/gsm/gstgsmdec.h b/ext/gsm/gstgsmdec.h
index d5839abdc..0544128b5 100644
--- a/ext/gsm/gstgsmdec.h
+++ b/ext/gsm/gstgsmdec.h
@@ -22,7 +22,6 @@
 #define __GST_GSMDEC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #ifdef GSM_HEADER_IN_SUBDIR
diff --git a/ext/gsm/gstgsmenc.h b/ext/gsm/gstgsmenc.h
index 77f29757f..2366ed69c 100644
--- a/ext/gsm/gstgsmenc.h
+++ b/ext/gsm/gstgsmenc.h
@@ -22,7 +22,6 @@
 #define __GST_GSMENC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #ifdef GSM_HEADER_IN_SUBDIR
diff --git a/ext/hermes/gstcolorspace.h b/ext/hermes/gstcolorspace.h
index 45371c72d..ef8a8bfe5 100644
--- a/ext/hermes/gstcolorspace.h
+++ b/ext/hermes/gstcolorspace.h
@@ -22,7 +22,6 @@
 #define __GST_COLORSPACE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include "yuv2rgb.h"
 
diff --git a/ext/ivorbis/vorbisenc.h b/ext/ivorbis/vorbisenc.h
index 7170baacd..d31d8374b 100644
--- a/ext/ivorbis/vorbisenc.h
+++ b/ext/ivorbis/vorbisenc.h
@@ -22,7 +22,6 @@
 #define __VORBISENC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #include <tremor/codec.h>
diff --git a/ext/jack/gstjackbin.c b/ext/jack/gstjackbin.c
index 01713a70c..cb1839c41 100644
--- a/ext/jack/gstjackbin.c
+++ b/ext/jack/gstjackbin.c
@@ -17,6 +17,10 @@
     Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h
index 89a039e9c..b588ffa4e 100644
--- a/ext/ladspa/gstladspa.h
+++ b/ext/ladspa/gstladspa.h
@@ -24,7 +24,6 @@
 #define __GST_LADSPA_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 
diff --git a/ext/ladspa/load.c b/ext/ladspa/load.c
index c912106fa..bf52eb1fd 100644
--- a/ext/ladspa/load.c
+++ b/ext/ladspa/load.c
@@ -5,6 +5,10 @@
 
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <dlfcn.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/ext/ladspa/search.c b/ext/ladspa/search.c
index aac4381b6..08b28d121 100644
--- a/ext/ladspa/search.c
+++ b/ext/ladspa/search.c
@@ -5,6 +5,10 @@
 
 /*****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <dirent.h>
 #include <dlfcn.h>
 #include <stdio.h>
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index f254e728c..279e7951e 100644
--- a/ext/mplex/gstmplex.cc
+++ b/ext/mplex/gstmplex.cc
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <string.h>
 
diff --git a/ext/mplex/gstmplex.h b/ext/mplex/gstmplex.h
index 98b19aca8..20107252a 100644
--- a/ext/mplex/gstmplex.h
+++ b/ext/mplex/gstmplex.h
@@ -22,7 +22,6 @@
 #define __GST_MPLEX_H__
 
 
-#include <config.h>
 #include <stdlib.h>
 
 #include <gst/gst.h>
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index b66fabca2..3b1b6dd6b 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>
+
 #include <signal.h>
 #include <string.h>
 #include <sys/time.h>
diff --git a/ext/snapshot/gstsnapshot.h b/ext/snapshot/gstsnapshot.h
index c391beb3b..e86d1aba4 100644
--- a/ext/snapshot/gstsnapshot.h
+++ b/ext/snapshot/gstsnapshot.h
@@ -22,7 +22,6 @@
 #define __GST_SNAPSHOT_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <png.h>
 
diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c
index a6d7c28db..af961a8ca 100644
--- a/ext/sndfile/gstsf.c
+++ b/ext/sndfile/gstsf.c
@@ -21,10 +21,10 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <string.h>
 #include <gst/gst.h>
 
-#include <config.h>
 #include <gst/audio/audio.h>
 
 #include "gstsf.h"
diff --git a/ext/sndfile/gstsf.h b/ext/sndfile/gstsf.h
index 3197effd0..a25311122 100644
--- a/ext/sndfile/gstsf.h
+++ b/ext/sndfile/gstsf.h
@@ -22,7 +22,6 @@
 #define __GST_SFSINK_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <sndfile.h>
 
diff --git a/ext/swfdec/gstswfdec.h b/ext/swfdec/gstswfdec.h
index d3e6355ed..8aa3ce3ac 100644
--- a/ext/swfdec/gstswfdec.h
+++ b/ext/swfdec/gstswfdec.h
@@ -22,7 +22,6 @@
 #define __GST_SWFDEC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <swfdec.h>
 
diff --git a/ext/tarkin/gsttarkin.c b/ext/tarkin/gsttarkin.c
index 8026bde51..e4619c663 100644
--- a/ext/tarkin/gsttarkin.c
+++ b/ext/tarkin/gsttarkin.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gsttarkinenc.h"
 #include "gsttarkindec.h"
diff --git a/ext/tarkin/gsttarkindec.h b/ext/tarkin/gsttarkindec.h
index 3fbac08dc..b1baf4f30 100644
--- a/ext/tarkin/gsttarkindec.h
+++ b/ext/tarkin/gsttarkindec.h
@@ -22,7 +22,6 @@
 #define __TARKINDEC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #include "tarkin.h"
diff --git a/ext/tarkin/gsttarkinenc.h b/ext/tarkin/gsttarkinenc.h
index 0a8878426..b6252a88a 100644
--- a/ext/tarkin/gsttarkinenc.h
+++ b/ext/tarkin/gsttarkinenc.h
@@ -22,7 +22,6 @@
 #define __TARKINENC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #include "tarkin.h"
diff --git a/ext/tarkin/info.c b/ext/tarkin/info.c
index 7937a69fd..60f02bd8d 100644
--- a/ext/tarkin/info.c
+++ b/ext/tarkin/info.c
@@ -18,6 +18,10 @@
 /* general handling of the header and the TarkinInfo structure (and
    substructures) */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/ext/tarkin/mem.c b/ext/tarkin/mem.c
index c2cf18c0b..2c304b7af 100644
--- a/ext/tarkin/mem.c
+++ b/ext/tarkin/mem.c
@@ -2,6 +2,9 @@
  *   Debugging implementation of MALLOC and friends
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "mem.h"
 
diff --git a/ext/tarkin/tarkin.c b/ext/tarkin/tarkin.c
index a9e24afc0..163fa87c6 100644
--- a/ext/tarkin/tarkin.c
+++ b/ext/tarkin/tarkin.c
@@ -3,6 +3,10 @@
  *   (this one has to be rewritten to write ogg streams ...)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "mem.h"
 #include "tarkin.h"
 #include "yuv.h"
diff --git a/ext/tarkin/wavelet.c b/ext/tarkin/wavelet.c
index a83aa4995..9288e15b7 100644
--- a/ext/tarkin/wavelet.c
+++ b/ext/tarkin/wavelet.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "mem.h"
 #include "wavelet.h"
 
diff --git a/ext/tarkin/wavelet_coeff.c b/ext/tarkin/wavelet_coeff.c
index 632486762..581f48f0a 100644
--- a/ext/tarkin/wavelet_coeff.c
+++ b/ext/tarkin/wavelet_coeff.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "mem.h"
 #include "wavelet.h"
 #include "rle.h"
diff --git a/ext/tarkin/wavelet_xform.c b/ext/tarkin/wavelet_xform.c
index 768446a2d..f052f003d 100644
--- a/ext/tarkin/wavelet_xform.c
+++ b/ext/tarkin/wavelet_xform.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "mem.h"
 #include <assert.h>
 #include "wavelet.h"
diff --git a/ext/tarkin/yuv.c b/ext/tarkin/yuv.c
index 6f5fb5c0a..32c563f43 100644
--- a/ext/tarkin/yuv.c
+++ b/ext/tarkin/yuv.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "yuv.h"
 
 /*#define TARKIN_YUV_EXACT*/
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index ad1b51332..3cfdfaa70 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -18,9 +18,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "config.h"
 #endif
 
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index 00641f687..f526df5aa 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -18,9 +18,6 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "config.h"
 #endif
 
diff --git a/gst-libs/ext/mplex/buffer.cc b/gst-libs/ext/mplex/buffer.cc
index 2b2918025..24f5fd246 100644
--- a/gst-libs/ext/mplex/buffer.cc
+++ b/gst-libs/ext/mplex/buffer.cc
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "buffer.hh"
 #include <stdlib.h>
 
diff --git a/gst-libs/ext/mplex/padstrm.cc b/gst-libs/ext/mplex/padstrm.cc
index 95e32dbac..b60c66439 100644
--- a/gst-libs/ext/mplex/padstrm.cc
+++ b/gst-libs/ext/mplex/padstrm.cc
@@ -20,6 +20,10 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "padstrm.hh"
 
 
diff --git a/gst-libs/ext/mplex/stillsstream.cc b/gst-libs/ext/mplex/stillsstream.cc
index 1b6d10b38..6f9806f07 100644
--- a/gst-libs/ext/mplex/stillsstream.cc
+++ b/gst-libs/ext/mplex/stillsstream.cc
@@ -21,6 +21,10 @@
  */
 
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <format_codes.h>
 
 #include "stillsstream.hh"
diff --git a/gst-libs/gst/audio/audioclock.c b/gst-libs/gst/audio/audioclock.c
index 342009ff3..feb06d507 100644
--- a/gst-libs/gst/audio/audioclock.c
+++ b/gst-libs/gst/audio/audioclock.c
@@ -20,6 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "audioclock.h"
 
 static void 		gst_audio_clock_class_init 	(GstAudioClockClass *klass);
diff --git a/gst-libs/gst/floatcast/floatcast.h b/gst-libs/gst/floatcast/floatcast.h
index 3a232b76a..0d5809f19 100644
--- a/gst-libs/gst/floatcast/floatcast.h
+++ b/gst-libs/gst/floatcast/floatcast.h
@@ -21,8 +21,6 @@
 #ifndef __FLOATCAST_H__
 #define __FLOATCAST_H__
 
-#include <config.h>
-
 #if (HAVE_LRINT && HAVE_LRINTF)
 
 	/*	These defines enable functionality introduced with the 1999 ISO C
diff --git a/gst-libs/gst/gconf/gconf.c b/gst-libs/gst/gconf/gconf.c
index 8a1c5823f..541a086b4 100644
--- a/gst-libs/gst/gconf/gconf.c
+++ b/gst-libs/gst/gconf/gconf.c
@@ -21,6 +21,10 @@
  * this library handles interaction with GConf
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gconf.h"
 
 #define GST_GCONF_DIR "/system/gstreamer"
diff --git a/gst-libs/gst/idct/dct.h b/gst-libs/gst/idct/dct.h
index fcb7de37d..efb3ddb36 100644
--- a/gst-libs/gst/idct/dct.h
+++ b/gst-libs/gst/idct/dct.h
@@ -1,7 +1,5 @@
 /* define DCT types */
 
-#include "config.h"
-
 /*
  * DCTSIZE      underlying (1d) transform size
  * DCTSIZE2     DCTSIZE squared
diff --git a/gst-libs/gst/idct/fastintidct.c b/gst-libs/gst/idct/fastintidct.c
index 3c9e9bb9f..274266721 100644
--- a/gst-libs/gst/idct/fastintidct.c
+++ b/gst-libs/gst/idct/fastintidct.c
@@ -38,6 +38,10 @@
 /* compliance                           sE,  2.1.94       */
 /**********************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* this code assumes >> to be a two's-complement arithmetic */
 /* right shift: (-2)>>1 == -1 , (-3)>>1 == -2               */
 
diff --git a/gst-libs/gst/idct/floatidct.c b/gst-libs/gst/idct/floatidct.c
index 520c39133..b215bd784 100644
--- a/gst-libs/gst/idct/floatidct.c
+++ b/gst-libs/gst/idct/floatidct.c
@@ -35,6 +35,10 @@
 /* Here we use math.h to generate constants.  Compiler results may
    vary a little */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 
 #ifndef PI
diff --git a/gst-libs/gst/idct/ieeetest.c b/gst-libs/gst/idct/ieeetest.c
index c3c66215c..f5b270ebb 100644
--- a/gst-libs/gst/idct/ieeetest.c
+++ b/gst-libs/gst/idct/ieeetest.c
@@ -9,6 +9,10 @@
  * Released to public domain 11/22/93.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/gst-libs/gst/idct/intidct.c b/gst-libs/gst/idct/intidct.c
index 119b7fd14..e08e6adbe 100644
--- a/gst-libs/gst/idct/intidct.c
+++ b/gst-libs/gst/idct/intidct.c
@@ -18,6 +18,10 @@
  * scaled fixed-point arithmetic, with a minimal number of shifts.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "dct.h"
 
 /* We assume that right shift corresponds to signed division by 2 with
diff --git a/gst-libs/gst/idct/mmx32idct.c b/gst-libs/gst/idct/mmx32idct.c
index 0090d8a72..3b640976e 100644
--- a/gst-libs/gst/idct/mmx32idct.c
+++ b/gst-libs/gst/idct/mmx32idct.c
@@ -114,7 +114,11 @@
 /*

 mword typedef qword

 qword ptr equ mword ptr */

-

+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <mmx.h>

 

 #define BITS_INV_ACC	4	/*; 4 or 5 for IEEE
 */
diff --git a/gst-libs/gst/media-info/media-info-priv.c b/gst-libs/gst/media-info/media-info-priv.c
index b92371374..77981598d 100644
--- a/gst-libs/gst/media-info/media-info-priv.c
+++ b/gst-libs/gst/media-info/media-info-priv.c
@@ -19,6 +19,10 @@
 
 /* media-info-priv.c - handling of internal stuff */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gst/gst.h>
 #include <string.h>
 #include "media-info.h"
diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index b559463d6..92957e16a 100644
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gst/gst.h>
 #include <string.h>
 #include "media-info.h"
diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c
index 486262e56..64963661a 100644
--- a/gst-libs/gst/play/play.old.c
+++ b/gst-libs/gst/play/play.old.c
@@ -22,6 +22,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "play.h"
 
 enum
diff --git a/gst-libs/gst/resample/dtof.c b/gst-libs/gst/resample/dtof.c
index c392e676a..7650453a2 100644
--- a/gst-libs/gst/resample/dtof.c
+++ b/gst-libs/gst/resample/dtof.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <string.h>
 #include <math.h>
diff --git a/gst-libs/gst/resample/functable.c b/gst-libs/gst/resample/functable.c
index 94dbec15d..75b81f366 100644
--- a/gst-libs/gst/resample/functable.c
+++ b/gst-libs/gst/resample/functable.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <string.h>
 #include <math.h>
diff --git a/gst-libs/gst/resample/private.h b/gst-libs/gst/resample/private.h
index fb8ba87f3..476e611e1 100644
--- a/gst-libs/gst/resample/private.h
+++ b/gst-libs/gst/resample/private.h
@@ -22,7 +22,6 @@
 #define __PRIVATE_H__
 
 #include "resample.h"
-#include "config.h"
 
 void resample_nearest_s16(resample_t *r);
 void resample_bilinear_s16(resample_t *r);
diff --git a/gst-libs/gst/resample/resample.c b/gst-libs/gst/resample/resample.c
index b298e86dc..52a80e61a 100644
--- a/gst-libs/gst/resample/resample.c
+++ b/gst-libs/gst/resample/resample.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <string.h>
 #include <math.h>
diff --git a/gst-libs/gst/riff/riffencode.c b/gst-libs/gst/riff/riffencode.c
index a22b1849d..630725d56 100644
--- a/gst-libs/gst/riff/riffencode.c
+++ b/gst-libs/gst/riff/riffencode.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 
 /*#define DEBUG_ENABLED */
diff --git a/gst-libs/gst/riff/riffparse.c b/gst-libs/gst/riff/riffparse.c
index 72a7820b8..72c9e4bb9 100644
--- a/gst-libs/gst/riff/riffparse.c
+++ b/gst-libs/gst/riff/riffparse.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 
 /*#define DEBUG_ENABLED */
diff --git a/gst-libs/gst/riff/riffutil.c b/gst-libs/gst/riff/riffutil.c
index 612bdbaf5..d33aefe34 100644
--- a/gst-libs/gst/riff/riffutil.c
+++ b/gst-libs/gst/riff/riffutil.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <riff.h>
 
diff --git a/gst/cdxaparse/gstcdxaparse.h b/gst/cdxaparse/gstcdxaparse.h
index fcf771078..32af55272 100644
--- a/gst/cdxaparse/gstcdxaparse.h
+++ b/gst/cdxaparse/gstcdxaparse.h
@@ -22,7 +22,6 @@
 #ifndef __GST_CDXA_PARSE_H__
 #define __GST_CDXA_PARSE_H__
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 
diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c
index b7b1de956..f100d96ac 100644
--- a/gst/chart/gstchart.c
+++ b/gst/chart/gstchart.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>
+
 #include <gst/gst.h>
 #include <gst/video/video.h>
 
diff --git a/gst/deinterlace/gstdeinterlace.h b/gst/deinterlace/gstdeinterlace.h
index 131b5bff8..45eda04a5 100644
--- a/gst/deinterlace/gstdeinterlace.h
+++ b/gst/deinterlace/gstdeinterlace.h
@@ -22,7 +22,6 @@
 #define __GST_DEINTERLACE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 /* #include <gst/meta/audioraw.h> */
 
diff --git a/gst/festival/gstfestival.h b/gst/festival/gstfestival.h
index f1e382ef8..ab463106b 100644
--- a/gst/festival/gstfestival.h
+++ b/gst/festival/gstfestival.h
@@ -61,7 +61,6 @@
 #define __GST_FESTIVAL_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #ifdef __cplusplus
diff --git a/gst/filter/iir.c b/gst/filter/iir.c
index 1ef315409..13e2e937e 100644
--- a/gst/filter/iir.c
+++ b/gst/filter/iir.c
@@ -19,6 +19,10 @@
 /* LPC is actually a degenerate case of form I/II filters, but we need
    both */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
diff --git a/gst/flx/flx_color.c b/gst/flx/flx_color.c
index 8a84d2b09..b64c90c44 100644
--- a/gst/flx/flx_color.c
+++ b/gst/flx/flx_color.c
@@ -17,10 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <gst/gst.h>
 
-
 #include "flx_color.h"
 
 FlxColorSpaceConverter *
diff --git a/gst/mixmatrix/mixmatrix.c b/gst/mixmatrix/mixmatrix.c
index 34e6176bc..9cc2a4160 100644
--- a/gst/mixmatrix/mixmatrix.c
+++ b/gst/mixmatrix/mixmatrix.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>
+
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 #include <gst/audio/audio.h>
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index 37b6c6482..4ac6bc4ed 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -25,6 +25,10 @@
      Olivier Lapicque <olivierl@jps.net>  
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "libmodplug/stdafx.h"
 #include "libmodplug/sndfile.h"
 
diff --git a/gst/modplug/gstmodplug.h b/gst/modplug/gstmodplug.h
index 2b5994c26..d6202e690 100644
--- a/gst/modplug/gstmodplug.h
+++ b/gst/modplug/gstmodplug.h
@@ -21,8 +21,6 @@
 #ifndef __GST_MODPLUG_H__
 #define __GST_MODPLUG_H__
 
-#include <config.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/gst/modplug/libmodplug/fastmix.cpp b/gst/modplug/libmodplug/fastmix.cpp
index 0ee94bd0e..910ef5494 100644
--- a/gst/modplug/libmodplug/fastmix.cpp
+++ b/gst/modplug/libmodplug/fastmix.cpp
@@ -5,6 +5,10 @@
  *          Markus Fick <webmaster@mark-f.de> spline + fir-resampler
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 #include <math.h>
diff --git a/gst/modplug/libmodplug/load_669.cpp b/gst/modplug/libmodplug/load_669.cpp
index a0dbfabd7..2d361a792 100644
--- a/gst/modplug/libmodplug/load_669.cpp
+++ b/gst/modplug/libmodplug/load_669.cpp
@@ -9,6 +9,10 @@
 // 669 Composer / UNIS 669 module loader
 ////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_amf.cpp b/gst/modplug/libmodplug/load_amf.cpp
index a75787116..37a34185a 100644
--- a/gst/modplug/libmodplug/load_amf.cpp
+++ b/gst/modplug/libmodplug/load_amf.cpp
@@ -13,6 +13,11 @@
 // - Advanced Music Format(DSM)
 //
 ///////////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_ams.cpp b/gst/modplug/libmodplug/load_ams.cpp
index 05d219b7f..6d53f5a45 100644
--- a/gst/modplug/libmodplug/load_ams.cpp
+++ b/gst/modplug/libmodplug/load_ams.cpp
@@ -7,6 +7,11 @@
 //////////////////////////////////////////////
 // AMS module loader                        //
 //////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_dbm.cpp b/gst/modplug/libmodplug/load_dbm.cpp
index df46cc64b..95cf63752 100644
--- a/gst/modplug/libmodplug/load_dbm.cpp
+++ b/gst/modplug/libmodplug/load_dbm.cpp
@@ -13,6 +13,10 @@
 //
 ///////////////////////////////////////////////////////////////
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_dmf.cpp b/gst/modplug/libmodplug/load_dmf.cpp
index f8b803b6a..f49e65a2b 100644
--- a/gst/modplug/libmodplug/load_dmf.cpp
+++ b/gst/modplug/libmodplug/load_dmf.cpp
@@ -7,6 +7,11 @@
 ///////////////////////////////////////////////////////
 // DMF DELUSION DIGITAL MUSIC FILEFORMAT (X-Tracker) //
 ///////////////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_dsm.cpp b/gst/modplug/libmodplug/load_dsm.cpp
index 4f51469f8..d84817ee7 100644
--- a/gst/modplug/libmodplug/load_dsm.cpp
+++ b/gst/modplug/libmodplug/load_dsm.cpp
@@ -7,6 +7,11 @@
 //////////////////////////////////////////////
 // DSIK Internal Format (DSM) module loader //
 //////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_far.cpp b/gst/modplug/libmodplug/load_far.cpp
index 330045033..5c7ab4c0c 100644
--- a/gst/modplug/libmodplug/load_far.cpp
+++ b/gst/modplug/libmodplug/load_far.cpp
@@ -7,6 +7,11 @@
 ////////////////////////////////////////
 // Farandole (FAR) module loader	  //
 ////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_it.cpp b/gst/modplug/libmodplug/load_it.cpp
index 1764759af..29ea0d242 100644
--- a/gst/modplug/libmodplug/load_it.cpp
+++ b/gst/modplug/libmodplug/load_it.cpp
@@ -5,6 +5,10 @@
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 #include "it_defs.h"
diff --git a/gst/modplug/libmodplug/load_j2b.cpp b/gst/modplug/libmodplug/load_j2b.cpp
index 2d86ce823..5da56979a 100644
--- a/gst/modplug/libmodplug/load_j2b.cpp
+++ b/gst/modplug/libmodplug/load_j2b.cpp
@@ -10,6 +10,11 @@
 // J2B module loader
 //
 ///////////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_mdl.cpp b/gst/modplug/libmodplug/load_mdl.cpp
index 68572b5c6..20cb176d0 100644
--- a/gst/modplug/libmodplug/load_mdl.cpp
+++ b/gst/modplug/libmodplug/load_mdl.cpp
@@ -7,6 +7,11 @@
 //////////////////////////////////////////////
 // DigiTracker (MDL) module loader          //
 //////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_med.cpp b/gst/modplug/libmodplug/load_med.cpp
index 3f7e82806..76eafe515 100644
--- a/gst/modplug/libmodplug/load_med.cpp
+++ b/gst/modplug/libmodplug/load_med.cpp
@@ -5,6 +5,10 @@
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_mod.cpp b/gst/modplug/libmodplug/load_mod.cpp
index 3e48739d1..61f2d066a 100644
--- a/gst/modplug/libmodplug/load_mod.cpp
+++ b/gst/modplug/libmodplug/load_mod.cpp
@@ -5,6 +5,10 @@
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_mt2.cpp b/gst/modplug/libmodplug/load_mt2.cpp
index 563839f12..eaee20072 100644
--- a/gst/modplug/libmodplug/load_mt2.cpp
+++ b/gst/modplug/libmodplug/load_mt2.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_mtm.cpp b/gst/modplug/libmodplug/load_mtm.cpp
index 067376878..534cda209 100644
--- a/gst/modplug/libmodplug/load_mtm.cpp
+++ b/gst/modplug/libmodplug/load_mtm.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_okt.cpp b/gst/modplug/libmodplug/load_okt.cpp
index 4c4e08a1f..7b4dd3703 100644
--- a/gst/modplug/libmodplug/load_okt.cpp
+++ b/gst/modplug/libmodplug/load_okt.cpp
@@ -8,6 +8,11 @@
 //////////////////////////////////////////////
 // Oktalyzer (OKT) module loader            //
 //////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_psm.cpp b/gst/modplug/libmodplug/load_psm.cpp
index 19966a680..b56d7755b 100644
--- a/gst/modplug/libmodplug/load_psm.cpp
+++ b/gst/modplug/libmodplug/load_psm.cpp
@@ -10,6 +10,11 @@
 // PSM module loader
 //
 ///////////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_ptm.cpp b/gst/modplug/libmodplug/load_ptm.cpp
index 28039153d..8a4d7ac66 100644
--- a/gst/modplug/libmodplug/load_ptm.cpp
+++ b/gst/modplug/libmodplug/load_ptm.cpp
@@ -8,6 +8,11 @@
 //////////////////////////////////////////////
 // PTM PolyTracker module loader            //
 //////////////////////////////////////////////
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_s3m.cpp b/gst/modplug/libmodplug/load_s3m.cpp
index f4dead4bc..bb3a5aaa1 100644
--- a/gst/modplug/libmodplug/load_s3m.cpp
+++ b/gst/modplug/libmodplug/load_s3m.cpp
@@ -5,6 +5,10 @@
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_stm.cpp b/gst/modplug/libmodplug/load_stm.cpp
index 10e3d555c..4ddf64bac 100644
--- a/gst/modplug/libmodplug/load_stm.cpp
+++ b/gst/modplug/libmodplug/load_stm.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_ult.cpp b/gst/modplug/libmodplug/load_ult.cpp
index 91e1b3040..a676ebe67 100644
--- a/gst/modplug/libmodplug/load_ult.cpp
+++ b/gst/modplug/libmodplug/load_ult.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_umx.cpp b/gst/modplug/libmodplug/load_umx.cpp
index 8913c740f..8c2deef75 100644
--- a/gst/modplug/libmodplug/load_umx.cpp
+++ b/gst/modplug/libmodplug/load_umx.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_wav.cpp b/gst/modplug/libmodplug/load_wav.cpp
index 3bcd13286..6eaf91e6d 100644
--- a/gst/modplug/libmodplug/load_wav.cpp
+++ b/gst/modplug/libmodplug/load_wav.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/load_xm.cpp b/gst/modplug/libmodplug/load_xm.cpp
index 8bc8939e3..d63de118b 100644
--- a/gst/modplug/libmodplug/load_xm.cpp
+++ b/gst/modplug/libmodplug/load_xm.cpp
@@ -5,6 +5,10 @@
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/mmcmp.cpp b/gst/modplug/libmodplug/mmcmp.cpp
index 200ee3b93..333ebbcc7 100644
--- a/gst/modplug/libmodplug/mmcmp.cpp
+++ b/gst/modplug/libmodplug/mmcmp.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/modplug.cpp b/gst/modplug/libmodplug/modplug.cpp
index aea7d24c6..5e07c881f 100644
--- a/gst/modplug/libmodplug/modplug.cpp
+++ b/gst/modplug/libmodplug/modplug.cpp
@@ -4,6 +4,10 @@
  * Authors: Kenton Varda <temporal@gauge3d.org> (C interface wrapper)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "modplug.h"
 #include "stdafx.h"
 #include "sndfile.h"
diff --git a/gst/modplug/libmodplug/snd_dsp.cpp b/gst/modplug/libmodplug/snd_dsp.cpp
index 0c2f643d9..54a06360b 100644
--- a/gst/modplug/libmodplug/snd_dsp.cpp
+++ b/gst/modplug/libmodplug/snd_dsp.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/snd_flt.cpp b/gst/modplug/libmodplug/snd_flt.cpp
index bcae20202..00506d4af 100644
--- a/gst/modplug/libmodplug/snd_flt.cpp
+++ b/gst/modplug/libmodplug/snd_flt.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/snd_fx.cpp b/gst/modplug/libmodplug/snd_fx.cpp
index 78722d5a0..da4cb146d 100644
--- a/gst/modplug/libmodplug/snd_fx.cpp
+++ b/gst/modplug/libmodplug/snd_fx.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/sndfile.cpp b/gst/modplug/libmodplug/sndfile.cpp
index 7e31062b2..b65a11341 100644
--- a/gst/modplug/libmodplug/sndfile.cpp
+++ b/gst/modplug/libmodplug/sndfile.cpp
@@ -5,6 +5,10 @@
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>       //for GCCFIX
 #include "stdafx.h"
 #include "sndfile.h"
diff --git a/gst/modplug/libmodplug/sndfile.h b/gst/modplug/libmodplug/sndfile.h
index b322f6365..0fe6f459d 100644
--- a/gst/modplug/libmodplug/sndfile.h
+++ b/gst/modplug/libmodplug/sndfile.h
@@ -5,10 +5,6 @@
  *          Adam Goode       <adam@evdebs.org> (endian and char fixes for PPC)
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #ifndef __SNDFILE_H
 #define __SNDFILE_H
 
diff --git a/gst/modplug/libmodplug/sndmix.cpp b/gst/modplug/libmodplug/sndmix.cpp
index 4fd2955bb..e50909432 100644
--- a/gst/modplug/libmodplug/sndmix.cpp
+++ b/gst/modplug/libmodplug/sndmix.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/modplug/libmodplug/tables.cpp b/gst/modplug/libmodplug/tables.cpp
index 02b7d4af9..2208cd080 100644
--- a/gst/modplug/libmodplug/tables.cpp
+++ b/gst/modplug/libmodplug/tables.cpp
@@ -4,6 +4,10 @@
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stdafx.h"
 #include "sndfile.h"
 
diff --git a/gst/mpeg1sys/buffer.c b/gst/mpeg1sys/buffer.c
index 53104a319..0d029529b 100644
--- a/gst/mpeg1sys/buffer.c
+++ b/gst/mpeg1sys/buffer.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 
 #include <gst/gst.h>
diff --git a/gst/mpeg1sys/gstmpeg1systemencode.h b/gst/mpeg1sys/gstmpeg1systemencode.h
index 7c26063a0..44555332f 100644
--- a/gst/mpeg1sys/gstmpeg1systemencode.h
+++ b/gst/mpeg1sys/gstmpeg1systemencode.h
@@ -22,7 +22,6 @@
 #define __SYSTEM_ENCODE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/getbits/getbits.h>
 
diff --git a/gst/mpeg1sys/systems.c b/gst/mpeg1sys/systems.c
index d0b3388a4..aa6de41ac 100644
--- a/gst/mpeg1sys/systems.c
+++ b/gst/mpeg1sys/systems.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 
 #include "main.h"
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index f34db3f3d..0928c5e0b 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*#define GST_DEBUG_ENABLED */
 #include "gstmp1videoparse.h"
 
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.h b/gst/mpeg1videoparse/gstmp1videoparse.h
index 5d06738cc..b8b4f0164 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.h
+++ b/gst/mpeg1videoparse/gstmp1videoparse.h
@@ -22,7 +22,6 @@
 #define __MP1VIDEOPARSE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/mpeg2sub/gstmpeg2subt.h b/gst/mpeg2sub/gstmpeg2subt.h
index aed08e738..29f60b278 100644
--- a/gst/mpeg2sub/gstmpeg2subt.h
+++ b/gst/mpeg2sub/gstmpeg2subt.h
@@ -22,7 +22,6 @@
 #define __GST_MPEG2SUBT_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.h b/gst/mpegaudioparse/gstmpegaudioparse.h
index 7d1edc952..ce8121a03 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.h
+++ b/gst/mpegaudioparse/gstmpegaudioparse.h
@@ -22,7 +22,6 @@
 #define __MP3PARSE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/passthrough/gstpassthrough.h b/gst/passthrough/gstpassthrough.h
index bcd09f9ae..fd4c24459 100644
--- a/gst/passthrough/gstpassthrough.h
+++ b/gst/passthrough/gstpassthrough.h
@@ -23,7 +23,6 @@
 #define __GST_PASSTHROUGH_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/playondemand/gstplayondemand.h b/gst/playondemand/gstplayondemand.h
index 20e9359e1..b73b5c2ad 100644
--- a/gst/playondemand/gstplayondemand.h
+++ b/gst/playondemand/gstplayondemand.h
@@ -23,7 +23,6 @@
 #define __GST_PLAYONDEMAND_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/rtjpeg/RTjpeg.h b/gst/rtjpeg/RTjpeg.h
index 90e2a8d50..92b35242f 100644
--- a/gst/rtjpeg/RTjpeg.h
+++ b/gst/rtjpeg/RTjpeg.h
@@ -21,7 +21,6 @@
    This file is a modified version of RTjpeg 0.1.2, (C) Justin Schoeman 1998
 */
 
-#include <config.h>
 #include <inttypes.h>
 
 typedef uint8_t  __u8;
diff --git a/gst/rtjpeg/gstrtjpeg.c b/gst/rtjpeg/gstrtjpeg.c
index 68e113b42..e51542916 100644
--- a/gst/rtjpeg/gstrtjpeg.c
+++ b/gst/rtjpeg/gstrtjpeg.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gstrtjpegenc.h>
 #include <gstrtjpegdec.h>
diff --git a/gst/rtjpeg/gstrtjpegdec.h b/gst/rtjpeg/gstrtjpegdec.h
index 40b16fe0d..2214ebd80 100644
--- a/gst/rtjpeg/gstrtjpegdec.h
+++ b/gst/rtjpeg/gstrtjpegdec.h
@@ -22,7 +22,6 @@
 #define __RTJPEGDEC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/rtjpeg/gstrtjpegenc.h b/gst/rtjpeg/gstrtjpegenc.h
index 57a6f588b..61303b7bc 100644
--- a/gst/rtjpeg/gstrtjpegenc.h
+++ b/gst/rtjpeg/gstrtjpegenc.h
@@ -22,7 +22,6 @@
 #define __RTJPEGENC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #include "RTjpeg.h"
diff --git a/gst/smooth/gstsmooth.h b/gst/smooth/gstsmooth.h
index efab70e02..eb32de36b 100644
--- a/gst/smooth/gstsmooth.h
+++ b/gst/smooth/gstsmooth.h
@@ -22,10 +22,8 @@
 #define __GST_SMOOTH_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
diff --git a/gst/smpte/barboxwipes.c b/gst/smpte/barboxwipes.c
index e1cab9d07..a490f632a 100644
--- a/gst/smpte/barboxwipes.c
+++ b/gst/smpte/barboxwipes.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "paint.h"
 #include "gstmask.h"
 
diff --git a/gst/smpte/gstmask.c b/gst/smpte/gstmask.c
index 6430f420d..13c79b344 100644
--- a/gst/smpte/gstmask.c
+++ b/gst/smpte/gstmask.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gstmask.h"
 #include "paint.h"
diff --git a/gst/smpte/paint.c b/gst/smpte/paint.c
index e912dfdf5..dae3c6f19 100644
--- a/gst/smpte/paint.c
+++ b/gst/smpte/paint.c
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <stdlib.h>
 #include "paint.h"
diff --git a/gst/spectrum/fix_fft.c b/gst/spectrum/fix_fft.c
index c48fbd902..a5dd658fb 100644
--- a/gst/spectrum/fix_fft.c
+++ b/gst/spectrum/fix_fft.c
@@ -47,6 +47,10 @@
 
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define fixed short
 
 /* FIX_MPY() - fixed-point multiplication macro.
diff --git a/gst/speed/gstspeed.h b/gst/speed/gstspeed.h
index 512583035..103ecdb8c 100644
--- a/gst/speed/gstspeed.h
+++ b/gst/speed/gstspeed.h
@@ -22,10 +22,6 @@
 #ifndef __GST_SPEED_H__
 #define __GST_SPEED_H__
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
diff --git a/gst/stereo/gststereo.h b/gst/stereo/gststereo.h
index 238ec1a89..8b78f25eb 100644
--- a/gst/stereo/gststereo.h
+++ b/gst/stereo/gststereo.h
@@ -22,7 +22,6 @@
 #define __GST_STEREO_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/vbidec/gstvbidec.c b/gst/vbidec/gstvbidec.c
index 1655623d1..f84533dbb 100644
--- a/gst/vbidec/gstvbidec.c
+++ b/gst/vbidec/gstvbidec.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <config.h>
+
 #include <string.h>
 #include <inttypes.h>
 #include <ctype.h>
diff --git a/gst/vbidec/vbidata.c b/gst/vbidec/vbidata.c
index b0bd7a1c0..fc0af5faf 100644
--- a/gst/vbidec/vbidata.c
+++ b/gst/vbidec/vbidata.c
@@ -26,6 +26,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/gst/vbidec/vbiscreen.c b/gst/vbidec/vbiscreen.c
index df347acac..189591f13 100644
--- a/gst/vbidec/vbiscreen.c
+++ b/gst/vbidec/vbiscreen.c
@@ -20,6 +20,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/gst/videodrop/gstvideodrop.h b/gst/videodrop/gstvideodrop.h
index 8b447e308..f5209842a 100644
--- a/gst/videodrop/gstvideodrop.h
+++ b/gst/videodrop/gstvideodrop.h
@@ -20,7 +20,6 @@
 #ifndef __GST_VIDEODROP_H__
 #define __GST_VIDEODROP_H__
 
-#include <config.h>
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
diff --git a/gst/virtualdub/gstvirtualdub.c b/gst/virtualdub/gstvirtualdub.c
index 99122bcc2..c6091233d 100644
--- a/gst/virtualdub/gstvirtualdub.c
+++ b/gst/virtualdub/gstvirtualdub.c
@@ -16,6 +16,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <gst/gst.h>
 #include "gstvirtualdub.h"
diff --git a/gst/y4m/gsty4mencode.h b/gst/y4m/gsty4mencode.h
index a42ad7274..07d369ccd 100644
--- a/gst/y4m/gsty4mencode.h
+++ b/gst/y4m/gsty4mencode.h
@@ -22,7 +22,6 @@
 #define __GST_Y4MENCODE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 /* #include <gst/meta/audioraw.h> */
 
diff --git a/sys/cdrom/gstcdplayer.h b/sys/cdrom/gstcdplayer.h
index 39aaaf431..7c6c4bf94 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 f137d953b..22ef22be2 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 986d1b2d3..65bc2c66f 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 f6ff270b6..bee59895a 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 a09e7a256..ab856bbc7 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 3f9d3df90..3d173b2be 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 39c86a0f5..d06427f42 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 15dbbb4e8..70acf979a 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 66574f327..b393bdb7d 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 de884d4d8..0bd201c84 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 f6383e015..e73933d94 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 f3b49fb03..cacd5d082 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 f6383e015..e73933d94 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 521196cf4..576b0c0bd 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 a5ab43c01..ab2c74dac 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>