Fix out-of-tree builds
diff --git a/Makefile.am b/Makefile.am
index 8e60b0d..8fbea34 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,13 +23,13 @@
 pkgconfig_DATA = axis2c.pc
 
 SUBDIRS = $(GTEST) util $(GUTHTHILA_DIR) axiom neethi src $(TESTDIR) include ides tools/tcpmon tools/md5
-include_HEADERS=$(top_builddir)/include/*.h
+include_HEADERS=$(top_srcdir)/include/*.h
 data_DATA= samples/server/axis2.xml README \
 	INSTALL CREDITS COPYING NEWS NOTICE AUTHORS
 logs_DATA=
 docs_DATA= 
 wsdl2c_DATA=tools/codegen/javatool/WSDL2C.sh tools/codegen/javatool/README
-EXTRA_DIST = CREDITS LICENSE build axis2c_build.sh guththila tools AUTHORS NOTICE tools/codegen/javatool/README  tools/codegen/javatool/WSDL2C.bat  tools/codegen/javatool/WSDL2C.sh docs docs/README
+EXTRA_DIST = CREDITS LICENSE build axis2c_build.sh guththila tools AUTHORS NOTICE tools/codegen/javatool/README  tools/codegen/javatool/WSDL2C.bat  tools/codegen/javatool/WSDL2C.sh docs docs/README samples
 
 dist-hook:
 	rm -rf `find $(distdir)/ -type d -name .svn`
@@ -42,6 +42,7 @@
 	rm -rf `find $(distdir)/ -type f -name Makefile`
 	rm -rf `find $(distdir)/ -type f -name axis2c-sample-src-${PACKAGE_VERSION}.tar.gz`
 	rm -rf `find $(distdir)/ -type d -name autom4te.cache`
+	rm -rf `find $(distdir)/ -type f -name config.status`
 	rm -rf $(distdir)/tools/tcpmon/src/tcpmon
 	rm -rf $(distdir)/tools/md5/src/md5
 	find $(distdir) -name "makefile" | xargs sed -i "s/\/WX//g"
diff --git a/axiom/Makefile.am b/axiom/Makefile.am
index 02e3a7c..859a762 100644
--- a/axiom/Makefile.am
+++ b/axiom/Makefile.am
@@ -15,7 +15,7 @@
 datadir=$(prefix)
 SUBDIRS = src $(GTEST) $(TESTDIR) include
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
-include_HEADERS=$(top_builddir)/include/*.h
+include_HEADERS=$(top_srcdir)/include/*.h
 data_DATA= INSTALL README AUTHORS NEWS CREDITS LICENSE COPYING
 EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE
 dist-hook:
diff --git a/axiom/src/attachments/Makefile.am b/axiom/src/attachments/Makefile.am
index 59d28b1..2d9b181 100644
--- a/axiom/src/attachments/Makefile.am
+++ b/axiom/src/attachments/Makefile.am
@@ -19,11 +19,11 @@
 					mime_body_part.c \
                     mime_parser.c
 
-libaxis2_attachments_la_LIBADD = ../../../util/src/libaxutil.la 
+libaxis2_attachments_la_LIBADD = $(top_builddir)/../util/src/libaxutil.la 
 
-INCLUDES =	-I$(top_builddir)/include \
-            -I$(top_builddir)/parser \
-			-I ../../../util/include
+INCLUDES =	-I$(top_srcdir)/include \
+            -I$(top_srcdir)/parser \
+			-I$(top_srcdir)/../util/include
 
 EXTRA_DIST = axiom_mime_body_part.h 
 
diff --git a/axiom/src/om/Makefile.am b/axiom/src/om/Makefile.am
index 1740883..641a25f 100644
--- a/axiom/src/om/Makefile.am
+++ b/axiom/src/om/Makefile.am
@@ -34,17 +34,17 @@
 libaxis2_axiom_la_LIBADD =	$(top_builddir)/src/soap/libaxis2_soap.la \
 				$(top_builddir)/src/attachments/libaxis2_attachments.la \
                     		$(top_builddir)/src/util/libaxis2_axiom_util.la \
-							../parser/${WRAPPER_DIR}/libaxis2_parser.la \
-							../../../util/src/libaxutil.la
+							$(top_builddir)/src/parser/${WRAPPER_DIR}/libaxis2_parser.la \
+							$(top_builddir)/../util/src/libaxutil.la
 
 libaxis2_axiom_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES =	-I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-            -I$(top_builddir)/src/om \
-            -I$(top_builddir)/src/attachments \
-			-I$(top_builddir)/src/soap \
-			-I ../../../util/include 
+INCLUDES =	-I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+            -I$(top_srcdir)/src/om \
+            -I$(top_srcdir)/src/attachments \
+			-I$(top_srcdir)/src/soap \
+			-I$(top_srcdir)/../util/include 
 
 EXTRA_DIST = axiom_namespace_internal.h  axiom_node_internal.h  axiom_stax_builder_internal.h axiom_document_internal.h axiom_element_internal.h
 
diff --git a/axiom/src/parser/guththila/Makefile.am b/axiom/src/parser/guththila/Makefile.am
index 51a6667..532d434 100644
--- a/axiom/src/parser/guththila/Makefile.am
+++ b/axiom/src/parser/guththila/Makefile.am
@@ -14,14 +14,14 @@
 # limitations under the License.
 lib_LTLIBRARIES = libaxis2_parser.la
 
-libaxis2_parser_la_LIBADD = ../../../../guththila/src/libguththila.la \
-							../../../../util/src/libaxutil.la
+libaxis2_parser_la_LIBADD = $(top_builddir)/../guththila/src/libguththila.la \
+							$(top_builddir)/../util/src/libaxutil.la
 
 libaxis2_parser_la_SOURCES = ../xml_reader.c ../xml_writer.c guththila_xml_writer_wrapper.c \
                                 guththila_xml_reader_wrapper.c 
 
 libaxis2_parser_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-			-I ../../../../util/include \
-			-I ../../../../guththila/include
+INCLUDES = -I$(top_srcdir)/include \
+			-I $(top_srcdir)/../util/include \
+			-I $(top_srcdir)/../guththila/include
diff --git a/axiom/src/parser/libxml2/Makefile.am b/axiom/src/parser/libxml2/Makefile.am
index 8e67318..dba8283 100644
--- a/axiom/src/parser/libxml2/Makefile.am
+++ b/axiom/src/parser/libxml2/Makefile.am
@@ -19,12 +19,12 @@
 							libxml2_reader_wrapper.c  libxml2_writer_wrapper.c
 
 libaxis2_parser_la_LIBADD = @LIBXML2_LIBS@ \
-							../../../../util/src/libaxutil.la
+							$(top_builddir)/../util/src/libaxutil.la
 
 libaxis2_parser_la_LDFLAGS = -version-info $(VERSION_NO)
 
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-            -I ../../../../util/include \
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+            -I$(top_srcdir)/../util/include \
 			@LIBXML2_CFLAGS@
diff --git a/axiom/src/soap/Makefile.am b/axiom/src/soap/Makefile.am
index 4fe89bb..50461b8 100644
--- a/axiom/src/soap/Makefile.am
+++ b/axiom/src/soap/Makefile.am
@@ -31,10 +31,10 @@
                            soap12_builder_helper.c
 
 libaxis2_soap_la_LIBADD = 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-            -I$(top_builddir)/src/om \
-			-I ../../../util/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+            -I$(top_srcdir)/src/om \
+			-I$(top_srcdir)/../util/include
 
 EXTRA_DIST =     axiom_soap11_builder_helper.h axiom_soap_builder_internal.h \
 		_axiom_soap_fault_code.h _axiom_soap_fault_reason.h \
diff --git a/axiom/src/util/Makefile.am b/axiom/src/util/Makefile.am
index 67aea4e..dac77ae 100644
--- a/axiom/src/util/Makefile.am
+++ b/axiom/src/util/Makefile.am
@@ -16,7 +16,7 @@
 libaxis2_axiom_util_la_SOURCES =	om_util.c
 
 libaxis2_axiom_util_la_LIBADD = 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-            -I$(top_builddir)/src/om \
-			-I ../../../util/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+            -I$(top_srcdir)/src/om \
+			-I$(top_srcdir)/../util/include
diff --git a/axiom/src/xpath/Makefile.am b/axiom/src/xpath/Makefile.am
index 23c42ba..566d44a 100644
--- a/axiom/src/xpath/Makefile.am
+++ b/axiom/src/xpath/Makefile.am
@@ -24,11 +24,11 @@
 libaxis2_xpath_la_LDFLAGS = -version-info $(VERSION_NO)
 
 libaxis2_xpath_la_LIBADD = 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-            -I$(top_builddir)/src/om \
-			-I ../../../util/include \
-			-I ../../../include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+            -I$(top_srcdir)/src/om \
+			-I$(top_srcdir)/../util/include \
+			-I$(top_srcdir)/../include
 
 EXTRA_DIST =    xpath_functions.h  xpath_internals_engine.h \
 		xpath_internals.h  xpath_internals_iterators.h \
diff --git a/axiom/test/om/Makefile.am b/axiom/test/om/Makefile.am
index 418f43e..cde63a3 100644
--- a/axiom/test/om/Makefile.am
+++ b/axiom/test/om/Makefile.am
@@ -19,13 +19,13 @@
 
 test_om_SOURCES = test_om.cc
 
-test_om_LDADD = ../../../util/src/libaxutil.la \
+test_om_LDADD = $(top_builddir)/../util/src/libaxutil.la \
 				 $(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
 				 $(top_builddir)/src/om/libaxis2_axiom.la \
 				 $(top_builddir)/$(GTEST)/libgtest.a \
 				 $(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-			-I ../../../util/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+			-I $(top_srcdir)/../util/include \
 			-I $(GTEST_DIR)/include
diff --git a/axiom/test/soap/Makefile.am b/axiom/test/soap/Makefile.am
index afd6ae5..7d77f75 100644
--- a/axiom/test/soap/Makefile.am
+++ b/axiom/test/soap/Makefile.am
@@ -19,14 +19,14 @@
 AM_CFLAGS = -g -O2
 test_soap_SOURCES = test_soap.cc
 
-test_soap_LDADD   =	../../../util/src/libaxutil.la \
+test_soap_LDADD   =	$(top_builddir)/../util/src/libaxutil.la \
 			$(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
 			$(top_builddir)/src/om/libaxis2_axiom.la \
 			$(top_builddir)/$(GTEST)/libgtest.a \
 			$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-			-I ../../../util/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+			-I $(top_srcdir)/../util/include \
 			-I $(GTEST_DIR)/include
 
diff --git a/axiom/test/util/Makefile.am b/axiom/test/util/Makefile.am
index a0580eb..77629dd 100644
--- a/axiom/test/util/Makefile.am
+++ b/axiom/test/util/Makefile.am
@@ -23,7 +23,7 @@
 					$(top_builddir)/$(GTEST)/libgtest.a \
 					$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
-			-I ../../../util/include \
-			-I ../../../include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+			-I $(top_srcdir)/../util/include \
+			-I $(top_srcdir)/../include \
 			-I $(GTEST_DIR)/include
diff --git a/axiom/test/xpath/Makefile.am b/axiom/test/xpath/Makefile.am
index e560dcd..27baae0 100644
--- a/axiom/test/xpath/Makefile.am
+++ b/axiom/test/xpath/Makefile.am
@@ -20,22 +20,22 @@
 
 test_xpath_streaming_SOURCES = test_xpath_streaming.cc
 
-test_xpath_LDADD   =	../../../util/src/libaxutil.la \
+test_xpath_LDADD   =	$(top_builddir)/../util/src/libaxutil.la \
 					$(top_builddir)/src/om/libaxis2_axiom.la \
 					$(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
 					$(top_builddir)/src/xpath/libaxis2_xpath.la  \
 					$(top_builddir)/$(GTEST)/libgtest.a \
 					$(top_builddir)/$(GTEST)/libgtest_main.a
 
-test_xpath_streaming_LDADD   =	../../../util/src/libaxutil.la \
+test_xpath_streaming_LDADD   =	$(top_builddir)/../util/src/libaxutil.la \
 					$(top_builddir)/src/om/libaxis2_axiom.la \
 					$(top_builddir)/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
 					$(top_builddir)/src/xpath/libaxis2_xpath.la \
 					$(top_builddir)/$(GTEST)/libgtest.a \
 					$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/parser \
-			-I ../../../include \
-			-I ../../../util/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/parser \
+			-I$(top_srcdir)/../include \
+			-I$(top_srcdir)/../util/include \
 			-I $(GTEST_DIR)/include
diff --git a/guththila/Makefile.am b/guththila/Makefile.am
index ba2e311..3ce97c3 100644
--- a/guththila/Makefile.am
+++ b/guththila/Makefile.am
@@ -15,7 +15,7 @@
 datadir=$(prefix)
 SUBDIRS = src $(GTEST) $(TESTDIR)
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
-include_HEADERS=$(top_builddir)/include/*.h
+include_HEADERS=$(top_srcdir)/include/*.h
 data_DATA= INSTALL README AUTHORS NEWS LICENSE COPYING
 #EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE
 dist-hook:
diff --git a/guththila/src/Makefile.am b/guththila/src/Makefile.am
index 5df4bce..c7d555e 100644
--- a/guththila/src/Makefile.am
+++ b/guththila/src/Makefile.am
@@ -27,6 +27,6 @@
 
 libguththila_la_LIBADD = ../../util/src/libaxutil.la
 
-INCLUDES = -I$(top_builddir)/include \
-			-I ../../util/include
+INCLUDES = -I$(top_srcdir)/include \
+		   -I$(top_srcdir)/../util/include
 
diff --git a/guththila/tests/Makefile.am b/guththila/tests/Makefile.am
index de4493a..779c68d 100644
--- a/guththila/tests/Makefile.am
+++ b/guththila/tests/Makefile.am
@@ -19,14 +19,14 @@
 
 test_guththila_SOURCES = test_guththila.cc
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
-				-I ../../util/include \
-				-I ../../axiom/include \
-				-I $(GTEST_DIR)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+				-I$(top_srcdir)/../util/include \
+				-I$(top_srcdir)/../axiom/include \
+				-I$(GTEST_DIR)/include
 
 test_guththila_LDADD = \
 				 $(top_builddir)/src/libguththila.la \
-				 ../../util/src/libaxutil.la \
+				 $(top_builddir)/../util/src/libaxutil.la \
 				 $(top_builddir)/$(GTEST)/libgtest.a \
 				 $(top_builddir)/$(GTEST)/libgtest_main.a
 
@@ -34,7 +34,7 @@
 
 test_attribute_LDADD = \
 				 $(top_builddir)/src/libguththila.la \
-				 ../../util/src/libaxutil.la \
+				 $(top_builddir)/../util/src/libaxutil.la \
 				 $(top_builddir)/$(GTEST)/libgtest.a \
 				 $(top_builddir)/$(GTEST)/libgtest_main.a
 
@@ -42,7 +42,7 @@
 
 test_stack_LDADD = \
 				 $(top_builddir)/src/libguththila.la \
-				 ../../util/src/libaxutil.la \
+				 $(top_builddir)/../util/src/libaxutil.la \
 				 $(top_builddir)/$(GTEST)/libgtest.a \
 				 $(top_builddir)/$(GTEST)/libgtest_main.a
 
@@ -50,6 +50,6 @@
 
 test_token_LDADD = \
 				 $(top_builddir)/src/libguththila.la \
-				 ../../util/src/libaxutil.la \
+				 $(top_builddir)/../util/src/libaxutil.la \
 				 $(top_builddir)/$(GTEST)/libgtest.a \
 				 $(top_builddir)/$(GTEST)/libgtest_main.a
diff --git a/neethi/Makefile.am b/neethi/Makefile.am
index 93b3c1a..4589506 100644
--- a/neethi/Makefile.am
+++ b/neethi/Makefile.am
@@ -14,4 +14,4 @@
 # limitations under the License.
 SUBDIRS = src $(GTEST) $(TESTDIR)
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}
-include_HEADERS=$(top_builddir)/include/*.h
+include_HEADERS=$(top_srcdir)/include/*.h
diff --git a/neethi/src/Makefile.am b/neethi/src/Makefile.am
index bb45bc6..6a5fa4e 100644
--- a/neethi/src/Makefile.am
+++ b/neethi/src/Makefile.am
@@ -27,11 +27,11 @@
 				mtom_assertion_checker.c \
 				util.c
 
-libneethi_la_LIBADD  = ../../axiom/src/om/libaxis2_axiom.la \
-			../../util/src/libaxutil.la \
-			secpolicy/builder/librp_builder.la \
-			secpolicy/model/librp_model.la \
-			rmpolicy/librm_policy.la
+libneethi_la_LIBADD  = $(top_builddir)/../axiom/src/om/libaxis2_axiom.la \
+			$(top_builddir)/../util/src/libaxutil.la \
+			$(top_builddir)/src/secpolicy/builder/librp_builder.la \
+			$(top_builddir)/src/secpolicy/model/librp_model.la \
+			$(top_builddir)/src/rmpolicy/librm_policy.la
 
 #libneethi_LIBADD=$(top_builddir)/src/core/description/libaxis2_description.la \
 #                    $(top_builddir)/src/core/receivers/libaxis2_receivers.la \
@@ -49,10 +49,10 @@
 
 libneethi_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-		-I ../../util/include \
-		-I ../../axiom/include \
-		-I ../../include
+INCLUDES = -I$(top_srcdir)/include \
+		-I $(top_srcdir)/../util/include \
+		-I $(top_srcdir)/../axiom/include \
+		-I $(top_srcdir)/../include
 
 #            -I$(top_builddir)/src/wsdl \
 #            -I$(top_builddir)/src/core/description \
diff --git a/neethi/src/rmpolicy/Makefile.am b/neethi/src/rmpolicy/Makefile.am
index d48b174..cf101ff 100644
--- a/neethi/src/rmpolicy/Makefile.am
+++ b/neethi/src/rmpolicy/Makefile.am
@@ -18,10 +18,9 @@
 
 librm_policy_la_SOURCES = rm_assertion.c rm_assertion_builder.c
 
-librm_policy_la_LIBADD  = ../../../util/src/libaxutil.la
+librm_policy_la_LIBADD  = $(top_builddir)/../util/src/libaxutil.la
 
-INCLUDES = -I$(top_builddir)/include \
-			-I ../../include \
-			-I ../../../util/include \
-	        -I ../../../axiom/include \
-    	    -I ../../../include
+INCLUDES = -I$(top_srcdir)/include \
+			-I $(top_srcdir)/../include \
+			-I $(top_srcdir)/../util/include \
+	        -I $(top_srcdir)/../axiom/include
diff --git a/neethi/src/secpolicy/builder/Makefile.am b/neethi/src/secpolicy/builder/Makefile.am
index d6696b4..d7d38e5 100644
--- a/neethi/src/secpolicy/builder/Makefile.am
+++ b/neethi/src/secpolicy/builder/Makefile.am
@@ -29,11 +29,10 @@
 						   bootstrap_policy_builder.c security_context_token_builder.c \
 						   issued_token_builder.c saml_token_builder.c
 
-librp_builder_la_LIBADD  = ../../../../axiom/src/om/libaxis2_axiom.la \
-				../../../../util/src/libaxutil.la
+librp_builder_la_LIBADD  = $(top_builddir)/../axiom/src/om/libaxis2_axiom.la \
+				$(top_builddir)/../util/src/libaxutil.la
 
-INCLUDES = -I$(top_builddir)/include \
-			-I ../../../include \
-			-I ../../../../util/include \
-            -I ../../../../axiom/include \
-            -I ../../../../include
+INCLUDES = -I$(top_srcdir)/include \
+			-I $(top_srcdir)/../include \
+			-I $(top_srcdir)/../util/include \
+            -I $(top_srcdir)/../axiom/include
diff --git a/neethi/src/secpolicy/model/Makefile.am b/neethi/src/secpolicy/model/Makefile.am
index cc5ed59..0dfbb44 100644
--- a/neethi/src/secpolicy/model/Makefile.am
+++ b/neethi/src/secpolicy/model/Makefile.am
@@ -28,8 +28,7 @@
 librp_model_la_LIBADD  = ../../../../util/src/libaxutil.la
 
 
-INCLUDES = -I$(top_builddir)/include \
-			-I ../../../include \
-			-I ../../../../util/include \
-	        -I ../../../../axiom/include \
-    	    -I ../../../../include
+INCLUDES = -I$(top_srcdir)/include \
+			-I $(top_srcdir)/../include \
+			-I $(top_srcdir)/../util/include \
+	        -I $(top_srcdir)/../axiom/include
diff --git a/neethi/test/Makefile.am b/neethi/test/Makefile.am
index 837504d..ef99c77 100644
--- a/neethi/test/Makefile.am
+++ b/neethi/test/Makefile.am
@@ -19,16 +19,16 @@
 
 test_SOURCES = test.cc
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
-				-I ../../util/include \
-				-I ../../axiom/include \
-				-I ../../include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+				-I $(top_srcdir)/../util/include \
+				-I $(top_srcdir)/../axiom/include \
+				-I $(top_srcdir)/../include \
 				-I $(GTEST_DIR)/include
 
 test_LDADD = $(top_builddir)/src/libneethi.la \
-			../../axiom/src/om/libaxis2_axiom.la \
-			../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
-			../../util/src/libaxutil.la \
-			../src/libneethi.la \
+			$(top_builddir)/../axiom/src/om/libaxis2_axiom.la \
+			$(top_builddir)/../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la \
+			$(top_builddir)/../util/src/libaxutil.la \
+			$(top_builddir)/src/libneethi.la \
 			$(top_builddir)/$(GTEST)/libgtest.a \
 			$(top_builddir)/$(GTEST)/libgtest_main.a
diff --git a/src/core/addr/Makefile.am b/src/core/addr/Makefile.am
index 1bfed4b..cbcdee1 100644
--- a/src/core/addr/Makefile.am
+++ b/src/core/addr/Makefile.am
@@ -21,7 +21,7 @@
                             msg_info_headers.c
 
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include 
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include 
diff --git a/src/core/clientapi/Makefile.am b/src/core/clientapi/Makefile.am
index d917871..e60cfd0 100644
--- a/src/core/clientapi/Makefile.am
+++ b/src/core/clientapi/Makefile.am
@@ -22,10 +22,10 @@
 				op_client.c \

 				svc_client.c

 

-INCLUDES = -I$(top_builddir)/include \

-            -I$(top_builddir)/src/core/engine \

-            -I$(top_builddir)/src/core/deployment \

-            -I$(top_builddir)/util/include \

-           -I$(top_builddir)/util/include/platforms \

-            -I$(top_builddir)/axiom/include \

-			-I$(top_builddir)/neethi/include

+INCLUDES = -I$(top_srcdir)/include \

+            -I$(top_srcdir)/src/core/engine \

+            -I$(top_srcdir)/src/core/deployment \

+            -I$(top_srcdir)/util/include \

+           -I$(top_srcdir)/util/include/platforms \

+            -I$(top_srcdir)/axiom/include \

+			-I$(top_srcdir)/neethi/include

diff --git a/src/core/context/Makefile.am b/src/core/context/Makefile.am
index a85c701..efd9527 100644
--- a/src/core/context/Makefile.am
+++ b/src/core/context/Makefile.am
@@ -21,7 +21,7 @@
                             svc_grp_ctx.c \
                             conf_ctx.c
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include
diff --git a/src/core/deployment/Makefile.am b/src/core/deployment/Makefile.am
index 6ac3489..be1c03c 100644
--- a/src/core/deployment/Makefile.am
+++ b/src/core/deployment/Makefile.am
@@ -41,12 +41,12 @@
                                 repos_listener.c \
                                 conf_init.c
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/description \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/src/core/phaseresolver \
-            -I$(top_builddir)/src/core/deployment \
-            -I$(top_builddir)/src/core/util \
-            -I$(top_builddir)/axiom/include \
-            -I$(top_builddir)/neethi/include \
-            -I$(top_builddir)/util/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/description \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/src/core/phaseresolver \
+            -I$(top_srcdir)/src/core/deployment \
+            -I$(top_srcdir)/src/core/util \
+            -I$(top_srcdir)/axiom/include \
+            -I$(top_srcdir)/neethi/include \
+            -I$(top_srcdir)/util/include
diff --git a/src/core/description/Makefile.am b/src/core/description/Makefile.am
index c63c256..fc47117 100644
--- a/src/core/description/Makefile.am
+++ b/src/core/description/Makefile.am
@@ -30,9 +30,9 @@
 
 libaxis2_description_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include \
-            -I$(top_builddir)/neethi/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include \
+            -I$(top_srcdir)/neethi/include
 
diff --git a/src/core/engine/Makefile.am b/src/core/engine/Makefile.am
index ee935c7..011d307 100644
--- a/src/core/engine/Makefile.am
+++ b/src/core/engine/Makefile.am
@@ -44,18 +44,18 @@
 			   $(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la
 
 
-INCLUDES =  -I$(top_builddir)/include \
-            -I$(top_builddir)/src/wsdl \
-            -I$(top_builddir)/src/core/description \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/src/core/phaseresolver \
-            -I$(top_builddir)/src/core/deployment \
-            -I$(top_builddir)/src/core/context \
-            -I$(top_builddir)/src/core/util \
-            -I$(top_builddir)/src/core/clientapi \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/neethi/include \
-            -I$(top_builddir)/axiom/include
+INCLUDES =  -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/wsdl \
+            -I$(top_srcdir)/src/core/description \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/src/core/phaseresolver \
+            -I$(top_srcdir)/src/core/deployment \
+            -I$(top_srcdir)/src/core/context \
+            -I$(top_srcdir)/src/core/util \
+            -I$(top_srcdir)/src/core/clientapi \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/neethi/include \
+            -I$(top_srcdir)/axiom/include
 
 EXTRA_DIST=axis2_disp_checker.h
 
diff --git a/src/core/phaseresolver/Makefile.am b/src/core/phaseresolver/Makefile.am
index cbabc87..39f0128 100644
--- a/src/core/phaseresolver/Makefile.am
+++ b/src/core/phaseresolver/Makefile.am
@@ -17,7 +17,7 @@
 libaxis2_phaseresolver_la_SOURCES =	phase_holder.c \
                                 	phase_resolver.c
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/axiom/include	\
-            -I$(top_builddir)/util/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/axiom/include	\
+            -I$(top_srcdir)/util/include
diff --git a/src/core/receivers/Makefile.am b/src/core/receivers/Makefile.am
index f4f0236..b013cac 100644
--- a/src/core/receivers/Makefile.am
+++ b/src/core/receivers/Makefile.am
@@ -18,8 +18,8 @@
                                 raw_xml_in_out_msg_recv.c \
                                 svr_callback.c
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/src/core/util \
-            -I$(top_builddir)/util/include	\
-            -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/src/core/util \
+            -I$(top_srcdir)/util/include	\
+            -I$(top_srcdir)/axiom/include
diff --git a/src/core/transport/amqp/receiver/Makefile.am b/src/core/transport/amqp/receiver/Makefile.am
index 0e2f0f8..ce7b18b 100644
--- a/src/core/transport/amqp/receiver/Makefile.am
+++ b/src/core/transport/amqp/receiver/Makefile.am
@@ -24,16 +24,16 @@
 

 libaxis2_amqp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)

 

-INCLUDES = -I$(top_builddir)/include \

-	       -I$(top_builddir)/src/core/transport/amqp/util \

-	       -I$(top_builddir)/src/core/transport/amqp/receiver \

-	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \

-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \

-           -I$(top_builddir)/src/core/description \

-           -I$(top_builddir)/src/core/context \

-           -I$(top_builddir)/src/core/phaseresolver \

-           -I$(top_builddir)/src/core/engine \

-           -I$(top_builddir)/src/core/deployment \

-           -I$(top_builddir)/util/include \

-           -I$(top_builddir)/axiom/include

+INCLUDES = -I$(top_srcdir)/include \

+	       -I$(top_srcdir)/src/core/transport/amqp/util \

+	       -I$(top_srcdir)/src/core/transport/amqp/receiver \

+	       -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \

+	       -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \

+           -I$(top_srcdir)/src/core/description \

+           -I$(top_srcdir)/src/core/context \

+           -I$(top_srcdir)/src/core/phaseresolver \

+           -I$(top_srcdir)/src/core/engine \

+           -I$(top_srcdir)/src/core/deployment \

+           -I$(top_srcdir)/util/include \

+           -I$(top_srcdir)/axiom/include

 

diff --git a/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am b/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
index faf0c34..32c69ce 100644
--- a/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
+++ b/src/core/transport/amqp/receiver/qpid_receiver/Makefile.am
@@ -27,17 +27,17 @@
 

 libaxis2_qpid_receiver_la_LDFLAGS = g++ -version-info $(VERSION_NO)

 

-INCLUDES = -I$(top_builddir)/include \

-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \

-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor \

-	       -I$(top_builddir)/src/core/transport/amqp/util \

-	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \

-           -I$(top_builddir)/src/core/description \

-           -I$(top_builddir)/src/core/context \

-           -I$(top_builddir)/src/core/phaseresolver \

-           -I$(top_builddir)/src/core/engine \

-           -I$(top_builddir)/src/core/deployment \

-           -I$(top_builddir)/util/include \

-           -I$(top_builddir)/axiom/include \

+INCLUDES = -I$(top_srcdir)/include \

+	       -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \

+	       -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor \

+	       -I$(top_srcdir)/src/core/transport/amqp/util \

+	       -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \

+           -I$(top_srcdir)/src/core/description \

+           -I$(top_srcdir)/src/core/context \

+           -I$(top_srcdir)/src/core/phaseresolver \

+           -I$(top_srcdir)/src/core/engine \

+           -I$(top_srcdir)/src/core/deployment \

+           -I$(top_srcdir)/util/include \

+           -I$(top_srcdir)/axiom/include \

 		   -I$(QPID_HOME)/include

 

diff --git a/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am b/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
index 991e7a5..095bce1 100644
--- a/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
+++ b/src/core/transport/amqp/receiver/qpid_receiver/request_processor/Makefile.am
@@ -21,14 +21,14 @@
 

 libaxis2_amqp_request_processor_la_LDFLAGS = -version-info $(VERSION_NO)

 

-INCLUDES = -I$(top_builddir)/include \

-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor \

-	       -I$(top_builddir)/src/core/transport/amqp/util \

-           -I$(top_builddir)/src/core/description \

-           -I$(top_builddir)/src/core/context \

-           -I$(top_builddir)/src/core/phaseresolver \

-           -I$(top_builddir)/src/core/engine \

-           -I$(top_builddir)/src/core/deployment \

-           -I$(top_builddir)/util/include \

-           -I$(top_builddir)/axiom/include

+INCLUDES = -I$(top_srcdir)/include \

+	       -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver/request_processor \

+	       -I$(top_srcdir)/src/core/transport/amqp/util \

+           -I$(top_srcdir)/src/core/description \

+           -I$(top_srcdir)/src/core/context \

+           -I$(top_srcdir)/src/core/phaseresolver \

+           -I$(top_srcdir)/src/core/engine \

+           -I$(top_srcdir)/src/core/deployment \

+           -I$(top_srcdir)/util/include \

+           -I$(top_srcdir)/axiom/include

 

diff --git a/src/core/transport/amqp/sender/Makefile.am b/src/core/transport/amqp/sender/Makefile.am
index 9b662ed..3a193fe 100644
--- a/src/core/transport/amqp/sender/Makefile.am
+++ b/src/core/transport/amqp/sender/Makefile.am
@@ -24,17 +24,17 @@
 

 libaxis2_amqp_sender_la_LDFLAGS = -version-info $(VERSION_NO)

 

-INCLUDES = -I$(top_builddir)/include \

-	       -I$(top_builddir)/src/core/transport/amqp/util \

-	       -I$(top_builddir)/src/core/transport/amqp/receiver \

-	       -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \

-	       -I$(top_builddir)/src/core/transport/amqp/sender \

-	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \

-           -I$(top_builddir)/src/core/description \

-           -I$(top_builddir)/src/core/context \

-           -I$(top_builddir)/src/core/phaseresolver \

-           -I$(top_builddir)/src/core/engine \

-           -I$(top_builddir)/src/core/deployment \

-           -I$(top_builddir)/util/include \

-           -I$(top_builddir)/axiom/include

+INCLUDES = -I$(top_srcdir)/include \

+	       -I$(top_srcdir)/src/core/transport/amqp/util \

+	       -I$(top_srcdir)/src/core/transport/amqp/receiver \

+	       -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \

+	       -I$(top_srcdir)/src/core/transport/amqp/sender \

+	       -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \

+           -I$(top_srcdir)/src/core/description \

+           -I$(top_srcdir)/src/core/context \

+           -I$(top_srcdir)/src/core/phaseresolver \

+           -I$(top_srcdir)/src/core/engine \

+           -I$(top_srcdir)/src/core/deployment \

+           -I$(top_srcdir)/util/include \

+           -I$(top_srcdir)/axiom/include

 

diff --git a/src/core/transport/amqp/sender/qpid_sender/Makefile.am b/src/core/transport/amqp/sender/qpid_sender/Makefile.am
index 5f3d34c..0027f52 100644
--- a/src/core/transport/amqp/sender/qpid_sender/Makefile.am
+++ b/src/core/transport/amqp/sender/qpid_sender/Makefile.am
@@ -23,15 +23,15 @@
 

 libaxis2_qpid_sender_la_LDFLAGS = g++ -version-info $(VERSION_NO)

 

-INCLUDES = -I$(top_builddir)/include \

-	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \

-	       -I$(top_builddir)/src/core/transport/amqp/util \

-           -I$(top_builddir)/src/core/description \

-           -I$(top_builddir)/src/core/context \

-           -I$(top_builddir)/src/core/phaseresolver \

-           -I$(top_builddir)/src/core/engine \

-           -I$(top_builddir)/src/core/deployment \

-           -I$(top_builddir)/util/include \

-           -I$(top_builddir)/axiom/include \

+INCLUDES = -I$(top_srcdir)/include \

+	       -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \

+	       -I$(top_srcdir)/src/core/transport/amqp/util \

+           -I$(top_srcdir)/src/core/description \

+           -I$(top_srcdir)/src/core/context \

+           -I$(top_srcdir)/src/core/phaseresolver \

+           -I$(top_srcdir)/src/core/engine \

+           -I$(top_srcdir)/src/core/deployment \

+           -I$(top_srcdir)/util/include \

+           -I$(top_srcdir)/axiom/include \

 		   -I$(QPID_HOME)/include

 

diff --git a/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am b/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
index 5c46608..a22bb67 100644
--- a/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
+++ b/src/core/transport/amqp/server/axis2_amqp_server/Makefile.am
@@ -33,14 +33,14 @@
 						  $(top_builddir)/src/core/transport/amqp/receiver/libaxis2_amqp_receiver.la \

 						  $(top_builddir)/src/core/transport/amqp/util/libaxis2_amqp_util.la

                     

-INCLUDES = -I$(top_builddir)/include \

-           -I$(top_builddir)/src/core/description \

-           -I$(top_builddir)/src/core/context \

-           -I$(top_builddir)/src/core/deploymenti \

-           -I$(top_builddir)/src/core/phaseresolver \

-           -I$(top_builddir)/src/core/engine \

-           -I$(top_builddir)/src/core/transport/amqp/receiver \

-           -I$(top_builddir)/src/core/transport/amqp/receiver/qpid_receiver \

-           -I$(top_builddir)/src/core/transport/amqp/util \

-           -I$(top_builddir)/util/include \

-           -I$(top_builddir)/axiom/include

+INCLUDES = -I$(top_srcdir)/include \

+           -I$(top_srcdir)/src/core/description \

+           -I$(top_srcdir)/src/core/context \

+           -I$(top_srcdir)/src/core/deploymenti \

+           -I$(top_srcdir)/src/core/phaseresolver \

+           -I$(top_srcdir)/src/core/engine \

+           -I$(top_srcdir)/src/core/transport/amqp/receiver \

+           -I$(top_srcdir)/src/core/transport/amqp/receiver/qpid_receiver \

+           -I$(top_srcdir)/src/core/transport/amqp/util \

+           -I$(top_srcdir)/util/include \

+           -I$(top_srcdir)/axiom/include

diff --git a/src/core/transport/amqp/util/Makefile.am b/src/core/transport/amqp/util/Makefile.am
index 0ecda7e..18b0b53 100644
--- a/src/core/transport/amqp/util/Makefile.am
+++ b/src/core/transport/amqp/util/Makefile.am
@@ -20,13 +20,13 @@
 
 libaxis2_amqp_util_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/amqp/util \
-	       -I$(top_builddir)/src/core/transport/amqp/sender/qpid_sender \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+	       -I$(top_srcdir)/src/core/transport/amqp/util \
+	       -I$(top_srcdir)/src/core/transport/amqp/sender/qpid_sender \
+           -I$(top_srcdir)/src/core/description \
+           -I$(top_srcdir)/src/core/context \
+           -I$(top_srcdir)/src/core/engine \
+           -I$(top_srcdir)/src/core/deployment \
+           -I$(top_srcdir)/util/include \
+           -I$(top_srcdir)/axiom/include
 
diff --git a/src/core/transport/http/common/Makefile.am b/src/core/transport/http/common/Makefile.am
index 73beac3..35da8ce 100644
--- a/src/core/transport/http/common/Makefile.am
+++ b/src/core/transport/http/common/Makefile.am
@@ -31,13 +31,13 @@
 
 libaxis2_http_common_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport\
-	       -I$(top_builddir)/src/core/transport/http \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+	       -I$(top_srcdir)/src/core/transport\
+	       -I$(top_srcdir)/src/core/transport/http \
+           -I$(top_srcdir)/src/core/description \
+           -I$(top_srcdir)/src/core/context \
+           -I$(top_srcdir)/src/core/phaseresolver \
+           -I$(top_srcdir)/src/core/engine \
+           -I$(top_srcdir)/src/core/deployment \
+           -I$(top_srcdir)/util/include \
+           -I$(top_srcdir)/axiom/include
diff --git a/src/core/transport/http/receiver/Makefile.am b/src/core/transport/http/receiver/Makefile.am
index 7f98e9b..c5d1245 100644
--- a/src/core/transport/http/receiver/Makefile.am
+++ b/src/core/transport/http/receiver/Makefile.am
@@ -23,13 +23,13 @@
 
 libaxis2_http_receiver_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport\
-	       -I$(top_builddir)/src/core/transport/http \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+	       -I$(top_srcdir)/src/core/transport\
+	       -I$(top_srcdir)/src/core/transport/http \
+           -I$(top_srcdir)/src/core/description \
+           -I$(top_srcdir)/src/core/context \
+           -I$(top_srcdir)/src/core/phaseresolver \
+           -I$(top_srcdir)/src/core/engine \
+           -I$(top_srcdir)/src/core/deployment \
+           -I$(top_srcdir)/util/include \
+           -I$(top_srcdir)/axiom/include
diff --git a/src/core/transport/http/sender/Makefile.am b/src/core/transport/http/sender/Makefile.am
index c0c0375..92f399d 100644
--- a/src/core/transport/http/sender/Makefile.am
+++ b/src/core/transport/http/sender/Makefile.am
@@ -57,17 +57,17 @@
 
 libaxis2_http_sender_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport\
-           -I$(top_builddir)/src/core/transport/http \
-           -I$(top_builddir)/src/core/transport/http/sender/libcurl \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include \
+INCLUDES = -I$(top_srcdir)/include \
+	       -I$(top_srcdir)/src/core/transport\
+           -I$(top_srcdir)/src/core/transport/http \
+           -I$(top_srcdir)/src/core/transport/http/sender/libcurl \
+           -I$(top_srcdir)/src/core/description \
+           -I$(top_srcdir)/src/core/context \
+           -I$(top_srcdir)/src/core/phaseresolver \
+           -I$(top_srcdir)/src/core/engine \
+           -I$(top_srcdir)/src/core/deployment \
+           -I$(top_srcdir)/util/include \
+           -I$(top_srcdir)/axiom/include \
 		   $(SSL_INC)
 
 
diff --git a/src/core/transport/http/sender/ntlm/default/Makefile.am b/src/core/transport/http/sender/ntlm/default/Makefile.am
index 1457475..9636c1c 100644
--- a/src/core/transport/http/sender/ntlm/default/Makefile.am
+++ b/src/core/transport/http/sender/ntlm/default/Makefile.am
@@ -20,5 +20,5 @@
 
 libaxis2_ntlm_la_LIBADD =  $(top_builddir)/util/src/libaxutil.la
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/util/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/util/include
diff --git a/src/core/transport/http/sender/ntlm/heimdal/Makefile.am b/src/core/transport/http/sender/ntlm/heimdal/Makefile.am
index 05c6239..9f3f310 100644
--- a/src/core/transport/http/sender/ntlm/heimdal/Makefile.am
+++ b/src/core/transport/http/sender/ntlm/heimdal/Makefile.am
@@ -24,6 +24,6 @@
 #libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO)
 
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/util/include \
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/util/include \
 			@NTLM_CFLAGS@
diff --git a/src/core/transport/http/sender/ntlm/libntlm/Makefile.am b/src/core/transport/http/sender/ntlm/libntlm/Makefile.am
index 823c9c8..9d3e551 100644
--- a/src/core/transport/http/sender/ntlm/libntlm/Makefile.am
+++ b/src/core/transport/http/sender/ntlm/libntlm/Makefile.am
@@ -24,6 +24,6 @@
 #libaxis2_ntlm_la_LDFLAGS = -version-info $(VERSION_NO)
 
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/util/include \
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/util/include \
 			@NTLM_CFLAGS@
diff --git a/src/core/transport/http/sender/ntlm/test/Makefile.am b/src/core/transport/http/sender/ntlm/test/Makefile.am
index 56c3b8a..3967214 100644
--- a/src/core/transport/http/sender/ntlm/test/Makefile.am
+++ b/src/core/transport/http/sender/ntlm/test/Makefile.am
@@ -20,10 +20,10 @@
 test_ntlm_SOURCES = client.c
 mock_client_SOURCES = mock_client.c
 
-LINK_FLAGS   =	../$(NTLM_WRAPPER_DIR)/libaxis2_ntlm.la \
+LINK_FLAGS   =	$(top_builddir)/src/core/transport/http/sender/ntlm/$(NTLM_WRAPPER_DIR)/libaxis2_ntlm.la \
 					$(top_builddir)/util/src/libaxutil.la
 
 test_ntlm_LDADD   =	$(LINK_FLAGS)
 mock_client_LDADD   =	$(LINK_FLAGS)
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/util/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/util/include
diff --git a/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am b/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am
index 3bf50fa..3b958d6 100644
--- a/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am
+++ b/src/core/transport/http/sender/ntlm/test/mock_server/Makefile.am
@@ -21,5 +21,5 @@
 
 mock_server_LDADD   = $(top_builddir)/util/src/libaxutil.la
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/util/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/util/include
diff --git a/src/core/transport/http/server/CGI/Makefile.am b/src/core/transport/http/server/CGI/Makefile.am
index 2061bac..597d4d6 100644
--- a/src/core/transport/http/server/CGI/Makefile.am
+++ b/src/core/transport/http/server/CGI/Makefile.am
@@ -35,11 +35,11 @@
 			     $(top_builddir)/neethi/src/libneethi.la \
 			     $(top_builddir)/src/core/transport/http/receiver/libaxis2_http_receiver.la
                     
-INCLUDES =  -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/description\
-            -I$(top_builddir)/src/core/context \
-            -I$(top_builddir)/src/core/deployment\
-            -I$(top_builddir)/src/core/phaseresolver \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include
+INCLUDES =  -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/description\
+            -I$(top_srcdir)/src/core/context \
+            -I$(top_srcdir)/src/core/deployment\
+            -I$(top_srcdir)/src/core/phaseresolver \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include
diff --git a/src/core/transport/http/server/apache2/Makefile.am b/src/core/transport/http/server/apache2/Makefile.am
index ada2471..72ecc0a 100644
--- a/src/core/transport/http/server/apache2/Makefile.am
+++ b/src/core/transport/http/server/apache2/Makefile.am
@@ -30,15 +30,15 @@
 
 libmod_axis2_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport/http \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/axiom/include\
-           -I$(top_builddir)/util/include\
+INCLUDES = -I$(top_srcdir)/include \
+	       -I$(top_srcdir)/src/core/transport/http \
+           -I$(top_srcdir)/src/core/description \
+           -I$(top_srcdir)/src/core/context \
+           -I$(top_srcdir)/src/core/phaseresolver \
+           -I$(top_srcdir)/src/core/engine \
+           -I$(top_srcdir)/src/core/deployment \
+           -I$(top_srcdir)/axiom/include\
+           -I$(top_srcdir)/util/include\
             @APACHE2INC@ \
             @APRINC@
 
diff --git a/src/core/transport/http/server/simple_axis2_server/Makefile.am b/src/core/transport/http/server/simple_axis2_server/Makefile.am
index e7319f2..b1762a8 100644
--- a/src/core/transport/http/server/simple_axis2_server/Makefile.am
+++ b/src/core/transport/http/server/simple_axis2_server/Makefile.am
@@ -33,11 +33,11 @@
 			     $(top_builddir)/src/core/transport/http/receiver/libaxis2_http_receiver.la \
 			     $(top_builddir)/neethi/src/libneethi.la
                     
-INCLUDES =  -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/description\
-            -I$(top_builddir)/src/core/context \
-            -I$(top_builddir)/src/core/deployment\
-            -I$(top_builddir)/src/core/phaseresolver \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include
+INCLUDES =  -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/description\
+            -I$(top_srcdir)/src/core/context \
+            -I$(top_srcdir)/src/core/deployment\
+            -I$(top_srcdir)/src/core/phaseresolver \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include
diff --git a/src/core/transport/http/util/Makefile.am b/src/core/transport/http/util/Makefile.am
index 2e0267b..2f77750 100644
--- a/src/core/transport/http/util/Makefile.am
+++ b/src/core/transport/http/util/Makefile.am
@@ -22,10 +22,10 @@
 			$(top_builddir)/axiom/src/om/libaxis2_axiom.la 
 
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include
 
 if AXIS2_JSON_ENABLED
 libaxis2_http_util_la_SOURCES += axis2_json_reader.c
diff --git a/src/core/transport/tcp/receiver/Makefile.am b/src/core/transport/tcp/receiver/Makefile.am
index f9fb16c..3c60483 100644
--- a/src/core/transport/tcp/receiver/Makefile.am
+++ b/src/core/transport/tcp/receiver/Makefile.am
@@ -25,13 +25,13 @@
 
 libaxis2_tcp_receiver_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-	       -I$(top_builddir)/src/core/transport\
-	       -I$(top_builddir)/src/core/transport/tcp \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-           -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+	       -I$(top_srcdir)/src/core/transport\
+	       -I$(top_srcdir)/src/core/transport/tcp \
+           -I$(top_srcdir)/src/core/description \
+           -I$(top_srcdir)/src/core/context \
+           -I$(top_srcdir)/src/core/phaseresolver \
+           -I$(top_srcdir)/src/core/engine \
+           -I$(top_srcdir)/src/core/deployment \
+           -I$(top_srcdir)/util/include \
+           -I$(top_srcdir)/axiom/include
diff --git a/src/core/transport/tcp/sender/Makefile.am b/src/core/transport/tcp/sender/Makefile.am
index 2875299..f79940a 100644
--- a/src/core/transport/tcp/sender/Makefile.am
+++ b/src/core/transport/tcp/sender/Makefile.am
@@ -26,15 +26,15 @@
 
 libaxis2_tcp_sender_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-	   -I$(top_builddir)/src/core/transport\
-           -I$(top_builddir)/src/core/transport/tcp \
-           -I$(top_builddir)/src/core/transport/tcp/sender/libcurl \
-           -I$(top_builddir)/src/core/description \
-           -I$(top_builddir)/src/core/context \
-           -I$(top_builddir)/src/core/phaseresolver \
-           -I$(top_builddir)/src/core/engine \
-           -I$(top_builddir)/src/core/deployment \
-           -I$(top_builddir)/util/include \
-	   -I.. \
-           -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+		   -I$(top_srcdir)/src/core/transport\
+           -I$(top_srcdir)/src/core/transport/tcp \
+           -I$(top_srcdir)/src/core/transport/tcp/sender/libcurl \
+           -I$(top_srcdir)/src/core/description \
+           -I$(top_srcdir)/src/core/context \
+           -I$(top_srcdir)/src/core/phaseresolver \
+           -I$(top_srcdir)/src/core/engine \
+           -I$(top_srcdir)/src/core/deployment \
+           -I$(top_srcdir)/util/include \
+		   -I$(top_srcdir)/src/core/transport/tcp \
+           -I$(top_srcdir)/axiom/include
diff --git a/src/core/transport/tcp/server/simple_tcp_server/Makefile.am b/src/core/transport/tcp/server/simple_tcp_server/Makefile.am
index 4db479b..5a56dae 100644
--- a/src/core/transport/tcp/server/simple_tcp_server/Makefile.am
+++ b/src/core/transport/tcp/server/simple_tcp_server/Makefile.am
@@ -32,12 +32,12 @@
 			     $(top_builddir)/src/core/transport/tcp/receiver/libaxis2_tcp_receiver.la \
 			     $(top_builddir)/neethi/src/libneethi.la
 
-INCLUDES =  -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/description\
-            -I$(top_builddir)/src/core/context \
-            -I$(top_builddir)/src/core/deployment\
-            -I$(top_builddir)/src/core/phaseresolver \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I../.. \
-            -I$(top_builddir)/axiom/include
+INCLUDES =  -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/description\
+            -I$(top_srcdir)/src/core/context \
+            -I$(top_srcdir)/src/core/deployment\
+            -I$(top_srcdir)/src/core/phaseresolver \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/src/core/transport/tcp/ \
+            -I$(top_srcdir)/axiom/include
diff --git a/src/core/util/Makefile.am b/src/core/util/Makefile.am
index 640aaa6..cfc362e 100644
--- a/src/core/util/Makefile.am
+++ b/src/core/util/Makefile.am
@@ -17,7 +17,7 @@
 
 libaxis2_core_utils_la_SOURCES =	core_utils.c
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include
diff --git a/src/modules/mod_addr/Makefile.am b/src/modules/mod_addr/Makefile.am
index 23be098..c49e3fd 100644
--- a/src/modules/mod_addr/Makefile.am
+++ b/src/modules/mod_addr/Makefile.am
@@ -26,11 +26,11 @@
 
 libaxis2_mod_addr_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/description \
-            -I$(top_builddir)/src/core/context \
-            -I$(top_builddir)/src/core/phaseresolver \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/src/core/deployment \
-            -I$(top_builddir)/util/include \
-            -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/description \
+            -I$(top_srcdir)/src/core/context \
+            -I$(top_srcdir)/src/core/phaseresolver \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/src/core/deployment \
+            -I$(top_srcdir)/util/include \
+            -I$(top_srcdir)/axiom/include
diff --git a/src/modules/mod_log/Makefile.am b/src/modules/mod_log/Makefile.am
index 7508282..949d18a 100644
--- a/src/modules/mod_log/Makefile.am
+++ b/src/modules/mod_log/Makefile.am
@@ -27,11 +27,11 @@
 
 libaxis2_mod_log_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include \
-            -I$(top_builddir)/src/core/description \
-            -I$(top_builddir)/src/core/context \
-            -I$(top_builddir)/src/core/phaseresolver \
-            -I$(top_builddir)/src/core/engine \
-            -I$(top_builddir)/src/core/deployment \
-            -I$(top_builddir)/util/include\
-            -I$(top_builddir)/axiom/include
+INCLUDES = -I$(top_srcdir)/include \
+            -I$(top_srcdir)/src/core/description \
+            -I$(top_srcdir)/src/core/context \
+            -I$(top_srcdir)/src/core/phaseresolver \
+            -I$(top_srcdir)/src/core/engine \
+            -I$(top_srcdir)/src/core/deployment \
+            -I$(top_srcdir)/util/include\
+            -I$(top_srcdir)/axiom/include
diff --git a/tools/md5/src/Makefile.am b/tools/md5/src/Makefile.am
index 9faafd6..391e006 100644
--- a/tools/md5/src/Makefile.am
+++ b/tools/md5/src/Makefile.am
@@ -19,10 +19,9 @@
 md5_SOURCES =  md5.c
 
 md5_LDADD =  \
-			 ../../../util/src/libaxutil.la
+			 $(top_builddir)/util/src/libaxutil.la
 
-INCLUDES = -I$(top_builddir)/include \
-		   -I ../../../util/include \
-		   -I ../../../include \
-		   -I ../include
+INCLUDES = -I$(top_src)/include \
+		   -I $(top_srcdir)/util/include \
+		   -I $(top_srcdir)/tools/md5/include
 
diff --git a/tools/tcpmon/Makefile.am b/tools/tcpmon/Makefile.am
index e31a9f0..41008fd 100644
--- a/tools/tcpmon/Makefile.am
+++ b/tools/tcpmon/Makefile.am
@@ -15,6 +15,6 @@
 datadir=$(prefix)/bin/tools/tcpmon
 SUBDIRS = src 
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}
-include_HEADERS=$(top_builddir)/include/*.h
+include_HEADERS=$(top_srcdir)/include/*.h
 data_DATA= INSTALL README AUTHORS NEWS LICENSE COPYING
 EXTRA_DIST=LICENSE
diff --git a/tools/tcpmon/src/Makefile.am b/tools/tcpmon/src/Makefile.am
index 9067f58..ac88e9d 100644
--- a/tools/tcpmon/src/Makefile.am
+++ b/tools/tcpmon/src/Makefile.am
@@ -22,14 +22,13 @@
             util.c
 
 tcpmon_LDADD =  \
-			 ../../../util/src/libaxutil.la \
-			 ../../../axiom/src/om/libaxis2_axiom.la \
-			 ../../../axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
+			 $(top_builddir)/util/src/libaxutil.la \
+			 $(top_builddir)//axiom/src/om/libaxis2_axiom.la \
+			 $(top_builddir)/axiom/src/parser/$(WRAPPER_DIR)/libaxis2_parser.la
 
-INCLUDES = -I$(top_builddir)/include \
-		   -I ../../../util/include \
-		   -I ../../../axiom/include \
-		   -I ../../../include \
-		   -I ../include
+INCLUDES = -I$(top_srcdir)/tools/tcpmon/include \
+		   -I $(top_srcdir)/util/include \
+		   -I $(top_srcdir)/axiom/include \
+		   -I $(top_srcdir)/include 
 
 EXTRA_DIST=tcpmon_entry_local.h tcpmon_session_local.h
diff --git a/util/Makefile.am b/util/Makefile.am
index 6b0da08..7e40e19 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -16,7 +16,7 @@
 tmpincludedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
 SUBDIRS = src $(GTEST) $(TESTDIR) include
-include_HEADERS=$(top_builddir)/include/*.h
+include_HEADERS=$(top_srcdir)/include/*.h
 tmpinclude_DATA=config.h
 data_DATA= INSTALL README AUTHORS NEWS CREDITS LICENSE COPYING
 EXTRA_DIST = build.sh autogen.sh CREDITS LICENSE
diff --git a/util/include/Makefile.am b/util/include/Makefile.am
index 494a53f..6dd3027 100644
--- a/util/include/Makefile.am
+++ b/util/include/Makefile.am
@@ -13,4 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
-nobase_include_HEADERS= platforms/axutil_platform_auto_sense.h platforms/unix/*.h platforms/windows/*.h
+nobase_include_HEADERS= $(top_srcdir)/include/platforms/axutil_platform_auto_sense.h \
+						$(top_srcdir)/include/platforms/unix/*.h \
+						$(top_srcdir)/include/platforms/windows/*.h
diff --git a/util/src/Makefile.am b/util/src/Makefile.am
index 11714b6..e1a92a6 100644
--- a/util/src/Makefile.am
+++ b/util/src/Makefile.am
@@ -60,6 +60,6 @@
 
 libaxutil_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = -I$(top_builddir)/include
+INCLUDES = -I$(top_srcdir)/include
 
 EXTRA_DIST=platforms/windows string_util.c
diff --git a/util/src/minizip/Makefile.am b/util/src/minizip/Makefile.am
index f9e239e..0c65b27 100644
--- a/util/src/minizip/Makefile.am
+++ b/util/src/minizip/Makefile.am
@@ -21,8 +21,8 @@
 
 libaxis2_minizip_la_LDFLAGS = -version-info $(VERSION_NO)
 
-INCLUDES = 	-I$(top_builddir)/include \
-            -I$(top_builddir)/platforms
+INCLUDES = 	-I$(top_srcdir)/include \
+            -I$(top_srcdir)/platforms
 
 EXTRA_DIST=	axis2_archive_extract.h \
 			axis2_crypt.h  \
diff --git a/util/src/platforms/unix/Makefile.am b/util/src/platforms/unix/Makefile.am
index 2f1496c..a4fe83c 100644
--- a/util/src/platforms/unix/Makefile.am
+++ b/util/src/platforms/unix/Makefile.am
@@ -17,6 +17,6 @@
 libaxis2_unix_la_SOURCES = uuid_gen_unix.c\
                            thread_unix.c date_time_util_unix.c 
 
-INCLUDES = -I$(top_builddir)/include \
-           -I$(top_builddir)/include/platforms \
-           -I$(top_builddir)/include/platforms/unix
+INCLUDES = -I$(top_srcdir)/include \
+           -I$(top_srcdir)/include/platforms \
+           -I$(top_srcdir)/include/platforms/unix
diff --git a/util/test/allocator/Makefile.am b/util/test/allocator/Makefile.am
index 734cb69..2ce51fb 100644
--- a/util/test/allocator/Makefile.am
+++ b/util/test/allocator/Makefile.am
@@ -23,7 +23,7 @@
 					$(top_builddir)/$(GTEST)/libgtest_main.a
 
 
-INCLUDES = -I$(top_builddir)/include \
+INCLUDES = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/date_time/Makefile.am b/util/test/date_time/Makefile.am
index 2f4e608..6b61ce8 100644
--- a/util/test/date_time/Makefile.am
+++ b/util/test/date_time/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/duration/Makefile.am b/util/test/duration/Makefile.am
index b0dacb4..a6ce93b 100644
--- a/util/test/duration/Makefile.am
+++ b/util/test/duration/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/link_list/Makefile.am b/util/test/link_list/Makefile.am
index 5545013..e9c8284 100644
--- a/util/test/link_list/Makefile.am
+++ b/util/test/link_list/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/properties/Makefile.am b/util/test/properties/Makefile.am
index 0d91018..07243f0 100644
--- a/util/test/properties/Makefile.am
+++ b/util/test/properties/Makefile.am
@@ -22,7 +22,7 @@
 					$(top_builddir)/$(GTEST)/libgtest.a \
 					$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/rand/Makefile.am b/util/test/rand/Makefile.am
index 61913e1..e445f02 100644
--- a/util/test/rand/Makefile.am
+++ b/util/test/rand/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/stack/Makefile.am b/util/test/stack/Makefile.am
index 62268b2..1f19692 100644
--- a/util/test/stack/Makefile.am
+++ b/util/test/stack/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/string_util/Makefile.am b/util/test/string_util/Makefile.am
index c380073..7e5f7a2 100644
--- a/util/test/string_util/Makefile.am
+++ b/util/test/string_util/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/uri/Makefile.am b/util/test/uri/Makefile.am
index 00dd8b0..e3624ba 100644
--- a/util/test/uri/Makefile.am
+++ b/util/test/uri/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/url/Makefile.am b/util/test/url/Makefile.am
index d2e37bd..a513498 100644
--- a/util/test/url/Makefile.am
+++ b/util/test/url/Makefile.am
@@ -22,7 +22,7 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I ../../../axiom/include \
 			-I ../../../include \
 			-I $(GTEST_DIR)/include
diff --git a/util/test/util/Makefile.am b/util/test/util/Makefile.am
index 169fc08..27d595c 100644
--- a/util/test/util/Makefile.am
+++ b/util/test/util/Makefile.am
@@ -41,6 +41,6 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
 			-I $(GTEST_DIR)/include
 
diff --git a/util/test/utils/Makefile.am b/util/test/utils/Makefile.am
index 42c274e..c0b9bd9 100644
--- a/util/test/utils/Makefile.am
+++ b/util/test/utils/Makefile.am
@@ -22,9 +22,9 @@
 				$(top_builddir)/$(GTEST)/libgtest.a \
 				$(top_builddir)/$(GTEST)/libgtest_main.a
 
-AM_CPPFLAGS = -I$(top_builddir)/include \
-			-I ../../../axiom/include \
-			-I ../../../include \
-			-I $(GTEST_DIR)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+			  -I ../../../axiom/include \
+			  -I ../../../include \
+			  -I $(GTEST_DIR)/include