diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index 77d48f4aa5..d993bca338 100644
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -8,14 +8,16 @@ libgstogg_la_SOURCES = \
 	gstoggaviparse.c \
 	gstoggparse.c \
 	gstoggstream.c \
-	gstoggstream.h \
 	dirac_parse.c \
-	dirac_parse.h \
-	vorbis_parse.c \
-	vorbis_parse.h
+	vorbis_parse.c
 
 noinst_HEADERS = \
-	gstoggdemux.h gstoggmux.h
+	gstogg.h \
+	gstoggdemux.h \
+	gstoggmux.h \
+	gstoggstream.h \
+	dirac_parse.h \
+	vorbis_parse.h
 
 libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS)
 libgstogg_la_LIBADD = \
diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index db5d3f431e..7f5a900f7e 100644
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -53,6 +53,7 @@ libgstdecodebin2_la_LIBADD = \
 libgstdecodebin2_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \
+	gstplayback.h \
 	gstplaybasebin.h \
 	gstplaysink.h \
 	gststreaminfo.h \
diff --git a/gst/playback/gstplayback.h b/gst/playback/gstplayback.h
index e50705dd4c..4be121ca21 100644
--- a/gst/playback/gstplayback.h
+++ b/gst/playback/gstplayback.h
@@ -28,4 +28,4 @@ gboolean gst_play_bin_plugin_init (GstPlugin * plugin);
 gboolean gst_play_bin2_plugin_init (GstPlugin * plugin);
 
 
-#endif /* __GST_PLAY_SINK_H__ */
+#endif /* __GST_PLAY_BACK_H__ */