diff --git a/Makefile.am b/Makefile.am
index ac8c29cf..add1ad96 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,19 +4,22 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-cpgpreprocessdir = $(includedir)/dune/grid/cpgpreprocess
+cpgpreprocessdir = $(includedir)/cpgpreprocess
+
+cpgpreprocess_HEADERS = preprocess.h
 
-cpgpreprocess_HEADERS = facetopology.h preprocess.h sparsetable.h \
-                     uniquepoints.h
 
 lib_LTLIBRARIES = libcpgpreprocess.la
 noinst_LTLIBRARIES = libcpgpreprocess_noinst.la
 
-libcpgpreprocess_la_SOURCES =                   \
-facetopology.c                                  \
-uniquepoints.c                                  \
-preprocess.c                                    \
-sparsetable.c
+libcpgpreprocess_la_SOURCES =			\
+facetopology.c					\
+uniquepoints.c					\
+preprocess.c					\
+sparsetable.c 					\
+facetopology.h					\
+uniquepoints.h					\
+sparsetable.h
 
 libcpgpreprocess_noinst_la_SOURCES =            \
 $(libcpgpreprocess_la_SOURCES)