diff --git a/clutter/pango/Makefile.am b/clutter/pango/Makefile.am
index 56197736f..7828fd963 100644
--- a/clutter/pango/Makefile.am
+++ b/clutter/pango/Makefile.am
@@ -14,7 +14,7 @@ source_h_priv = \
 noinst_LTLIBRARIES = libcoglpango.la
 
 libcoglpango_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
-libcoglpango_la_CPPFLAGS = $(CLUTTER_CFLAGS)
+libcoglpango_la_CPPFLAGS = $(CLUTTER_CFLAGS) $(COGL_DEBUG_CFLAGS) $(MAINTAINER_CFLAGS)
 libcoglpango_la_LIBADD = $(CLUTTER_LIBS)
 
 INCLUDES = \
@@ -25,10 +25,7 @@ INCLUDES = \
 	-I$(top_srcdir)/clutter		\
 	-I$(top_srcdir)/clutter/cogl	\
 	-I$(top_builddir)/clutter	\
-	-I$(top_builddir)/clutter/cogl	\
-	$(CLUTTER_DEBUG_CFLAGS)		\
-	$(COGL_DEBUG_CFLAGS)		\
-	$(MAINTAINER_CFLAGS)
+	-I$(top_builddir)/clutter/cogl
 
-coglpangoheadersdir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/cogl
+coglpangoheadersdir = $(includedir)/clutter-@CLUTTER_API_VERSION@/cogl
 coglpangoheaders_HEADERS = $(source_h)