diff --git a/util/Makefile.am b/util/Makefile.am
index 7e40e19..99a565a 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -15,8 +15,21 @@
 datadir=$(prefix)
 tmpincludedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
 includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
-SUBDIRS = src $(GTEST) $(TESTDIR) include
+SUBDIRS = src $(GTEST) $(TESTDIR)
 include_HEADERS=$(top_srcdir)/include/*.h
+
+platformincludedir=$(includedir)/platforms/
+platforminclude_HEADERS=$(top_srcdir)/include/platforms/*.h
+
+unixincludedir=$(platformincludedir)/unix/
+unixinclude_HEADERS= $(top_srcdir)/include/platforms/unix/*.h
+
+os400includedir=$(platformincludedir)/os400/
+os400include_HEADERS= $(top_srcdir)/include/platforms/os400/*.h
+
+windowsincludedir=$(platformincludedir)/windows/
+windowsinclude_HEADERS= $(top_srcdir)/include/platforms/windows/*.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/configure.ac b/util/configure.ac
index b8726bd..453d1c6 100644
--- a/util/configure.ac
+++ b/util/configure.ac
@@ -352,7 +352,6 @@
     src/Makefile \
     src/platforms/unix/Makefile \
     src/minizip/Makefile \
-    include/Makefile \
     gtest/Makefile \
     test/Makefile \
     test/util/Makefile \
diff --git a/util/include/Makefile.am b/util/include/Makefile.am
deleted file mode 100644
index 6dd3027..0000000
--- a/util/include/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-includedir=$(prefix)/include/axis2-${PACKAGE_VERSION}/
-nobase_include_HEADERS= $(top_srcdir)/include/platforms/axutil_platform_auto_sense.h \
-						$(top_srcdir)/include/platforms/unix/*.h \
-						$(top_srcdir)/include/platforms/windows/*.h