diff --git a/client/Makefile.am b/client/Makefile.am
index ba3ce767..ebc6ce0d 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -196,7 +196,7 @@ spicec_SOURCES +=		\
 endif
 
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-D__STDC_LIMIT_MACROS				\
 	$(PLATFORM_INCLUDES)				\
 	-I$(top_srcdir)/spice-common			\
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 655bc83c..f4ae661b 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/common			\
 	-I$(top_srcdir)/server			\
@@ -11,7 +11,7 @@ INCLUDES =					\
 	$(NULL)
 
 if SUPPORT_AUTOMATED_TESTS
-INCLUDES += -DAUTOMATED_TESTS
+AM_CPPFLAGS += -DAUTOMATED_TESTS
 endif
 
 LDADD =								\
diff --git a/spice-common b/spice-common
index fe939082..3363fe79 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit fe93908238196bd632287fc9875e6f2e11105d04
+Subproject commit 3363fe79f9d450774dd018a794c0b4381c1ef0a7