diff --git a/info-daemon/Makefile.am b/info-daemon/Makefile.am
index 3cd232740e..af595db3a7 100644
--- a/info-daemon/Makefile.am
+++ b/info-daemon/Makefile.am
@@ -1,5 +1,7 @@
 
-INCLUDES =								\
+INCLUDES = -I${top_srcdir}
+
+CPPFLAGS =								\
 	$(NM_CFLAGS)							\
 	$(GTK_CFLAGS)							\
 	$(GDK_PIXBUF_CFLAGS)						\
diff --git a/panel-applet/Makefile.am b/panel-applet/Makefile.am
index 44976ef2c2..320b5c4d9c 100644
--- a/panel-applet/Makefile.am
+++ b/panel-applet/Makefile.am
@@ -3,7 +3,9 @@ SUBDIRS=icons
 NULL=
 NOTIFICATION_ICON_SOURCE=@NOTIFICATION_ICON_SRC@
 
-INCLUDES = 							\
+INCLUDES = -I${top_srcdir}
+
+CPPFLAGS = 							\
 	$(NM_CFLAGS)						\
 	$(GLADE_CFLAGS)						\
 	$(DBUS_CFLAGS)						\
diff --git a/src/Makefile.am b/src/Makefile.am
index 873726b154..66c9268684 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,9 @@
 
-INCLUDES = 						\
+INCLUDES = -I${top_srcdir}
+
+CPPFLAGS = 						\
 	$(NM_CFLAGS) 			   		\
-	$(OPENSSL_CFLAGS)				\
+	$(OPENSSL_CFLAGS)				\	
 	-Wall						\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
 	-DG_DISABLE_DEPRECATED			\
diff --git a/test/Makefile.am b/test/Makefile.am
index 4549475590..28ae6dc729 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES =						\
+INCLUDES = -I${top_srcdir}
+
+CPPFLAGS =						\
 	$(NM_CFLAGS)					\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
 	-DBINDIR=\"$(bindir)\"			\