diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cb3e09736..b8a1b3a082 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -517,17 +517,6 @@ add_library(x2ap
 target_link_libraries(x2ap PUBLIC asn1_x2ap)
 target_link_libraries(x2ap PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs)
 
-#XNAP
-##############
-set(XNAP_DIR ${OPENAIR2_DIR}/XNAP)
-add_library(xnap
-  ${XNAP_DIR}/xnap_common.c
- )
-target_include_directories(xnap PUBLIC XNAP_DIR)
-target_link_libraries(xnap PUBLIC asn1_xnap)
-target_link_libraries(xnap PRIVATE nr_rrc xnap_lib)
-target_include_directories(xnap PRIVATE ${XNAP_DIR}/lib)
-
 # F1AP
 ##############
 set(F1AP_DIR ${OPENAIR2_DIR}/F1AP)
diff --git a/openair2/XNAP/CMakeLists.txt b/openair2/XNAP/CMakeLists.txt
index 10576f8403..a7ae0be5e4 100644
--- a/openair2/XNAP/CMakeLists.txt
+++ b/openair2/XNAP/CMakeLists.txt
@@ -1,6 +1,9 @@
 add_subdirectory(lib)
 add_subdirectory(MESSAGES)
 
+add_library(xnap xnap_common.c)
+target_link_libraries(xnap PUBLIC asn1_xnap xnap_lib)
+
 if(ENABLE_TESTS)
   add_subdirectory(tests)
 endif()
diff --git a/openair2/XNAP/xnap_common.h b/openair2/XNAP/xnap_common.h
index 78de8b17a1..15d7385215 100644
--- a/openair2/XNAP/xnap_common.h
+++ b/openair2/XNAP/xnap_common.h
@@ -25,7 +25,6 @@
 #define XNAP_COMMON_H_
 
 #include "XNAP_XnAP-PDU.h"
-#include "intertask_interface.h"
 #include "common/openairinterface5g_limits.h"
 #include "oai_asn1.h"
 #include "XNAP_ProtocolIE-Field.h"