diff -durN libbonobo-2.32.1.orig/activation-server/Makefile.am libbonobo-2.32.1/activation-server/Makefile.am
--- libbonobo-2.32.1.orig/activation-server/Makefile.am	2013-11-06 07:16:12.000000000 +0400
+++ libbonobo-2.32.1/activation-server/Makefile.am	2013-11-06 07:24:23.822543849 +0400
@@ -6,7 +6,7 @@
 libexec_PROGRAMS=bonobo-activation-server
 noinst_PROGRAMS=test-performance
 
-INCLUDES=					\
+AM_CPPFLAGS=					\
 	-I$(top_srcdir) 			\
 	-I$(top_builddir) 			\
 	-I$(top_builddir)/bonobo-activation	\
diff -durN libbonobo-2.32.1.orig/bonobo/Makefile.am libbonobo-2.32.1/bonobo/Makefile.am
--- libbonobo-2.32.1.orig/bonobo/Makefile.am	2010-08-18 21:41:32.000000000 +0400
+++ libbonobo-2.32.1/bonobo/Makefile.am	2013-11-06 07:24:23.830543707 +0400
@@ -1,5 +1,5 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
 	$(WARN_CFLAGS)					\
diff -durN libbonobo-2.32.1.orig/bonobo-activation/Makefile.am libbonobo-2.32.1/bonobo-activation/Makefile.am
--- libbonobo-2.32.1.orig/bonobo-activation/Makefile.am	2010-08-18 21:41:32.000000000 +0400
+++ libbonobo-2.32.1/bonobo-activation/Makefile.am	2013-11-06 07:24:23.822543849 +0400
@@ -2,7 +2,7 @@
 
 lib_LTLIBRARIES=libbonobo-activation.la
 
-INCLUDES=					\
+AM_CPPFLAGS=					\
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
 	-DPREFIX=\""$(prefix)\""		\
diff -durN libbonobo-2.32.1.orig/idl/Makefile.am libbonobo-2.32.1/idl/Makefile.am
--- libbonobo-2.32.1.orig/idl/Makefile.am	2010-08-18 21:41:32.000000000 +0400
+++ libbonobo-2.32.1/idl/Makefile.am	2013-11-06 07:24:23.830543707 +0400
@@ -48,7 +48,7 @@
 	-D__Bonobo_GenericFactory_COMPILATION \
 	-D__Bonobo_Activation_types_COMPILATION
 
-INCLUDES =  \
+AM_CPPFLAGS =  \
 	-I. \
 	$(LIBBONOBO_CFLAGS) \
 	$(WARN_CFLAGS)
diff -durN libbonobo-2.32.1.orig/monikers/Makefile.am libbonobo-2.32.1/monikers/Makefile.am
--- libbonobo-2.32.1.orig/monikers/Makefile.am	2010-08-18 21:41:32.000000000 +0400
+++ libbonobo-2.32.1/monikers/Makefile.am	2013-11-06 07:24:23.830543707 +0400
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) 				\
 	$(WARN_CFLAGS)					\
 	$(LIBBONOBO_CFLAGS)				\
diff -durN libbonobo-2.32.1.orig/samples/echo/Makefile.am libbonobo-2.32.1/samples/echo/Makefile.am
--- libbonobo-2.32.1.orig/samples/echo/Makefile.am	2013-11-06 07:16:12.000000000 +0400
+++ libbonobo-2.32.1/samples/echo/Makefile.am	2013-11-06 07:24:23.818543920 +0400
@@ -54,7 +54,7 @@
 
 EXTRA_DIST = $(server_DATA) $(idl_DATA) $(server_dot_in).in
 
-INCLUDES = 						\
+AM_CPPFLAGS = 						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-DG_LOG_DOMAIN=\"Echo\"				\
 	-I$(top_srcdir) 				\
diff -durN libbonobo-2.32.1.orig/tests/Makefile.am libbonobo-2.32.1/tests/Makefile.am
--- libbonobo-2.32.1.orig/tests/Makefile.am	2010-08-29 15:56:00.000000000 +0400
+++ libbonobo-2.32.1/tests/Makefile.am	2013-11-06 07:24:23.814543991 +0400
@@ -16,7 +16,7 @@
 #check_PROGRAMS += \
 #        test-generic-factory
 
-INCLUDES =	\
+AM_CPPFLAGS =	\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-I$(top_srcdir) 				\
 	$(WARN_CFLAGS)					\
diff -durN libbonobo-2.32.1.orig/tests/test-activation/Makefile.am libbonobo-2.32.1/tests/test-activation/Makefile.am
--- libbonobo-2.32.1.orig/tests/test-activation/Makefile.am	2013-11-06 07:16:12.000000000 +0400
+++ libbonobo-2.32.1/tests/test-activation/Makefile.am	2013-11-06 07:24:23.814543991 +0400
@@ -70,7 +70,7 @@
 
 CLEANFILES=empty_built plugin_built $(BUILT_SOURCES)
 
-INCLUDES= \
+AM_CPPFLAGS= \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
 	$(WARN_CFLAGS)			\
diff -durN libbonobo-2.32.1.orig/utils/Makefile.am libbonobo-2.32.1/utils/Makefile.am
--- libbonobo-2.32.1.orig/utils/Makefile.am	2013-11-06 07:16:12.000000000 +0400
+++ libbonobo-2.32.1/utils/Makefile.am	2013-11-06 07:24:23.818543920 +0400
@@ -6,7 +6,7 @@
 bonobo_activation_sysconf_SOURCES =	\
 	bonobo-activation-sysconf.c
 
-INCLUDES =						\
+AM_CPPFLAGS =						\
 	$(SERVER_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	-I$(top_srcdir)					\
--- libbonobo-2.32.1/tests/Makefile.am~	2013-11-06 03:33:29.000000000 +0000
+++ libbonobo-2.32.1/tests/Makefile.am	2013-11-06 03:51:28.000000000 +0000
@@ -55,7 +55,7 @@
 	MODELS_DIR="$(srcdir)/models"
 
 TESTS = test-moniker$(EXEEXT) test-event-source$(EXEEXT) test-object$(EXEEXT) \
-	test-stream-mem$(EXEEXT) $(srcdir)/test-properties.sh test-storage-mem$(EXEEXT) \
+	test-stream-mem$(EXEEXT) $(top_builddir)/tests/test-properties.sh test-storage-mem$(EXEEXT) \
 	test-main-loop$(EXEEXT)
 
 # TESTS += test-generic-factory.sh