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-libs/gst/video/gstvideofilter.c b/gst-libs/gst/video/gstvideofilter.c
index 0fb2eb9ae4..6ba77f5d26 100644
--- a/gst-libs/gst/video/gstvideofilter.c
+++ b/gst-libs/gst/video/gstvideofilter.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 /*#define DEBUG_ENABLED */
-#include <gstvideofilter.h>
+#include "gstvideofilter.h"
 
 
 
diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index 7d6a9c7052..838e7107e4 100644
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <gst/control/control.h>
 
-#include <gstsinesrc.h>
+#include "gstsinesrc.h"
 
 /* elementfactory information */
 GstElementDetails gst_sinesrc_details = {
@@ -183,8 +183,8 @@ gst_sinesrc_init (GstSineSrc * src)
   src->table_pos = 0.0;
   src->table_size = 1024;
   src->samples_per_buffer = 1024;
-  src->timestamp = 0LLU;
-  src->offset = 0LLU;
+  src->timestamp = G_GINT64_CONSTANT (0);
+  src->offset = G_GINT64_CONSTANT (0);
 
   src->seq = 0;
 
@@ -484,8 +484,8 @@ gst_sinesrc_change_state (GstElement * element)
 
   switch (GST_STATE_TRANSITION (element)) {
     case GST_STATE_PAUSED_TO_READY:
-      src->timestamp = 0LLU;
-      src->offset = 0LLU;
+      src->timestamp = G_GINT64_CONSTANT (0);
+      src->offset = G_GINT64_CONSTANT (0);
       break;
     default:
       break;
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index 510960f8aa..549491266b 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -21,8 +21,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gstvideoscale.h>
-#include <videoscale.h>
+#include "gstvideoscale.h"
+#include "videoscale.h"
 
 
 /* debug variable definition */
diff --git a/gst/videoscale/videoscale.c b/gst/videoscale/videoscale.c
index 1d58fa8b72..f85e463986 100644
--- a/gst/videoscale/videoscale.c
+++ b/gst/videoscale/videoscale.c
@@ -25,7 +25,7 @@
 #include <gst/gst.h>
 #include <stdlib.h>
 #include <math.h>
-#include <videoscale.h>
+#include "videoscale.h"
 #include <string.h>
 
 #include "gstvideoscale.h"
diff --git a/gst/videotestsrc/gstvideotestsrc.c b/gst/videotestsrc/gstvideotestsrc.c
index adc52f6828..ba0acc6007 100644
--- a/gst/videotestsrc/gstvideotestsrc.c
+++ b/gst/videotestsrc/gstvideotestsrc.c
@@ -20,8 +20,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include <gstvideotestsrc.h>
-#include <videotestsrc.h>
+#include "gstvideotestsrc.h"
+#include "videotestsrc.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/gst/videotestsrc/videotestsrc.c b/gst/videotestsrc/videotestsrc.c
index 77d8ed0d77..e9b4b13707 100644
--- a/gst/videotestsrc/videotestsrc.c
+++ b/gst/videotestsrc/videotestsrc.c
@@ -23,8 +23,8 @@
 
 /* non-GST-specific stuff */
 
-#include <gstvideotestsrc.h>
-#include <videotestsrc.h>
+#include "gstvideotestsrc.h"
+#include "videotestsrc.h"
 #ifdef HAVE_LIBOIL
 #include <liboil/liboil.h>
 #endif