diff --git a/src/boost/format/Makefile.am b/src/boost/format/Makefile.am
index bae92c1982..d28a2b31d0 100644
--- a/src/boost/format/Makefile.am
+++ b/src/boost/format/Makefile.am
@@ -1,8 +1,8 @@
 noinst_LIBRARIES = libformat.a
 
-libformat_a_SOURCES = format_implementation.cc free_funcs.cc parsing.cc
+libformat_a_SOURCES = format_implementation.cc free_funcs.cc \
+ parsing.cc exceptions.hpp feed_args.hpp format_class.hpp \
+ format_fwd.hpp group.hpp internals.hpp internals_fwd.hpp \
+ macros_default.hpp
 
 AM_CXXFLAGS = -Wall -I../..
-
-EXTRA_DIST = exceptions.hpp feed_args.hpp format_class.hpp format_fwd.hpp \
- group.hpp internals.hpp internals_fwd.hpp macros_default.hpp
diff --git a/src/libexpr/Makefile.am b/src/libexpr/Makefile.am
index 71c1f89f1d..a11dbbda6c 100644
--- a/src/libexpr/Makefile.am
+++ b/src/libexpr/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libexpr.a
 
-libexpr_a_SOURCES = nixexpr.cc parser.cc eval.cc primops.cc
+libexpr_a_SOURCES = nixexpr.cc nixexpr.hh parser.cc parser.hh \
+ eval.cc eval.hh primops.cc primops.hh nix.sdf
 
 AM_CXXFLAGS = \
  -I.. -I../../externals/inst/include -I../libutil -I../libstore
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index 5d3144ccc7..a4969ff367 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LIBRARIES = libmain.a
 
-libmain_a_SOURCES = shared.cc
+libmain_a_SOURCES = shared.cc shared.hh
 
 AM_CXXFLAGS = \
  -DNIX_STORE_DIR=\"$(prefix)/store\" \
@@ -8,5 +8,3 @@ AM_CXXFLAGS = \
  -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
  -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
  -I.. -I../../externals/inst/include -I../libutil -I../libstore
-
-EXTRA_DIST = *.hh
diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am
index ad31567b38..6605a76c20 100644
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -1,10 +1,10 @@
 noinst_LIBRARIES = libstore.a
 
 libstore_a_SOURCES = \
- store.cc storeexpr.cc normalise.cc exec.cc \
- globals.cc db.cc references.cc pathlocks.cc
+ store.cc store.hh storeexpr.cc storeexpr.hh \
+ normalise.cc normalise.hh exec.cc exec.hh \
+ globals.cc globals.hh db.cc db.hh \
+ references.cc references.hh pathlocks.cc pathlocks.hh
 
 AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall \
  -I.. -I../../externals/inst/include -I../libutil
-
-EXTRA_DIST = *.hh *.h test-builder-*.sh test.cc
diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am
index 46f0a048fe..362a6e55cd 100644
--- a/src/libutil/Makefile.am
+++ b/src/libutil/Makefile.am
@@ -1,11 +1,10 @@
 noinst_LIBRARIES = libutil.a
 
-libutil_a_SOURCES = util.cc hash.cc archive.cc md5.c aterm.cc
+libutil_a_SOURCES = util.cc util.hh hash.cc hash.hh \
+ archive.cc archive.hh md5.c md5.h aterm.cc aterm.hh
 
 AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I.. -I../../externals/inst/include
 
-EXTRA_DIST = *.hh *.h
-
 check_PROGRAMS = test-aterm
 
 test_aterm_SOURCES = test-aterm.cc
diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am
index 516d78efc5..be35c5f27f 100644
--- a/src/nix-store/Makefile.am
+++ b/src/nix-store/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = nix-store
 
-nix_store_SOURCES = main.cc dotgraph.cc
+nix_store_SOURCES = main.cc dotgraph.cc dotgraph.hh help.txt.hh
 nix_store_LDADD = ../libmain/libmain.a ../libstore/libstore.a ../libutil/libutil.a \
  ../boost/format/libformat.a -L../../externals/inst/lib -ldb_cxx -lATerm
 
@@ -21,5 +21,3 @@ install-data-local:
 	$(INSTALL) -d $(localstatedir)/log/nix
 	$(INSTALL) -d $(prefix)/store
 	$(bindir)/nix-store --init
-
-EXTRA_DIST = *.hh