diff --git a/ext/soundtouch/gstbpmdetect.cc b/ext/soundtouch/gstbpmdetect.cc
index 56ba087cd9..710ba86665 100644
--- a/ext/soundtouch/gstbpmdetect.cc
+++ b/ext/soundtouch/gstbpmdetect.cc
@@ -17,8 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#define FLOAT_SAMPLES 1
-#include <soundtouch/BPMDetect.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those
  * variables while it shouldn't. */
 #undef VERSION
@@ -29,10 +31,8 @@
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE
 
-/* FIXME: keep it here to avoid PACKAGE* redefinition warnings */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#define FLOAT_SAMPLES 1
+#include <soundtouch/BPMDetect.h>
 
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>
diff --git a/ext/soundtouch/gstpitch.cc b/ext/soundtouch/gstpitch.cc
index 3990b9d48f..2ad0509b5f 100644
--- a/ext/soundtouch/gstpitch.cc
+++ b/ext/soundtouch/gstpitch.cc
@@ -17,8 +17,10 @@
  *
  */
 
-#define FLOAT_SAMPLES 1
-#include <soundtouch/SoundTouch.h>
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 /* FIXME: workaround for SoundTouch.h of version 1.3.1 defining those
  * variables while it shouldn't. */
 #undef VERSION
@@ -29,9 +31,8 @@
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
+#define FLOAT_SAMPLES 1
+#include <soundtouch/SoundTouch.h>
 
 #include <gst/gst.h>
 #include <gst/controller/gstcontroller.h>
diff --git a/gst-libs/gst/signalprocessor/gstsignalprocessor.c b/gst-libs/gst/signalprocessor/gstsignalprocessor.c
index 9b3e3ab7f2..80b366cf92 100644
--- a/gst-libs/gst/signalprocessor/gstsignalprocessor.c
+++ b/gst-libs/gst/signalprocessor/gstsignalprocessor.c
@@ -37,13 +37,13 @@
  *    the buffer
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include <gst/audio/audio.h>
 #include "gstsignalprocessor.h"
 
diff --git a/gst/audioparsers/gstaacparse.c b/gst/audioparsers/gstaacparse.c
index 0debf38eaa..db63c5a515 100644
--- a/gst/audioparsers/gstaacparse.c
+++ b/gst/audioparsers/gstaacparse.c
@@ -45,12 +45,12 @@
  * </refsect2>
  */
 
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstaacparse.h"
 
 
diff --git a/gst/audioparsers/gstamrparse.c b/gst/audioparsers/gstamrparse.c
index 0f1896a448..0266ee875a 100644
--- a/gst/audioparsers/gstamrparse.c
+++ b/gst/audioparsers/gstamrparse.c
@@ -39,12 +39,12 @@
  * </refsect2>
  */
 
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <string.h>
+
 #include "gstamrparse.h"
 
 
diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c
index 4d49417836..962357b699 100644
--- a/gst/h264parse/gsth264parse.c
+++ b/gst/h264parse/gsth264parse.c
@@ -24,13 +24,13 @@
  */
 
 
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "gsth264parse.h"
 
 static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink",
diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am
index 5e76dcc250..a3e56fc416 100644
--- a/gst/mpegdemux/Makefile.am
+++ b/gst/mpegdemux/Makefile.am
@@ -17,7 +17,7 @@ libgstmpegdemux_la_CFLAGS = \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
 libgstmpegdemux_la_LIBADD = \
-	$(GST_PLUGINS_BASE_CFLAGS) -lgsttag-$(GST_MAJORMINOR) \
+	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
 libgstmpegdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstmpegdemux_la_LIBTOOLFLAGS = --tag=disable-static