diff --git a/ChangeLog b/ChangeLog
index 2d5a4f4514..e6c8382b8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2004-07-27  Steve Lhomme  <steve.lhomme@free.fr>
+
+	* gst/median/gstmedian.c:
+	* gst/mpeg2subt/gstmpeg2subt.c:
+	* gst/mpegaudioparse/gstmpegaudioparse.c:
+	* gst/mpegstream/gstdvddemux.c:
+	* gst/mpegstream/gstmpegdemux.c:
+	* gst/mpegstream/gstmpegpacketize.c:
+	* gst/rtjpeg/gstrtjpeg.c:
+	* gst/rtjpeg/gstrtjpegdec.c:
+	* gst/rtjpeg/gstrtjpegenc.c:
+	* gst/sine/gstsinesrc.c:
+	* gst/smooth/gstsmooth.c:
+	* gst/smpte/gstsmpte.c:
+	* gst/smpte/gstsmpte.h:
+	* gst/stereo/gststereo.c:
+	* gst/videofilter/gstgamma.c:
+	* gst/videofilter/gstvideobalance.c:
+	* gst/videofilter/gstvideofilter.c:
+	* gst/videofilter/gstvideoflip.c:
+	* gst/videoscale/gstvideoscale.c:
+	* gst/videoscale/videoscale.c:
+	* gst/videotestsrc/gstvideotestsrc.c:
+	* gst/videotestsrc/videotestsrc.c:
+	* gst/wavenc/gstwavenc.c:
+	* gst/wavparse/gstwavparse.c:
+	  fix local includes and 64 bits constants
+    
 2004-07-27  Steve Lhomme  <steve.lhomme@free.fr>
 
 	* win32/gst.sln:
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index 2db8f40e1d..07c107c36c 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -22,7 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gstmpeg2subt.h>
+#include "gstmpeg2subt.h"
 #include <string.h>
 
 static void gst_mpeg2subt_class_init (GstMpeg2SubtClass * klass);
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 17e11c4bda..98fce11ca0 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -21,7 +21,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gstmpegaudioparse.h>
+#include "gstmpegaudioparse.h"
 
 
 /* elementfactory information */
diff --git a/gst/rtjpeg/gstrtjpeg.c b/gst/rtjpeg/gstrtjpeg.c
index 2a90e30a93..6eaff5998d 100644
--- a/gst/rtjpeg/gstrtjpeg.c
+++ b/gst/rtjpeg/gstrtjpeg.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #endif
 
-#include <gstrtjpegenc.h>
-#include <gstrtjpegdec.h>
+#include "gstrtjpegenc.h"
+#include "gstrtjpegdec.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
diff --git a/gst/rtjpeg/gstrtjpegdec.c b/gst/rtjpeg/gstrtjpegdec.c
index 8f4c9e2538..54a2798576 100644
--- a/gst/rtjpeg/gstrtjpegdec.c
+++ b/gst/rtjpeg/gstrtjpegdec.c
@@ -21,7 +21,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gstrtjpegdec.h>
+#include "gstrtjpegdec.h"
 
 
 
diff --git a/gst/rtjpeg/gstrtjpegenc.c b/gst/rtjpeg/gstrtjpegenc.c
index 4162004359..277074cc96 100644
--- a/gst/rtjpeg/gstrtjpegenc.c
+++ b/gst/rtjpeg/gstrtjpegenc.c
@@ -21,7 +21,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gstrtjpegenc.h>
+#include "gstrtjpegenc.h"
 
 /* elementfactory information */
 GstElementDetails gst_rtjpegenc_details = {
diff --git a/gst/smooth/gstsmooth.c b/gst/smooth/gstsmooth.c
index fd2d576af7..0ebca104ec 100644
--- a/gst/smooth/gstsmooth.c
+++ b/gst/smooth/gstsmooth.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 #include <string.h>
-#include <gstsmooth.h>
+#include "gstsmooth.h"
 #include <gst/video/video.h>
 
 /* elementfactory information */
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index ab42b516f6..2694575247 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 #include <string.h>
-#include <gstsmpte.h>
+#include "gstsmpte.h"
 #include <gst/video/video.h>
 #include "paint.h"
 
diff --git a/gst/smpte/gstsmpte.h b/gst/smpte/gstsmpte.h
index 40844209f9..2142c05445 100644
--- a/gst/smpte/gstsmpte.h
+++ b/gst/smpte/gstsmpte.h
@@ -22,7 +22,7 @@
 #define __GST_SMPTE_H__
 
 #include <gst/gst.h>
-#include <gstmask.h>
+#include "gstmask.h"
 
 #define GST_TYPE_SMPTE \
   (gst_smpte_get_type())
diff --git a/gst/stereo/gststereo.c b/gst/stereo/gststereo.c
index a0fb74a387..50aea79af2 100644
--- a/gst/stereo/gststereo.c
+++ b/gst/stereo/gststereo.c
@@ -25,7 +25,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gststereo.h>
+#include "gststereo.h"
 
 /* elementfactory information */
 static GstElementDetails stereo_details = GST_ELEMENT_DETAILS ("Stereo effect",