diff --git a/scripts/cmake_common.cmake b/scripts/cmake_common.cmake
index 579f76d3..bf2a7557 100644
--- a/scripts/cmake_common.cmake
+++ b/scripts/cmake_common.cmake
@@ -3,6 +3,7 @@ file(GLOB PROJECT_INC_FILES "inc/*.h" "public/*.h")
 file(GLOB PROJECT_INL_FILES "inc/*.inl")
 file(GLOB PROJECT_CPP_FILES "src/*.cpp")
 file(GLOB PROJECT_C_FILES "src/*.c")
+file(GLOB PROJECT_C_FILES "src/*.h")
 file(GLOB PROJECT_CL_FILES "cl/*.cl")
 source_group (Inc FILES ${PROJECT_INC_FILES})
 source_group (Inl FILES ${PROJECT_INL_FILES})
diff --git a/src/VHACD_Lib/CMakeLists.txt b/src/VHACD_Lib/CMakeLists.txt
index 46fc1b16..e56b6b19 100644
--- a/src/VHACD_Lib/CMakeLists.txt
+++ b/src/VHACD_Lib/CMakeLists.txt
@@ -1,4 +1,7 @@
 project(VHACD_LIB CXX C)
+
+set(CMAKE_COMMON_INC "${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/cmake_common.cmake")
+
 include(${CMAKE_COMMON_INC})
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
@@ -29,11 +32,13 @@ endif()
 
 
 target_include_directories(vhacd PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/public/>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc/>
   $<INSTALL_INTERFACE:include/>  # <prefix>/include/mylib
   )
 
 
+
 message("[VHACD] \t -> CMAKE_INSTALL_PREFIX " ${CMAKE_INSTALL_PREFIX})
 install(TARGETS vhacd EXPORT vhacd-targets DESTINATION lib)
 install(FILES ${PROJECT_INC_FILES} DESTINATION include)
@@ -74,4 +79,3 @@ install(
   COMPONENT
     Devel
 )
-