diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1015b9d..0263928 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,4 +10,6 @@ find_package(Protobuf REQUIRED)
 include_directories(${PROTOBUF_INCLUDE_DIR})
 
 add_subdirectory(src)
-add_subdirectory(tools)
\ No newline at end of file
+if(NOT MSVC)
+add_subdirectory(tools)
+endif()
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 16a4994..a2334c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,6 @@ ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${
 ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf)
 
 SET(INCLUDE_INSTALL "include/osmpbf")
-FILE(GLOB files "${CMAKE_SOURCE_DIR}/src/*.h")
+FILE(GLOB files "${CMAKE_SOURCE_DIR}/include/osmpbf/*.h")
 INSTALL(FILES ${files} DESTINATION ${INCLUDE_INSTALL})
 install(TARGETS osmpbf LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)