diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am
index 8f4b3fc4a7..923c2733c7 100644
--- a/gst/aiff/Makefile.am
+++ b/gst/aiff/Makefile.am
@@ -2,11 +2,10 @@ plugin_LTLIBRARIES = libgstaiff.la
 
 libgstaiff_la_SOURCES = aiffparse.c
 libgstaiff_la_CFLAGS = \
-	$(GST_BASE_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
+	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
 libgstaiff_la_LIBADD = \
-	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_BASE_LIBS) \
 	$(LIBM)
 libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/aiff/aiffparse.c b/gst/aiff/aiffparse.c
index c621078571..81ce145ce9 100644
--- a/gst/aiff/aiffparse.c
+++ b/gst/aiff/aiffparse.c
@@ -56,7 +56,7 @@
 #include <math.h>
 
 #include "aiffparse.h"
-#include "gst/audio/audio.h"
+#include <gst/audio/audio.h>
 #include <gst/gst-i18n-plugin.h>
 
 GST_DEBUG_CATEGORY_STATIC (aiffparse_debug);
diff --git a/gst/aiff/aiffparse.h b/gst/aiff/aiffparse.h
index daca59ccf6..9cb7453205 100644
--- a/gst/aiff/aiffparse.h
+++ b/gst/aiff/aiffparse.h
@@ -23,8 +23,6 @@
 
 
 #include <gst/gst.h>
-#include "gst/riff/riff-ids.h"
-#include "gst/riff/riff-read.h"
 #include <gst/base/gstadapter.h>
 
 G_BEGIN_DECLS