diff --git a/Makefile.am b/Makefile.am
index 6e46516..14261f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-SUBDIRS = utils
+SUBDIRS = src utils
 if WITH_GUILE
-SUBDIRS += src examples
+SUBDIRS += examples
 endif
 EXTRA_DIST = COPYRIGHT doc base README.md NEWS.md
 ACLOCAL_AMFLAGS = -I m4
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1f6bb8f..7eddb07 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -44,7 +44,7 @@ LIBCTL_DIR = @LIBCTL_DIR@
 GEN_CTL_IO = @GEN_CTL_IO@
 
 # location of libctl headers and library for this project
-LIBCTL_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_builddir)/src
+LIBCTL_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/src -I$(top_builddir)/src
 LIBCTL = $(top_builddir)/src/libctl.la $(LIBGUILE) # change to -lctl -lguile for your project
 
 ##############################################################################
diff --git a/src/Makefile.am b/src/Makefile.am
index f5a6a48..432ca89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,10 @@
 
 EXTRA_DIST = ctl.h.in
 
+if WITH_GUILE
 lib_LTLIBRARIES = libctl.la
+endif
+
 include_HEADERS = ctl-math.h
 nodist_include_HEADERS = ctl.h
 
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 8d05579..beaeeb0 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -8,10 +8,11 @@ EXTRA_DIST = gen-ctl-io.in README geom.scm geom-ctl-io-defaults.c nlopt.c
 
 libctlgeom_la_SOURCES = geom.c $(top_srcdir)/src/ctl-math.c $(top_srcdir)/src/integrator.c geom-ctl-io.c ctlgeom-types.h
 libctlgeom_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-libctlgeom_la_CPPFLAGS = -DLIBCTLGEOM
+libctlgeom_la_CPPFLAGS = -DLIBCTLGEOM -I$(top_srcdir)/src
 
 geomtst_SOURCES = geomtst.c
 geomtst_LDADD = libctlgeom.la
+geomtst_CPPFLAGS = -I$(top_srcdir)/src
 
 dist_man_MANS = gen-ctl-io.1
 
@@ -40,4 +41,4 @@ geom-ctl-io.c: ctl-io.c
 endif
 
 clean-local:
-	rm -f ctl-io.[ch] nlopt-constants.scm
+	rm -f ctl-io.[ch] nlopt-constants.scm ctlgeom-types.h geom-ctl-io.c