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

68 files changed, 195 insertions, 31 deletions

diff --git a/gst/cdxaparse/gstcdxaparse.h b/gst/cdxaparse/gstcdxaparse.h
index fcf77107..32af5527 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 b7b1de95..f100d96a 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 131b5bff..45eda04a 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 f1e382ef..ab463106 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 1ef31540..13e2e937 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 8a84d2b0..b64c90c4 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 34e6176b..9cc2a416 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 37b6c648..4ac6bc4e 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 2b5994c2..d6202e69 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 0ee94bd0..910ef549 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 a0dbfabd..2d361a79 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 a7578711..37a34185 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 05d219b7..6d53f5a4 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 df46cc64..95cf6375 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 f8b803b6..f49e65a2 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 4f51469f..d84817ee 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 33004503..5c7ab4c0 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 1764759a..29ea0d24 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 2d86ce82..5da56979 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 68572b5c..20cb176d 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 3f7e8280..76eafe51 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 3e48739d..61f2d066 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 563839f1..eaee2007 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 06737687..534cda20 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 4c4e08a1..7b4dd370 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 19966a68..b56d7755 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 28039153..8a4d7ac6 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 f4dead4b..bb3a5aaa 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 10e3d555..4ddf64ba 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 91e1b304..a676ebe6 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 8913c740..8c2deef7 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 3bcd1328..6eaf91e6 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 8bc8939e..d63de118 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 200ee3b9..333ebbcc 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 aea7d24c..5e07c881 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 0c2f643d..54a06360 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 bcae2020..00506d4a 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 78722d5a..da4cb146 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 7e31062b..b65a1134 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 b322f636..0fe6f459 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 4fd2955b..e5090943 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 02b7d4af..2208cd08 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 53104a31..0d029529 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 7c26063a..44555332 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 d0b3388a..aa6de41a 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 f34db3f3..0928c5e0 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 5d06738c..b8b4f016 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 aed08e73..29f60b27 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 7d1edc95..ce8121a0 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 bcd09f9a..fd4c2445 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 20e9359e..b73b5c2a 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 90e2a8d5..92b35242 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 68e113b4..e5154291 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 40b16fe0..2214ebd8 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 57a6f588..61303b7b 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 efab70e0..eb32de36 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 e1cab9d0..a490f632 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 6430f420..13c79b34 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 e912dfdf..dae3c6f1 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 c48fbd90..a5dd658f 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 51258303..103ecdb8 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 238ec1a8..8b78f25e 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 1655623d..f84533db 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 b0bd7a1c..fc0af5fa 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 df347aca..189591f1 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 8b447e30..f5209842 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 99122bcc..c6091233 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 a42ad727..07d369cc 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> */