diff --git a/compositor/Makefile.am b/compositor/Makefile.am
index 3e8d010b..ac634879 100644
--- a/compositor/Makefile.am
+++ b/compositor/Makefile.am
@@ -5,10 +5,9 @@ AM_CPPFLAGS =					\
 	-DMODULEDIR='"$(moduledir)"'		\
 	$(COMPOSITOR_CFLAGS)
 
-AM_CFLAGS = $(GCC_CFLAGS)
-
 wayland_compositor_LDFLAGS = -export-dynamic
 wayland_compositor_LDADD = $(COMPOSITOR_LIBS) $(DLOPEN_LIBS)
+wayland_compositor_CFLAGS = $(GCC_CFLAGS)
 
 wayland_compositor_SOURCES =			\
 	compositor.c				\
@@ -36,7 +35,7 @@ if ENABLE_X11_COMPOSITOR
 x11_backend = x11-backend.la
 x11_backend_la_LDFLAGS = -module -avoid-version
 x11_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(X11_COMPOSITOR_LIBS)
-x11_backend_la_CFLAGS = $(X11_COMPOSITOR_CFLAGS)
+x11_backend_la_CFLAGS = $(X11_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
 x11_backend_la_SOURCES = compositor-x11.c
 endif
 
@@ -44,7 +43,7 @@ if ENABLE_DRM_COMPOSITOR
 drm_backend = drm-backend.la
 drm_backend_la_LDFLAGS = -module -avoid-version
 drm_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(DRM_COMPOSITOR_LIBS)
-drm_backend_la_CFLAGS = $(DRM_COMPOSITOR_CFLAGS)
+drm_backend_la_CFLAGS = $(DRM_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
 drm_backend_la_SOURCES = compositor-drm.c tty.c evdev.c
 endif
 
@@ -52,7 +51,7 @@ if ENABLE_WAYLAND_COMPOSITOR
 wayland_backend = wayland-backend.la
 wayland_backend_la_LDFLAGS = -module -avoid-version
 wayland_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(WAYLAND_COMPOSITOR_LIBS)
-wayland_backend_la_CFLAGS = $(WAYLAND_COMPOSITOR_CFLAGS)
+wayland_backend_la_CFLAGS = $(WAYLAND_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
 wayland_backend_la_SOURCES = compositor-wayland.c
 endif
 
@@ -60,7 +59,7 @@ if ENABLE_OPENWFD_COMPOSITOR
 openwfd_backend = openwfd-backend.la
 openwfd_backend_la_LDFLAGS = -module -avoid-version
 openwfd_backend_la_LIBADD = $(COMPOSITOR_LIBS) $(OPENWFD_COMPOSITOR_LIBS)
-openwfd_backend_la_CFLAGS = $(OPENWFD_COMPOSITOR_CFLAGS)
+openwfd_backend_la_CFLAGS = $(OPENWFD_COMPOSITOR_CFLAGS) $(GCC_CFLAGS)
 openwfd_backend_la_SOURCES = compositor-openwfd.c tty.c evdev.c
 endif
 
@@ -68,6 +67,7 @@ if ENABLE_DESKTOP_SHELL
 desktop_shell = desktop-shell.la
 desktop_shell_la_LDFLAGS = -module -avoid-version
 desktop_shell_la_LIBADD = $(COMPOSITOR_LIBS)
+desktop_shell_la_CFLAGS = $(GCC_CFLAGS)
 desktop_shell_la_SOURCES =			\
 	shell.c					\
 	switcher.c
@@ -77,6 +77,7 @@ if ENABLE_MEEGO_TABLET_SHELL
 meego_tablet_shell = meego-tablet-shell.la
 meego_tablet_shell_la_LDFLAGS = -module -avoid-version
 meego_tablet_shell_la_LIBADD = $(COMPOSITOR_LIBS)
+meego_tablet_shell_la_CFLAGS = $(GCC_CFLAGS)
 meego_tablet_shell_la_SOURCES =			\
 	meego-tablet-shell.c			\
 	meego-tablet-shell.h			\