diff --git a/ChangeLog b/ChangeLog
index ceb9f16801..f559beabd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-26  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* ext/musepack/gstmusepackdec.h:
+	* ext/musepack/gstmusepackreader.c:
+	First include the libmpcdec headers before everything else as they
+	#define TRUE and FALSE unconditionally and we otherwise get conflicts
+	with the ones that GLib defines.
+
 2008-01-26  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* configure.ac:
diff --git a/ext/musepack/gstmusepackdec.h b/ext/musepack/gstmusepackdec.h
index 35baced0fb..858372fd3a 100644
--- a/ext/musepack/gstmusepackdec.h
+++ b/ext/musepack/gstmusepackdec.h
@@ -20,8 +20,8 @@
 #ifndef __GST_MUSEPACK_DEC_H__
 #define __GST_MUSEPACK_DEC_H__
 
-#include <gst/gst.h>
 #include <mpcdec/mpcdec.h>
+#include <gst/gst.h>
 
 G_BEGIN_DECLS
 
diff --git a/ext/musepack/gstmusepackreader.c b/ext/musepack/gstmusepackreader.c
index d98f48f672..10de6b0d41 100644
--- a/ext/musepack/gstmusepackreader.c
+++ b/ext/musepack/gstmusepackreader.c
@@ -21,10 +21,10 @@
 #include "config.h"
 #endif
 
+#include "gstmusepackreader.h"
 #include <gst/gst.h>
 #include <string.h>
 
-#include "gstmusepackreader.h"
 
 GST_DEBUG_CATEGORY_EXTERN (musepackdec_debug);
 #define GST_CAT_DEFAULT musepackdec_debug