diff --git a/Makefile.in b/Makefile.in
index e26134160..60cee8484 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,7 +20,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 
-SUBDIRS = man lib tools
+SUBDIRS = include man lib tools
 
 include make.tmpl
 
diff --git a/configure b/configure
index c8248b226..0b6c08567 100755
--- a/configure
+++ b/configure
@@ -2155,6 +2155,7 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "\
 Makefile								\
 make.tmpl                                                               \
+include/Makefile						 	\
 lib/Makefile							 	\
 man/Makefile							 	\
 tools/Makefile							 	\
@@ -2249,6 +2250,7 @@ cat >> $CONFIG_STATUS <<EOF
 CONFIG_FILES=\${CONFIG_FILES-"\
 Makefile								\
 make.tmpl                                                               \
+include/Makefile						 	\
 lib/Makefile							 	\
 man/Makefile							 	\
 tools/Makefile							 	\
diff --git a/configure.in b/configure.in
index 4dab14599..354f638e2 100644
--- a/configure.in
+++ b/configure.in
@@ -131,6 +131,7 @@ dnl keep utility scripts running properly
 AC_OUTPUT( 								\
 Makefile								\
 make.tmpl                                                               \
+include/Makefile						 	\
 lib/Makefile							 	\
 man/Makefile							 	\
 tools/Makefile							 	\
diff --git a/include/.symlinks b/include/.symlinks
new file mode 100644
index 000000000..86d0cef7b
--- /dev/null
+++ b/include/.symlinks
@@ -0,0 +1,12 @@
+./lib/config/config.h
+./lib/dev-mgr/dev-manager.h
+./lib/dev-mgr/hash.h
+./lib/dev-mgr/dev-cache.h
+./lib/display/display.h
+./lib/log/log.h
+./lib/metadata/metadata.h
+./lib/mm/dbg_malloc.h
+./lib/mm/pool.h
+./lib/device/device.h
+./lib/datastruct/hash.h
+./lib/datastruct/list.h
diff --git a/include/Makefile.in b/include/Makefile.in
new file mode 100644
index 000000000..926422faf
--- /dev/null
+++ b/include/Makefile.in
@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2001 Sistina Software
+#
+# This LVM library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This LVM library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this LVM library; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+# MA 02111-1307, USA
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+LN_S = @LN_S@
+
+all: .symlinks_created
+
+.symlinks_created: .symlinks
+	find . -maxdepth 1 -type l -exec $(RM) \{\} \;
+	for i in `cat .symlinks`; do $(LN_S) $$i ; done
+	touch $@
+
+clean:
+
+distclean:
+	find . -maxdepth 1 -type l -exec $(RM) \{\} \;
+	$(RM) Makefile .include_symlinks
+
+.PHONY: clean distclean all
+
diff --git a/make.tmpl.in b/make.tmpl.in
index f60488793..5e07ca978 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -51,7 +51,8 @@ SUFFIXES=
 SUFFIXES=.c .d .o
 
 CFLAGS+=-g -Wall -DDEBUG_MEM -DBOUNDS_CHECK -DDEBUG
-INCLUDES+=-I. -I$(top_srcdir)/lib
+INCLUDES+=-I. -I$(top_srcdir)/include
+INC_LNS=$(top_srcdir)\\/include\\/.symlinks_created
 
 ifeq ("@READLINE@", "yes")
   CFLAGS += -DREADLINE_SUPPORT
@@ -88,8 +89,8 @@ $(SUBDIRS.distclean):
 
 %.d: %.c
 	set -e; FILE=`echo $@ | sed 's/\\//\\\\\\//g;s/\\.d//g'`; \
-		$(CC) -MM $(INCLUDES) $< \
-		| sed "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d : /g" > $@; \
+		$(CC) -MM $(INCLUDES) $< | \
+		sed "s/\(.*\)\.o[ :]*/$$FILE.o $$FILE.d : $(INC_LNS) /g" > $@; \
 		[ -s $@ ] || $(RM) $@
 
 clean: $(SUBDIRS.clean)