diff --git a/Makefile.am b/Makefile.am
index 8e4e6045a5d0a2ddfee89d7a47946f0c0eca6c0d..a8835d8ace9962eb1c3a946c11c560770f11e779 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 DOC_FILES = \
 			README.md \
-			LICENSE
+			COPYING
 
 EXTRA_DIST = \
 			$(DOC_FILES)
diff --git a/python/Makefile.am b/python/Makefile.am
index c854b90a7016409b345484535d4a5dc93a4c2503..7f2566202bedcf715eaab5ea024719669a3e1fe4 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,5 +1,9 @@
 if USE_CYTHON
 
+noinst_HEADERS = \
+	opendht.pyx \
+	opendht_cpp.pxd
+
 PYTHON_INSTALL_RECORD = $(builddir)/install_record.txt
 
 pybuild.stamp:
diff --git a/src/Makefile.am b/src/Makefile.am
index e1cc7556121971261de0dd43c53ec8561b0b0430..92affd084f5b71d72d869d05cf4cb6ec989b123c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,3 +47,6 @@ nobase_include_HEADERS = \
         ../include/opendht/log.h \
         ../include/opendht/rng.h \
         ../include/opendht/indexation/pht.h
+
+nobase_noinst_HEADERS = \
+        ../include/opendht/request.h
diff --git a/src/argon2/Makefile.am b/src/argon2/Makefile.am
index 7048fffd2aeff16b6aa0d9df02a7600951ec5698..de389ef722c6b59c2522aeffd9be8ab5db5b48a6 100644
--- a/src/argon2/Makefile.am
+++ b/src/argon2/Makefile.am
@@ -10,4 +10,14 @@ libargon2_la_SOURCES = \
         encoding.c \
         ref.c
 
-EXTRA_libargon2_la_SOURCES = opt.c
+noinst_HEADERS = \
+        argon2.h \
+        core.h \
+        blake2/blake2.h \
+        blake2/blake2-impl.h \
+        blake2/blamka-round-ref.h \
+        blake2/blamka-round-opt.h \
+        thread.h \
+        encoding.h \
+        opt.h \
+        ref.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e461480f618c2a01563bd034be76ef894520398f..25b1184b4eae34fcf85a78e6d5624a7124e22f21 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,5 @@
 bin_PROGRAMS = dhtnode dhtchat dhtscanner
+noinst_HEADERS = tools_common.h
 
 AM_CPPFLAGS = -I../include