diff --git a/ChangeLog b/ChangeLog
index d5f7bc6309..ecd41235a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-07-30  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Ian Munro  <imunro at netspace net au>
+
+	* gst/bayer/gstbayer2rgb.c:
+	  Include our own "_stdint.h" instead of <stdint.h> (which may not
+	  be available).
+
+	* gst/speed/gstspeed.h:
+	  Native HP-UX compiler dosn't seem to like enum typedefs before the
+	  actual enum was defined.
+
+	* gst/vmnc/vmncdec.c:
+	  Fix wrong usage of GST_ELEMENT_ERROR macro (#461373).
+
 2007-07-26  Edward Hervey  <bilboed@bilboed.com>
 
 	* gst/real/gstrealaudiodec.c: (gst_real_audio_dec_setcaps):
diff --git a/gst/bayer/gstbayer2rgb.c b/gst/bayer/gstbayer2rgb.c
index 7c278869a0..f1f3f7fbe8 100644
--- a/gst/bayer/gstbayer2rgb.c
+++ b/gst/bayer/gstbayer2rgb.c
@@ -32,7 +32,7 @@
 #include <gst/base/gstbasetransform.h>
 #include <gst/video/video.h>
 #include <string.h>
-#include <stdint.h>
+#include "_stdint.h"
 
 #define GST_CAT_DEFAULT gst_bayer2rgb_debug
 GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
diff --git a/gst/speed/gstspeed.h b/gst/speed/gstspeed.h
index 1ec737b1a8..19b5c36c87 100644
--- a/gst/speed/gstspeed.h
+++ b/gst/speed/gstspeed.h
@@ -39,13 +39,14 @@ G_BEGIN_DECLS
 
 typedef struct _GstSpeed GstSpeed;
 typedef struct _GstSpeedClass GstSpeedClass;
-typedef enum _GstSpeedFormat GstSpeedFormat;
 
 enum _GstSpeedFormat {
   GST_SPEED_FORMAT_INT,
   GST_SPEED_FORMAT_FLOAT
 };
 
+typedef enum _GstSpeedFormat GstSpeedFormat;
+
 struct _GstSpeed {
   GstElement     element;
 
diff --git a/gst/vmnc/vmncdec.c b/gst/vmnc/vmncdec.c
index 701b18e9ca..e6c6f8aea3 100644
--- a/gst/vmnc/vmncdec.c
+++ b/gst/vmnc/vmncdec.c
@@ -993,7 +993,7 @@ vmnc_dec_chain_frame (GstVMncDec * dec, GstBuffer * inbuf,
 
   if (res < 0) {
     ret = GST_FLOW_ERROR;
-    GST_ELEMENT_ERROR (dec, STREAM, DECODE, NULL, ("Couldn't decode packet"));
+    GST_ELEMENT_ERROR (dec, STREAM, DECODE, (NULL), ("Couldn't decode packet"));
   } else {
     GST_DEBUG_OBJECT (dec, "read %d bytes of %d", res, len);
     /* inbuf may be NULL; that's ok */