diff --git a/src/liboncilla/CMakeLists.txt b/src/liboncilla/CMakeLists.txt
index 9707f16..388b671 100644
--- a/src/liboncilla/CMakeLists.txt
+++ b/src/liboncilla/CMakeLists.txt
@@ -1,49 +1,49 @@
 set(ONCILLAHEADERS
     OncillaTrunk.h
     OncillaL0.h
     OncillaL1L2.h
     OncillaL3.h
     OncillaL4.h
     Oncilla.h
     OncillaSynchronizer.h
     BackendLoader.h
     OncillaBackend.h
-	common.h)
-
-set(ONCILLA_EXCEPTIONS_HEADERS
+	common.h
     exceptions/LoadingError.h
     exceptions/NotImplementedError.h)
 
 set(ONCILLASOURCES
     OncillaTrunk.cpp
     OncillaL0.cpp
     OncillaL1L2.cpp
     OncillaL3.cpp
     OncillaL4.cpp
     Oncilla.cpp
     OncillaSynchronizer.cpp
     OncillaBackend.cpp
     exceptions/LoadingError.cpp
     exceptions/NotImplementedError.cpp
     BackendLoader.cpp)
 
-add_library(oncilla SHARED ${ONCILLASOURCES} ${ONCILLAHEADERS} ${ONCILLA_EXCEPTIONS_HEADERS})
+add_library(oncilla SHARED ${ONCILLASOURCES} ${ONCILLAHEADERS})
 target_link_libraries(oncilla
                       ${RCI_LIBRARIES} ${BIOROB_CPP_LIBRARIES})
 
 set_target_properties(oncilla
                       PROPERTIES
                       VERSION ${VERSION_STRING}
 					  SOVERSION ${VERSION_ABI})
 
 install(TARGETS oncilla
         DESTINATION lib)
 
-set(DEST_INCLUDE_DIR include/liboncilla-${VERSION_API}/liboncilla)
+set(DEST_INCLUDE_DIR include/liboncilla-${VERSION_API})
 
-install(FILES ${ONCILLAHEADERS}
-        DESTINATION ${DEST_INCLUDE_DIR} )
 
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/liboncilla
+                  ${PROJECT_BINARY_DIR}/src/liboncilla
+        DESTINATION ${DEST_INCLUDE_DIR}
+        FILES_MATCHING PATTERN "*.h"
+                       PATTERN "CMakeFiles" EXCLUDE
+                       )
 
-install(FILES ${ONCILLA_EXCEPTIONS_HEADERS}
-        DESTINATION ${DEST_INCLUDE_DIRS}/exceptions)
\ No newline at end of file