diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c
index 48154edce6..be7a1dd6d1 100644
--- a/ext/a52dec/gsta52dec.c
+++ b/ext/a52dec/gsta52dec.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/a52dec/gsta52dec.h b/ext/a52dec/gsta52dec.h
index 4cffd90808..1a4ebd8020 100644
--- a/ext/a52dec/gsta52dec.h
+++ b/ext/a52dec/gsta52dec.h
@@ -21,7 +21,6 @@
 #ifndef __GST_A52DEC_H__
 #define __GST_A52DEC_H__
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 
diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c
index 2d386975f4..51dd23a5ef 100644
--- a/ext/dvdnav/dvdnavsrc.c
+++ b/ext/dvdnav/dvdnavsrc.c
@@ -20,6 +20,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -29,8 +30,6 @@
 #include <assert.h>
 #include <gst/gst.h>
 
-#include "config.h"
-
 #include <dvdnav/dvdnav.h>
 #include <dvdread/nav_print.h>
 
diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c
index b310353c62..9a4c755c10 100644
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
@@ -38,6 +38,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -55,8 +56,6 @@
 
 #include <dvdreadsrc.h>
 
-#include "config.h"
-
 #include <dvdread/dvd_reader.h>
 #include <dvdread/ifo_types.h>
 #include <dvdread/ifo_read.h>
diff --git a/ext/dvdread/dvdreadsrc.h b/ext/dvdread/dvdreadsrc.h
index 7d81490d8d..c896f01d68 100644
--- a/ext/dvdread/dvdreadsrc.h
+++ b/ext/dvdread/dvdreadsrc.h
@@ -22,7 +22,6 @@
 #define __DVDREADSRC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/ext/lame/gstlame.h b/ext/lame/gstlame.h
index d79da0afaf..4cbf3412d7 100644
--- a/ext/lame/gstlame.h
+++ b/ext/lame/gstlame.h
@@ -22,7 +22,6 @@
 #define __GST_LAME_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 #ifdef __cplusplus
diff --git a/ext/mpeg2dec/gstmpeg2dec.h b/ext/mpeg2dec/gstmpeg2dec.h
index a040c484dc..3da4fabeaf 100644
--- a/ext/mpeg2dec/gstmpeg2dec.h
+++ b/ext/mpeg2dec/gstmpeg2dec.h
@@ -22,7 +22,6 @@
 #define __GST_MPEG2DEC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <mpeg2.h>
 
diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc
index f45ab5c5f6..e3e47e2d72 100644
--- a/ext/sidplay/gstsiddec.cc
+++ b/ext/sidplay/gstsiddec.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/sidplay/gstsiddec.h b/ext/sidplay/gstsiddec.h
index 2a7d7b9725..65c3419853 100644
--- a/ext/sidplay/gstsiddec.h
+++ b/ext/sidplay/gstsiddec.h
@@ -22,8 +22,6 @@
 #define __GST_SIDDEC_H__
 
 
-#include <config.h>
-
 #include <stdlib.h>
 #include <sidplay/player.h>
 
diff --git a/gst-libs/ext/mplex/buffer.cc b/gst-libs/ext/mplex/buffer.cc
index 2b29180252..24f5fd246e 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 95e32dbac3..b60c664398 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 1b6d10b382..6f9806f07c 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 342009ff3c..feb06d507c 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 3a232b76a3..0d5809f19a 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 8a1c5823f1..541a086b49 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 fcb7de37df..efb3ddb36d 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 3c9e9bb9ff..2742667212 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 520c391335..b215bd7843 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 c3c66215cc..f5b270ebb8 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 119b7fd14b..e08e6adbe8 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 0090d8a723..3b640976ef 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 b92371374b..77981598d7 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 b559463d60..92957e16a6 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 486262e56a..64963661a8 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 c392e676a7..7650453a28 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 94dbec15d4..75b81f366c 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 fb8ba87f3c..476e611e1a 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 b298e86dcd..52a80e61ae 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 a22b1849d9..630725d562 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 72a7820b8e..72c9e4bb9c 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 612bdbaf5b..d33aefe34f 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/ac3parse/gstac3parse.h b/gst/ac3parse/gstac3parse.h
index f37419f0a7..e93746d22b 100644
--- a/gst/ac3parse/gstac3parse.h
+++ b/gst/ac3parse/gstac3parse.h
@@ -22,7 +22,6 @@
 #define __AC3PARSE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 
 
diff --git a/gst/asfdemux/gstasfdemux.h b/gst/asfdemux/gstasfdemux.h
index a38b8be1e7..30b6cb1abb 100644
--- a/gst/asfdemux/gstasfdemux.h
+++ b/gst/asfdemux/gstasfdemux.h
@@ -21,7 +21,6 @@
 #ifndef __ASF_DEMUX_H__
 #define __ASF_DEMUX_H__
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/riff/riff.h>
 #include <gst/bytestream/bytestream.h>
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.h b/gst/mpegaudioparse/gstmpegaudioparse.h
index 7d1edc9528..ce8121a032 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/mpegstream/gstmpegclock.c b/gst/mpegstream/gstmpegclock.c
index 39b9fe057b..bad69a9f2c 100644
--- a/gst/mpegstream/gstmpegclock.c
+++ b/gst/mpegstream/gstmpegclock.c
@@ -20,6 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gstmpegclock.h"
 
 static void 		gst_mpeg_clock_class_init 	(GstMPEGClockClass *klass);
diff --git a/gst/mpegstream/gstmpegdemux.h b/gst/mpegstream/gstmpegdemux.h
index 74d1f3c3be..215c0d0f6e 100644
--- a/gst/mpegstream/gstmpegdemux.h
+++ b/gst/mpegstream/gstmpegdemux.h
@@ -22,7 +22,6 @@
 #define __MPEG_DEMUX_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include "gstmpegparse.h"
 
diff --git a/gst/mpegstream/gstmpegpacketize.c b/gst/mpegstream/gstmpegpacketize.c
index cb6b339d64..e5a4b37a84 100644
--- a/gst/mpegstream/gstmpegpacketize.c
+++ b/gst/mpegstream/gstmpegpacketize.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 /*#define GST_DEBUG_ENABLED */
 #include <gstmpegpacketize.h>
diff --git a/gst/mpegstream/gstmpegpacketize.h b/gst/mpegstream/gstmpegpacketize.h
index 415f718855..c632cc70ce 100644
--- a/gst/mpegstream/gstmpegpacketize.h
+++ b/gst/mpegstream/gstmpegpacketize.h
@@ -22,7 +22,6 @@
 #define __MPEGPACKETIZE_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 
diff --git a/gst/mpegstream/gstrfc2250enc.h b/gst/mpegstream/gstrfc2250enc.h
index 52e350259d..1846baf7b4 100644
--- a/gst/mpegstream/gstrfc2250enc.h
+++ b/gst/mpegstream/gstrfc2250enc.h
@@ -22,7 +22,6 @@
 #define __RFC2250_ENC_H__
 
 
-#include <config.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 #include "gstmpegpacketize.h"
diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c
index 195b9f17f5..8c3beb7be6 100644
--- a/gst/synaesthesia/gstsynaesthesia.c
+++ b/gst/synaesthesia/gstsynaesthesia.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>
 #include "synaescope.h"
diff --git a/gst/synaesthesia/synaescope.c b/gst/synaesthesia/synaescope.c
index b5cdde720f..7cb11611a5 100644
--- a/gst/synaesthesia/synaescope.c
+++ b/gst/synaesthesia/synaescope.c
@@ -18,6 +18,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "synaescope.h"
 
 #include <pthread.h>