diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 4cea694ae..ace78fb29 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -137,6 +137,10 @@ if(LIBNL3_ROUTE_FOUND)
     list(APPEND LIBRARIES PkgConfig::LIBNL3_ROUTE)
 endif()
 
+if(WITH_FPGA)
+    list(APPEND LIBRARIES villas-fpga)
+endif()
+
 add_library(villas SHARED ${LIB_SRC})
 
 target_include_directories(villas PUBLIC ${INCLUDE_DIRS})
diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt
index eca812f04..2e719be20 100644
--- a/lib/nodes/CMakeLists.txt
+++ b/lib/nodes/CMakeLists.txt
@@ -172,7 +172,7 @@ endif()
 # Enable VILLASfpga support
 if(WITH_NODE_FPGA)
     list(APPEND NODE_SRC fpga.cpp)
-    list(APPEND LIBRARIES villas-fpga)
+    list(APPEND INCLUDE_DIRS $<TARGET_PROPERTY:villas-fpga,INCLUDE_DIRECTORIES>)
 endif()
 
 add_library(nodes STATIC ${NODE_SRC})