diff --git a/CMakeLists.txt b/CMakeLists.txt
index 783d3fe..cf850ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,3 +111,17 @@ install(FILES
     "${CMAKE_CURRENT_BINARY_DIR}/bayesnetConfigVersion.cmake"
     DESTINATION share/bayesnet
 )
+# Documentation
+# -------------
+find_package(Doxygen)
+if (Doxygen_FOUND)
+  set(DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+  set(doxyfile_in ${DOC_DIR}/Doxyfile.in)
+  set(doxyfile ${DOC_DIR}/Doxyfile)
+  configure_file(${doxyfile_in} ${doxyfile} @ONLY)
+  doxygen_add_docs(doxygen
+      WORKING_DIRECTORY ${DOC_DIR}
+    CONFIG_FILE ${doxyfile})
+else (Doxygen_FOUND) 
+  MESSAGE("* Doxygen not found")
+endif (Doxygen_FOUND)
diff --git a/bayesnet/utils/CountingSemaphore.h b/bayesnet/utils/CountingSemaphore.h
index d7afc69..67f5f9f 100644
--- a/bayesnet/utils/CountingSemaphore.h
+++ b/bayesnet/utils/CountingSemaphore.h
@@ -4,9 +4,6 @@
 #include <condition_variable>
 #include <algorithm>
 #include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <thread>
 
 class CountingSemaphore {
 public:
diff --git a/config/config.h.in b/config/config.h.in
index 116f6e5..447fbcc 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -3,9 +3,9 @@
 #include <string>
 #include <string_view>
 
-#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR @
-#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR @
-#define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH @
+#define PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@
 
 static constexpr std::string_view project_name = "@PROJECT_NAME@";
 static constexpr std::string_view project_version = "@PROJECT_VERSION@";