diff --git a/src/boost/Makefile.am b/src/boost/Makefile.am
index c149c13f73..8b5aa25fb5 100644
--- a/src/boost/Makefile.am
+++ b/src/boost/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = format
 
-pkginclude_HEADERS = assert.hpp checked_delete.hpp format.hpp \
+nobase_pkginclude_HEADERS = assert.hpp checked_delete.hpp format.hpp \
  shared_ptr.hpp weak_ptr.hpp throw_exception.hpp \
  enable_shared_from_this.hpp \
  detail/shared_count.hpp detail/workaround.hpp
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index e5d199e2c5..c2946febce 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -1,6 +1,10 @@
 pkglib_LTLIBRARIES = libmain.la
 
-libmain_la_SOURCES = shared.cc shared.hh
+libmain_la_SOURCES = shared.cc
+
+libmain_la_LIBADD = ../libstore/libstore.la
+
+pkginclude_HEADERS = shared.hh
 
 AM_CXXFLAGS = \
  -DNIX_STORE_DIR=\"$(storedir)\" \