diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc44642e..32b17938 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ target_link_libraries(tcmu
   ${LIBNL_GENL_LIB}
   ${GLIB_LIBRARIES}
   )
-install(TARGETS tcmu LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} NAMELINK_SKIP)
+install(TARGETS tcmu LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 # Stuff for building the static library
 add_library(tcmu_static
@@ -272,6 +272,8 @@ configure_file (
   )
 install(SCRIPT tcmu.conf_install.cmake)
 
+install(FILES libtcmu.h libtcmu_common.h libtcmu_priv.h darray.h
+  DESTINATION include)
 install(FILES org.kernel.TCMUService1.service
   DESTINATION /usr/share/dbus-1/system-services)
 install(FILES tcmu-runner.conf DESTINATION /etc/dbus-1/system.d)
diff --git a/alua.c b/alua.c
index 12804f74..3daa98df 100644
--- a/alua.c
+++ b/alua.c
@@ -23,6 +23,7 @@
 #include "libtcmu_log.h"
 #include "libtcmu_common.h"
 #include "libtcmu_priv.h"
+#include "tcmu-runner.h"
 #include "tcmur_device.h"
 #include "target.h"
 #include "alua.h"
diff --git a/api.c b/api.c
index 0879cda7..967d48d8 100644
--- a/api.c
+++ b/api.c
@@ -25,6 +25,7 @@
 #include "libtcmu_log.h"
 #include "libtcmu_common.h"
 #include "libtcmu_priv.h"
+#include "tcmu-runner.h"
 #include "target.h"
 #include "alua.h"
 #include "be_byteshift.h"
diff --git a/libtcmu_log.c b/libtcmu_log.c
index fb1d2af8..800bbedc 100644
--- a/libtcmu_log.c
+++ b/libtcmu_log.c
@@ -22,6 +22,7 @@
 #include "libtcmu_config.h"
 #include "libtcmu_time.h"
 #include "libtcmu_priv.h"
+#include "tcmu-runner.h"
 #include "string_priv.h"
 
 /* tcmu ring buffer for log */
diff --git a/libtcmu_priv.h b/libtcmu_priv.h
index fd923659..4f85215e 100644
--- a/libtcmu_priv.h
+++ b/libtcmu_priv.h
@@ -20,11 +20,7 @@
 #include <gio/gio.h>
 #include <pthread.h>
 
-#include "scsi_defs.h"
 #include "darray.h"
-#include "ccan/list/list.h"
-#include "tcmur_aio.h"
-#include "tcmu-runner.h"
 
 #define KERN_IFACE_VER 2