diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dd0019bc0f65013bfe395723e4daf61d0e659c6..3d3332ebf53bd2867c0b060817fe55a5945015e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,14 +133,15 @@ add_custom_command(
         ${PROTO_FILES}
       DEPENDS ${PROTO_FILES})
 
+# add generated files to include path
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
 # show generated files
 message(DEBUG "GRPC_GENERATED: ${GRPC_GENERATED}")
 
 ###############################################################################
 ### Set up main targets
-### * [caosdb_grpc] - only in Debug builds. Otherwise this library is compiled
-###   into caosdb libraray
-### * caosdb (links to caosdb_grpc) - The main library.
+### * caosdb - The main library including the protobuf and grpc generated files.
 ### * cxxcaosdbcli - A C++ test client.
 ### * ccaosdb - A C-Wrapper of the C++ caosdb library.
 ### * ccaosdbcli - A plain C test client.
@@ -158,12 +159,17 @@ find_package(GTest REQUIRED)
 message(DEBUG "CMAKE_INCLUDE_PATH: ${CMAKE_INCLUDE_PATH}")
 message(DEBUG "PROTOBUF_INCLUDE_DIRS: ${PROTOBUF_INCLUDE_DIRS}")
 message(DEBUG "gRPC_INCLUDE_DIRS: ${gRPC_INCLUDE_DIRS}")
+message(DEBUG "Boost_INCLUDE_DIRS: ${Boost_INCLUDE_DIRS}")
+message(DEBUG "GTest_INCLUDE_DIRS: ${GTest_INCLUDE_DIRS}")
+message(DEBUG "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+message(DEBUG "libcaosdb_SOURCE_DIR: ${libcaosdb_SOURCE_DIR}")
+message(DEBUG "libcaosdb_BINARY_DIR: ${libcaosdb_BINARY_DIR}")
 
 
 # libcaosdb
 # ---------
 add_library(caosdb SHARED
-     ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED_SOURCES})
+     ${libcaosdb_INCL} ${libcaosdb_SRC} ${GRPC_GENERATED})
 target_link_libraries(caosdb PUBLIC
     gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}
 )
@@ -178,7 +184,7 @@ target_include_directories(caosdb PUBLIC
 
 # libccaosdb
 # ----------
-add_library(ccaosdb SHARED src/ccaosdb.cpp ${GRPC_GENERATED_SOURCES})
+add_library(ccaosdb SHARED src/ccaosdb.cpp ${GRPC_GENERATED})
 target_link_libraries(ccaosdb PUBLIC
     caosdb
     gRPC::grpc gRPC::grpc++ protobuf::libprotobuf ${Boost_LIBRARIES}