diff --git a/openair3/NGAP/ngap_gNB_mobility_management.c b/openair3/NGAP/ngap_gNB_mobility_management.c
index 95290f7bc3..d40112ff00 100644
--- a/openair3/NGAP/ngap_gNB_mobility_management.c
+++ b/openair3/NGAP/ngap_gNB_mobility_management.c
@@ -31,6 +31,7 @@
 #include "ngap_gNB_management_procedures.h"
 #include "ngap_gNB_encoder.h"
 #include "ngap_gNB_itti_messaging.h"
+#include "NR_HandoverPreparationInformation.h"
 #include "conversions.h"
 
 /** @brief UE Mobility Management: encode Handover Required
diff --git a/openair3/NGAP/ngap_msg_includes.h b/openair3/NGAP/ngap_msg_includes.h
index 2a861e2e32..485c9f26ac 100644
--- a/openair3/NGAP/ngap_msg_includes.h
+++ b/openair3/NGAP/ngap_msg_includes.h
@@ -102,7 +102,6 @@
 #include "NGAP_PDUSessionResourceAdmittedItem.h"
 #include "NGAP_HandoverRequestAcknowledgeTransfer.h"
 #include "NGAP_QosFlowItemWithDataForwarding.h"
-#include "NR_HandoverPreparationInformation.h"
 #include "NGAP_HandoverNotify.h"
 #include "NGAP_DRBsSubjectToStatusTransferItem.h"
 #include "NGAP_DRBStatusUL.h"