diff --git a/fpga/lib/CMakeLists.txt b/fpga/lib/CMakeLists.txt
index 84733d3f8..834a7c856 100644
--- a/fpga/lib/CMakeLists.txt
+++ b/fpga/lib/CMakeLists.txt
@@ -1,3 +1,5 @@
+add_subdirectory(common)
+
 set(SOURCES
 	vlnv.cpp
 	card.cpp
@@ -21,11 +23,6 @@ set(SOURCES
 	log.c
 	log_config.c
 	log_helper.c
-
-	plugin.cpp
-	utils.cpp
-	memory_manager.cpp
-	memory.cpp
 )
 
 include(FindPkgConfig)
@@ -37,6 +34,8 @@ find_package(Threads)
 
 add_library(villas-fpga SHARED ${SOURCES})
 
+target_link_libraries(villas-fpga PUBLIC villas-common)
+
 target_compile_definitions(villas-fpga PRIVATE
 	BUILDID=\"abc\"
 	_GNU_SOURCE
diff --git a/fpga/lib/common/CMakeLists.txt b/fpga/lib/common/CMakeLists.txt
new file mode 100644
index 000000000..20bb3b6e2
--- /dev/null
+++ b/fpga/lib/common/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 3.7)
+
+project(villas-common)
+
+add_library(villas-common SHARED
+	plugin.cpp
+	utils.cpp
+	memory.cpp
+	memory_manager.cpp)
+
+target_include_directories(villas-common
+	PUBLIC
+		${CMAKE_CURRENT_LIST_DIR}/../../include/villas
+		${CMAKE_CURRENT_LIST_DIR}/../../include
+		${CMAKE_CURRENT_LIST_DIR}/../../thirdparty/spdlog/include)
diff --git a/fpga/lib/memory.cpp b/fpga/lib/common/memory.cpp
similarity index 100%
rename from fpga/lib/memory.cpp
rename to fpga/lib/common/memory.cpp
diff --git a/fpga/lib/memory_manager.cpp b/fpga/lib/common/memory_manager.cpp
similarity index 100%
rename from fpga/lib/memory_manager.cpp
rename to fpga/lib/common/memory_manager.cpp
diff --git a/fpga/lib/plugin.cpp b/fpga/lib/common/plugin.cpp
similarity index 100%
rename from fpga/lib/plugin.cpp
rename to fpga/lib/common/plugin.cpp
diff --git a/fpga/lib/utils.cpp b/fpga/lib/common/utils.cpp
similarity index 100%
rename from fpga/lib/utils.cpp
rename to fpga/lib/common/utils.cpp