diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e8850dbe..362abecbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,9 +163,8 @@
 endif()
 
-include(falcosecurity-libs)
 include(yaml-cpp)
 include(nlohmann-json)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	if(NOT DEFINED DRIVER_VERSION)
 		set(DRIVER_VERSION "${FALCOSECURITY_LIBS_VERSION}")
diff --git a/userspace/sysdig/CMakeLists.txt b/userspace/sysdig/CMakeLists.txt
index cd2e08f4c..a052f59f5 100644
--- a/userspace/sysdig/CMakeLists.txt
+++ b/userspace/sysdig/CMakeLists.txt
@@ -17,13 +17,12 @@
 #
 
 if(NOT WIN32)
 	include(ncurses)
 endif() # NOT WIN32
 
-include(zlib)
 include(luajit)
 
 include_directories("${PROJECT_BINARY_DIR}/userspace/sinspui")
 include_directories(../sinspui)
 include_directories("${PROJECT_BINARY_DIR}/userspace/sysdig")
 include_directories(.)
@@ -91,21 +90,31 @@ else()
 endif()
 
 target_include_directories(
 	sysdig
 	PUBLIC
 		"${NJSON_INCLUDE_DIR}"
+		"/usr/include/jsoncpp/"
+		"/usr/include/falcosecurity"
+		"/usr/include/falcosecurity/driver"
+		"/usr/include/falcosecurity/libsinsp"
+		"/usr/include/falcosecurity/libscap"
 		"${LUAJIT_INCLUDE}"
 		../chisel
 		..
 	)
 
 target_include_directories(
 	csysdig
 	PUBLIC
 		"${NJSON_INCLUDE_DIR}"
+		"/usr/include/jsoncpp/"
+		"/usr/include/falcosecurity"
+		"/usr/include/falcosecurity/driver"
+		"/usr/include/falcosecurity/libsinsp"
+		"/usr/include/falcosecurity/libscap"
 		"${LUAJIT_INCLUDE}"
 		../chisel
 		..
 	)
 
 if(NOT WIN32)
@@ -112,8 +112,10 @@
 	include_directories(${PROJECT_BINARY_DIR}/driver/src)
 
 	target_link_libraries(sysdig
-		"${SINSP_LIB}"
+		-lsinsp
 		"${LUAJIT_LIB}"
+                scap
+                jsoncpp
 		yaml-cpp)
 
 	if(USE_BUNDLED_NCURSES)
@@ -121,10 +123,12 @@
 	endif()
 
 	target_link_libraries(csysdig
-		"${SINSP_LIB}"
+		-lsinsp
+                scap
 		"${LUAJIT_LIB}"
 		"${CURSES_LIBRARIES}"
-		yaml-cpp)
+		yaml-cpp
+                jsoncpp)
 
 	add_subdirectory(man)