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/ext/mpeg2dec/perftest.c b/ext/mpeg2dec/perftest.c
index 0d3209c572..001826fea0 100644
--- a/ext/mpeg2dec/perftest.c
+++ b/ext/mpeg2dec/perftest.c
@@ -1,6 +1,7 @@
 
-
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 #include <gst/gst.h>
 #include <unistd.h>
 #include <fcntl.h>
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>