diff --git a/Makefile.am b/Makefile.am
index 3cafb12..ef655be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-MAINTAINERCLEANFILES = Makefile.in version.h
+MAINTAINERCLEANFILES = Makefile.in
 
 libjackincludedir = $(includedir)/jack
 
@@ -17,26 +17,3 @@ libjackinclude_HEADERS = 	\
 	weakjack.h              \
 	control.h		\
 	jslist.h
-
-noinst_HEADERS =		\
-	atomicity.h		\
-	bitset.h		\
-	driver.h 		\
-	driver_interface.h	\
-	driver_parse.h	        \
-	engine.h		\
-	hardware.h 		\
-	internal.h 		\
-	intsimd.h 		\
-	memops.h		\
-	messagebuffer.h		\
-	pool.h			\
-	port.h			\
-	ringbuffer.h	        \
-	sanitycheck.h           \
-	shm.h			\
-	start.h			\
-	systemtest.h            \
-	unlock.h		\
-	varargs.h		\
-	version.h
diff --git a/thread.h b/thread.h
index 1a33202..3d240f3 100644
--- a/thread.h
+++ b/thread.h
@@ -26,6 +26,7 @@ extern "C" {
 
 #include <pthread.h>
 #include <jack/weakmacros.h>
+#include <jack/types.h>
 
 /* use 512KB stack per thread - the default is way too high to be feasible 
  * with mlockall() on many systems */