diff --git a/ChangeLog b/ChangeLog
index 1457ec2b60..787cde8369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2004-01-11  David Schleef  <ds@schleef.org>
+
+	* ext/ffmpeg/gstffmpeg.c:
+	* ext/ffmpeg/gstffmpegcodecmap.c:
+	* ext/ffmpeg/gstffmpegdec.c:
+	* ext/ffmpeg/gstffmpegenc.c:
+	* ext/ffmpeg/gstffmpegprotocol.c:
+	* ext/gdk_pixbuf/gstgdkanimation.c:
+	* ext/jpeg/gstjpeg.c:
+	* ext/libpng/gstpng.c:
+	* ext/mpeg2dec/perftest.c:
+	* ext/speex/gstspeex.c:
+	* gst-libs/gst/resample/dtos.c:
+	* gst/intfloat/gstintfloatconvert.c:
+	* gst/oneton/gstoneton.c:
+	* gst/rtjpeg/RTjpeg.c:
+	* gst/rtp/gstrtp.c:
+	* sys/dxr3/dxr3init.c:
+	* sys/glsink/gstgl_nvimage.c:
+	* sys/glsink/gstgl_pdrimage.c:
+	* sys/glsink/gstglsink.c:
+	* testsuite/gst-lint:
+	Make sure everybody wraps #include "config.h" in #ifdef HAVE_CONFIG_H
+
 2004-01-11  David Schleef  <ds@schleef.org>
 
 	* ext/alsa/gstalsasrc.c: (gst_alsa_src_set_caps):
diff --git a/gst-libs/gst/resample/dtos.c b/gst-libs/gst/resample/dtos.c
index 7c0deadc1c..268c401adc 100644
--- a/gst-libs/gst/resample/dtos.c
+++ b/gst-libs/gst/resample/dtos.c
@@ -17,6 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
 #include <math.h>
@@ -25,7 +28,6 @@
 
 /*#include <ml.h> */
 #include <resample.h>
-#include <config.h>
 
 
 
diff --git a/gst/rtjpeg/RTjpeg.c b/gst/rtjpeg/RTjpeg.c
index 7c592e98f9..e246b6bf15 100644
--- a/gst/rtjpeg/RTjpeg.c
+++ b/gst/rtjpeg/RTjpeg.c
@@ -29,7 +29,9 @@ This file contains most of the initialisation and control functions
 
 */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/sys/dxr3/dxr3init.c b/sys/dxr3/dxr3init.c
index fc44135681..8ac76213e8 100644
--- a/sys/dxr3/dxr3init.c
+++ b/sys/dxr3/dxr3init.c
@@ -19,7 +19,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include "dxr3videosink.h"
 #include "dxr3spusink.h"
diff --git a/sys/glsink/gstgl_nvimage.c b/sys/glsink/gstgl_nvimage.c
index 79caf2be6c..84a1ad95c0 100644
--- a/sys/glsink/gstgl_nvimage.c
+++ b/sys/glsink/gstgl_nvimage.c
@@ -1,4 +1,6 @@
+#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/gstgl_pdrimage.c b/sys/glsink/gstgl_pdrimage.c
index 00df9a60a3..3cc5c57f7b 100644
--- a/sys/glsink/gstgl_pdrimage.c
+++ b/sys/glsink/gstgl_pdrimage.c
@@ -1,4 +1,6 @@
+#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/gstglsink.c b/sys/glsink/gstglsink.c
index 3e1e56ceed..21cac1f36e 100644
--- a/sys/glsink/gstglsink.c
+++ b/sys/glsink/gstglsink.c
@@ -25,7 +25,9 @@
 <ds-work> _chain, -get, _loop
 */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include <string.h>
 
 #include <X11/Xlib.h>