diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
index 94f37ee2ac..fc844da7b8 100644
--- a/driver/CMakeLists.txt
+++ b/driver/CMakeLists.txt
@@ -158,6 +158,11 @@ set(DRIVER_SOURCES
 	ppm_consumer.h
 	capture_macro.h
 	socketcall_to_syscall.h
+	syscall_compat_loongarch64.h
+	syscall_compat_ppc64le.h
+	syscall_compat_riscv64.h
+	syscall_compat_s390x.h
+	syscall_compat_x86_64.h
 	syscall_ia32_64_map.c
 )
 
diff --git a/test/libscap/CMakeLists.txt b/test/libscap/CMakeLists.txt
index ebac7e968b..eeb99ca2f5 100644
--- a/test/libscap/CMakeLists.txt
+++ b/test/libscap/CMakeLists.txt
@@ -39,7 +39,13 @@ set(LIBSCAP_TESTS_INCLUDE
 # Needed by gtest
 find_package(Threads)
 
-set(LIBSCAP_TESTS_LIBRARIES "${GTEST_LIB}" "${GTEST_MAIN_LIB}" "${CMAKE_THREAD_LIBS_INIT}" scap)
+set(LIBSCAP_TESTS_LIBRARIES
+	"${GTEST_LIB}"
+	"${GTEST_MAIN_LIB}"
+	"${CMAKE_THREAD_LIBS_INIT}"
+	"${PROTOBUF_LIB}"
+	scap
+)
 
 set(LIBSCAP_TESTS_DEPENDENCIES gtest scap)
 
diff --git a/userspace/libscap/CMakeLists.txt b/userspace/libscap/CMakeLists.txt
index 20ac14cdfb..c92cf9021b 100644
--- a/userspace/libscap/CMakeLists.txt
+++ b/userspace/libscap/CMakeLists.txt
@@ -90,8 +90,7 @@ target_include_directories(
 
 target_link_libraries(scap PRIVATE scap_error "${ZLIB_LIB}")
 
-add_library(
-	scap_event_schema STATIC
+add_library(scap_event_schema
 	scap_event.c
 	ppm_sc_names.c
 	scap_print_event.c
diff --git a/userspace/libscap/linux/CMakeLists.txt b/userspace/libscap/linux/CMakeLists.txt
index 435c8546c0..4047d54302 100644
--- a/userspace/libscap/linux/CMakeLists.txt
+++ b/userspace/libscap/linux/CMakeLists.txt
@@ -12,8 +12,7 @@
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
 #
-add_library(
-	scap_platform STATIC
+add_library(scap_platform
 	scap_linux_platform.c
 	scap_linux_hostinfo_platform.c
 	scap_procs.c
diff --git a/userspace/libsinsp/test/CMakeLists.txt b/userspace/libsinsp/test/CMakeLists.txt
index fb8c467547..be6420672b 100644
--- a/userspace/libsinsp/test/CMakeLists.txt
+++ b/userspace/libsinsp/test/CMakeLists.txt
@@ -191,7 +191,13 @@ target_include_directories(
 )
 
 target_link_libraries(
-	unit-test-libsinsp sinsp "${GTEST_LIB}" "${GTEST_MAIN_LIB}" "${TBB_LIB}" "${JSONCPP_LIB}"
+	unit-test-libsinsp
+	sinsp
+	"${GRPCPP_LIB}"
+	"${GTEST_LIB}"
+	"${GTEST_MAIN_LIB}"
+	"${TBB_LIB}"
+	"${JSONCPP_LIB}"
 )
 
 # Add some additional include directories associated with `ADDITIONAL_SINSP_TESTS_SUITE`