diff --git a/.gitignore b/.gitignore
index 6264b4294..415731c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ Thumbs.db
 # build related files #
 #######################
 /build/
-/util/fingerprint_impl.hpp
 /util/git_sha.cpp
 /cmake/postinst
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67495b1e9..4686074ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,13 +32,15 @@ endif()
 option(ENABLE_JSON_LOGGING "Adds additional JSON debug logging to the response" OFF)
 option(BUILD_TOOLS "Build OSRM tools" OFF)
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/)
 include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/libosmium/include/)
 
-add_custom_target(FingerPrintConfigure ALL
-  ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake
+add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND}
+  "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}"
+  "-DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}"
+  -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FingerPrint-Config.cmake"
   COMMENT "Configuring revision fingerprint"
   VERBATIM)
 
@@ -95,6 +97,7 @@ add_library(COORDINATE OBJECT ${CoordinateGlob})
 add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:ANGLE> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:RESTRICTION> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR> $<TARGET_OBJECTS:IMPORT>)
 
 add_library(FINGERPRINT OBJECT util/fingerprint.cpp)
+target_include_directories(FINGERPRINT PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 add_dependencies(FINGERPRINT FingerPrintConfigure)
 add_dependencies(OSRM FingerPrintConfigure)
 set_target_properties(FINGERPRINT PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/cmake/FingerPrint-Config.cmake b/cmake/FingerPrint-Config.cmake
index 857dedd89..d36b62274 100644
--- a/cmake/FingerPrint-Config.cmake
+++ b/cmake/FingerPrint-Config.cmake
@@ -1,6 +1,6 @@
-set(OLDFILE ${SOURCE_DIR}/util/fingerprint_impl.hpp)
+set(OLDFILE ${OUTPUT_DIR}/util/fingerprint_impl.hpp)
 set(NEWFILE ${OLDFILE}.tmp)
-set(INFILE ${OLDFILE}.in)
+set(INFILE ${SOURCE_DIR}/util/fingerprint_impl.hpp.in)
 file(MD5 ${SOURCE_DIR}/prepare.cpp MD5PREPARE)
 file(MD5 ${SOURCE_DIR}/data_structures/static_rtree.hpp MD5RTREE)
 file(MD5 ${SOURCE_DIR}/util/graph_loader.hpp MD5GRAPH)
@@ -13,7 +13,7 @@ file(MD5 ${NEWFILE} MD5NEW)
 if (EXISTS ${OLDFILE})
     file(MD5 ${OLDFILE} MD5OLD)
     if(NOT ${MD5NEW} STREQUAL ${MD5OLD})
-	    file(REMOVE_RECURSE ${OLDFILE})
+        file(REMOVE_RECURSE ${OLDFILE})
         file(RENAME ${NEWFILE} ${OLDFILE})
     else()
         file(REMOVE_RECURSE ${NEWFILE})
diff --git a/util/fingerprint.cpp b/util/fingerprint.cpp
index 8c7ab404e..8a705b0c8 100644
--- a/util/fingerprint.cpp
+++ b/util/fingerprint.cpp
@@ -25,5 +25,5 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "fingerprint.hpp"
-#include "fingerprint_impl.hpp"
+#include "util/fingerprint.hpp"
+#include "util/fingerprint_impl.hpp"
diff --git a/util/fingerprint_impl.hpp.in b/util/fingerprint_impl.hpp.in
index 390f8ac2c..88e8436cb 100644
--- a/util/fingerprint_impl.hpp.in
+++ b/util/fingerprint_impl.hpp.in
@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "osrm_exception.hpp"
+#include "util/osrm_exception.hpp"
 
 #include <boost/uuid/name_generator.hpp>
 #include <boost/uuid/uuid_generators.hpp>