diff --git a/include/villas/formats/protobuf.hpp b/include/villas/formats/protobuf.hpp
index 8ced9b582..9b33bee5d 100644
--- a/include/villas/formats/protobuf.hpp
+++ b/include/villas/formats/protobuf.hpp
@@ -12,7 +12,7 @@
 #include <villas/format.hpp>
 
 // Generated message descriptors by protoc
-#include <villas/format/villas.pb-c.h>
+#include <villas/formats/villas.pb-c.h>
 
 namespace villas {
 namespace node {
diff --git a/lib/formats/CMakeLists.txt b/lib/formats/CMakeLists.txt
index db3477901..44af099cf 100644
--- a/lib/formats/CMakeLists.txt
+++ b/lib/formats/CMakeLists.txt
@@ -25,18 +25,13 @@ if(DEFINED PROTOBUFC_COMPILER AND PROTOBUFC_FOUND)
         COMMAND ${PROTOBUFC_COMPILER}
             --c_out=${CMAKE_CURRENT_BINARY_DIR}
             villas.proto
+        COMMAND ${CMAKE_COMMAND} -E copy
+            ${CMAKE_CURRENT_BINARY_DIR}/villas.pb-c.h
+            ${CMAKE_BINARY_DIR}/include/villas/formats/villas.pb-c.h
         MAIN_DEPENDENCY villas.proto
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     )
 
-    add_custom_command(
-        OUTPUT
-        ${CMAKE_BINARY_DIR}/include/villas/formats/villas.pb-c.h
-        COMMAND ${CMAKE_COMMAND} -E copy
-            ${CMAKE_CURRENT_BINARY_DIR}/villas.pb-c.h
-            ${CMAKE_BINARY_DIR}/include/villas/formats
-            MAIN_DEPENDENCY ${CMAKE_CURRENT_BINARY_DIR}/villas.pb-c.h)
-
     list(APPEND FORMAT_SRC
         protobuf.cpp
         ${CMAKE_CURRENT_BINARY_DIR}/villas.pb-c.c