diff --git a/openair2/COMMON/f1ap_messages_types.h b/openair2/COMMON/f1ap_messages_types.h
index d8c832e6e5..e71c0eab64 100644
--- a/openair2/COMMON/f1ap_messages_types.h
+++ b/openair2/COMMON/f1ap_messages_types.h
@@ -24,7 +24,6 @@
 
 #include <netinet/in.h>
 #include <netinet/sctp.h>
-#include "s1ap_messages_types.h"
 #include "ngap_messages_types.h"
 
 //-------------------------------------------------------------------------------------------//
diff --git a/openair2/COMMON/ngap_messages_types.h b/openair2/COMMON/ngap_messages_types.h
index 861f5e6d2c..99d9d1dc0c 100644
--- a/openair2/COMMON/ngap_messages_types.h
+++ b/openair2/COMMON/ngap_messages_types.h
@@ -33,6 +33,7 @@
 #include "common/platform_types.h"
 #include "common/ngran_types.h"
 #include "LTE_asn_constant.h"
+#include "s1ap_messages_types.h"
 //-------------------------------------------------------------------------------------------//
 // Defines to access message fields.