diff --git a/concordia/CMakeLists.txt b/concordia/CMakeLists.txt
index d2f4010..d86835d 100644
--- a/concordia/CMakeLists.txt
+++ b/concordia/CMakeLists.txt
@@ -23,7 +23,23 @@ add_subdirectory(t)
 # =====================================
 
 install(TARGETS concordia DESTINATION lib/)
-install(FILES concordia.hpp DESTINATION include/concordia/)
+install(FILES 
+          substring_occurence.hpp
+          example.hpp
+          index_searcher.hpp
+          concordia_index.hpp
+          word_map.hpp
+          hash_generator.hpp
+          concordia.hpp
+          concordia_config.hpp
+          concordia_exception.hpp
+        DESTINATION include/concordia/)
+
+install(FILES 
+          common/config.hpp
+          common/logging.hpp
+          common/utils.hpp
+        DESTINATION include/concordia/common/)
 
 # ----------------------------------------------------
 # libconfig
diff --git a/concordia/common/utils.hpp b/concordia/common/utils.hpp
index 79fbf9b..7dde41d 100644
--- a/concordia/common/utils.hpp
+++ b/concordia/common/utils.hpp
@@ -8,7 +8,7 @@
 
 #include "concordia/common/config.hpp"
 #include "concordia/concordia_exception.hpp"
-#include "build/libdivsufsort/include/divsufsort.h"
+#include "divsufsort.h"
 
 using namespace std;
 
diff --git a/concordia/concordia.hpp b/concordia/concordia.hpp
index 3880081..5f6c1b7 100644
--- a/concordia/concordia.hpp
+++ b/concordia/concordia.hpp
@@ -13,7 +13,7 @@
 #include "concordia/concordia_config.hpp"
 #include "concordia/concordia_index.hpp"
 #include "concordia/index_searcher.hpp"
-#include "build/libdivsufsort/include/divsufsort.h"
+#include "divsufsort.h"
 
 
 /*!
diff --git a/concordia/concordia_index.hpp b/concordia/concordia_index.hpp
index d08fef3..6d71d98 100644
--- a/concordia/concordia_index.hpp
+++ b/concordia/concordia_index.hpp
@@ -11,7 +11,7 @@
 #include "concordia/example.hpp"
 #include "concordia/hash_generator.hpp"
 #include "concordia/concordia_exception.hpp"
-#include "build/libdivsufsort/include/divsufsort.h"
+#include "divsufsort.h"
 
 /*!
   Class for creating and maintaining the index.
diff --git a/concordia/index_searcher.hpp b/concordia/index_searcher.hpp
index 419ab82..74d2257 100644
--- a/concordia/index_searcher.hpp
+++ b/concordia/index_searcher.hpp
@@ -7,11 +7,12 @@
 #include <iostream>
 
 #include "concordia/common/config.hpp"
-#include "build/libdivsufsort/include/divsufsort.h"
 #include "concordia/substring_occurence.hpp"
 #include "concordia/hash_generator.hpp"
 #include "concordia/concordia_exception.hpp"
 
+#include "divsufsort.h"
+
 /*!
   Class for searching the index with a sentence.
 
diff --git a/concordia/t/test_utils.cpp b/concordia/t/test_utils.cpp
index 0ad09d4..042f301 100644
--- a/concordia/t/test_utils.cpp
+++ b/concordia/t/test_utils.cpp
@@ -2,9 +2,9 @@
 #include "concordia/common/utils.hpp"
 #include "concordia/common/config.hpp"
 #include "tests/common/test_resources_manager.hpp"
-#include "build/libdivsufsort/include/divsufsort.h"
 #include <boost/filesystem.hpp>
 
+#include "divsufsort.h"
 #include <string>
 
 using namespace std;