diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f0fd00990..7759c8a793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -413,35 +413,11 @@ add_dependencies(NR_RRC_LIB nr_rrc_flag)
 include_directories ("${NR_RRC_FULL_DIR}")
 
 # S1AP
-# Same limitation as described in RRC: unknown generated file list
-# so we generate it at cmake time
 ##############
-set (S1AP_RELEASE R15)
-
 set(S1AP_DIR ${OPENAIR3_DIR}/S1AP)
-make_version(S1AP_VERSION 15 6 0)
-set(S1AP_ASN_FILES "s1ap-15.6.0.asn1")
-
-add_definitions(-DS1AP_VERSION=${S1AP_VERSION})
-set(S1AP_ASN_DIR ${S1AP_DIR}/MESSAGES/ASN1/${S1AP_RELEASE})
-set(S1AP_C_DIR ${asn1_generated_dir}/S1AP_${S1AP_RELEASE})
-
-# Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-set(s1ap_cmd ${OPENAIR_CMAKE}/tools/make_asn1c_includes.sh  "S1AP_" -fno-include-deps "${S1AP_C_DIR}")
-
-compile_asn1("${S1AP_ASN_DIR}/${S1AP_ASN_FILES}" "${s1ap_cmd}"  s1ap_flag)
-
-file(GLOB S1AP_source ${S1AP_C_DIR}/*.c)
-add_library(S1AP_LIB
-  ${S1AP_source}
-  ${S1AP_DIR}/s1ap_common.c
-  )
-add_dependencies(S1AP_LIB rrc_flag s1ap_flag)
-
-include_directories ("${S1AP_C_DIR}")
 include_directories ("${S1AP_DIR}")
-
-add_library(S1AP_ENB
+add_library(s1ap
+  ${S1AP_DIR}/s1ap_common.c
   ${S1AP_DIR}/s1ap_eNB.c
   ${S1AP_DIR}/s1ap_eNB_context_management_procedures.c
   ${S1AP_DIR}/s1ap_eNB_decoder.c
@@ -455,8 +431,8 @@ add_library(S1AP_ENB
   ${S1AP_DIR}/s1ap_eNB_trace.c
   ${S1AP_DIR}/s1ap_eNB_ue_context.c
   )
-add_dependencies(S1AP_ENB rrc_flag s1ap_flag)
-
+add_dependencies(s1ap rrc_flag)
+target_link_libraries(s1ap PUBLIC asn1_s1ap)
 
 # NGAP
 # Same limitation as described in RRC: unknown generated file list
@@ -1846,8 +1822,8 @@ add_library(L2
   ${ENB_APP_SRC}
   ${MCE_APP_SRC}
   )
-add_dependencies(L2 rrc_flag s1ap_flag m2_flag m3_flag)
-target_link_libraries(L2 PRIVATE f1ap x2ap)
+add_dependencies(L2 rrc_flag m2_flag m3_flag)
+target_link_libraries(L2 PRIVATE f1ap x2ap s1ap)
 
 add_library(MAC_NR
   ${MAC_NR_SRC}
@@ -1867,8 +1843,8 @@ add_library(L2_NR
   ${GNB_APP_SRC}
   )
 
-add_dependencies(L2_NR rrc_flag nr_rrc_flag s1ap_flag)
-target_link_libraries(L2_NR PRIVATE f1ap x2ap)
+#add_dependencies(L2_NR rrc_flag nr_rrc_flag s1ap_flag)
+target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap)
 
 add_library(L2_LTE_NR
   ${L2_RRC_SRC}
@@ -1877,7 +1853,7 @@ add_library(L2_LTE_NR
   ${MCE_APP_SRC}
 )
 
-target_link_libraries(L2_LTE_NR PRIVATE f1ap)
+target_link_libraries(L2_LTE_NR PRIVATE f1ap s1ap)
 
 add_library(L2_UE
   ${L2_SRC_UE}
@@ -1893,7 +1869,7 @@ if (NOT ${NOS1})
 target_compile_definitions(L2_UE PUBLIC -DPDCP_USE_NETLINK)
 endif()
 
-add_dependencies(L2_UE rrc_flag s1ap_flag)
+add_dependencies(L2_UE rrc_flag)
 
 add_library( NR_L2_UE ${NR_L2_SRC_UE} ${MAC_NR_SRC_UE} )
 target_link_libraries(NR_L2_UE PRIVATE f1ap)
@@ -1924,7 +1900,7 @@ set (MME_APP_SRC
   ${OPENAIR3_DIR}/MME_APP/mme_config.c
 )
 add_library(MME_APP ${MME_APP_SRC})
-add_dependencies(MME_APP rrc_flag s1ap_flag m2_flag m3_flag)
+add_dependencies(MME_APP rrc_flag m2_flag m3_flag)
 
 set(SCTP_SRC
   ${OPENAIR3_DIR}/SCTP/sctp_common.c
@@ -2443,11 +2419,11 @@ add_executable(lte-softmodem
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
   )
-add_dependencies(lte-softmodem rrc_flag s1ap_flag oai_iqplayer)
+add_dependencies(lte-softmodem rrc_flag oai_iqplayer)
 
 target_link_libraries (lte-softmodem
   -Wl,--start-group
-  RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB M2AP_LIB M2AP_ENB x2ap M3AP_LIB M3AP_ENB GTPV1U f1ap SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
+  RRC_LIB NR_RRC_LIB s1ap M2AP_LIB M2AP_ENB x2ap M3AP_LIB M3AP_ENB GTPV1U f1ap SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
   PHY_COMMON PHY PHY_RU  L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${RAL_LIB} ${NAS_UE_LIB} ITTI
   -Wl,--end-group z dl)
@@ -2482,12 +2458,12 @@ add_executable(ocp-enb
   ${T_SOURCE}
   ${SHLIB_LOADER_SOURCES}
   )
-add_dependencies(ocp-enb rrc_flag s1ap_flag oai_iqplayer coding params_libconfig rfsimulator)
+add_dependencies(ocp-enb rrc_flag oai_iqplayer coding params_libconfig rfsimulator)
 
 target_link_libraries (ocp-enb
   -Wl,--start-group
 
-  RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB f1ap M2AP_LIB M2AP_ENB x2ap M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
+  RRC_LIB NR_RRC_LIB s1ap f1ap M2AP_LIB M2AP_ENB x2ap M3AP_LIB M3AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_LIB SCHED_RU_LIB
   PHY_COMMON PHY PHY_RU L2 L2_LTE NFAPI_COMMON_LIB NFAPI_LIB MISC_NFAPI_LTE_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB SIMU_COMMON
   ${RAL_LIB} ${NAS_UE_LIB} ITTI
   -Wl,--end-group z dl)
@@ -2537,14 +2513,14 @@ add_executable(lte-uesoftmodem
   ${SHLIB_LOADER_SOURCES}
   )
 
-add_dependencies(lte-uesoftmodem rrc_flag s1ap_flag)
+add_dependencies(lte-uesoftmodem rrc_flag)
 
 if (NOT ${NOS1})
 	target_compile_definitions(lte-uesoftmodem PRIVATE -DPDCP_USE_NETLINK)
 endif()
 target_link_libraries (lte-uesoftmodem
   -Wl,--start-group
-  RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB x2ap M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB
+  RRC_LIB NR_RRC_LIB s1ap x2ap M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB
   SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT MME_APP SCHED_RU_LIB SCHED_UE_LIB PHY_COMMON
   PHY_UE PHY_RU L2_UE L2_LTE SIMU_COMMON SIMU NFAPI_COMMON_LIB NFAPI_LIB NFAPI_PNF_LIB NFAPI_USER_LIB MISC_NFAPI_LTE_LIB
   ${RAL_LIB} ${NAS_UE_LIB} ITTI ${ATLAS_LIBRARIES}
@@ -2586,7 +2562,7 @@ target_link_libraries (nr-softmodem
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECU_CN SECU_OSA
   ITTI ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB
-  NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
+  NGAP_LIB NGAP_GNB s1ap L2_LTE_NR L2_NR MAC_NR_COMMON NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   x2ap f1ap M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB
   -Wl,--end-group z dl)
 
@@ -2871,7 +2847,7 @@ if (${T_TRACER})
         syncsim nr_ulsim nr_dlsim nr_dlschsim nr_pbchsim nr_pucchsim
         nr_ulschsim ldpctest polartest smallblocktest cu_test du_test
         #all "add_library" definitions
-        ITTI RRC_LIB NR_RRC_LIB S1AP_LIB S1AP_ENB x2ap M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB f1ap
+        ITTI RRC_LIB NR_RRC_LIB s1ap x2ap M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB f1ap
         params_libconfig oai_usrpdevif oai_bladerfdevif oai_lmssdrdevif oai_iqplayer
         oai_eth_transpro oai_mobipass coding HASHTABLE UTIL OMG_SUMO
         SECU_OSA SECU_CN SCHED_LIB SCHED_NR_LIB SCHED_RU_LIB SCHED_UE_LIB SCHED_NR_UE_LIB default_sched remote_sched RAL
@@ -2973,3 +2949,4 @@ include (${OPENAIR_DIR}/common/utils/telnetsrv/telnetsrv_CMakeLists.txt)
 include(${OPENAIR1_DIR}/PHY/CODING/nrLDPC_decoder/nrLDPC_tools/CMakeLists.txt)
 
 add_subdirectory(openair2)
+add_subdirectory(openair3)
diff --git a/openair3/CMakeLists.txt b/openair3/CMakeLists.txt
new file mode 100644
index 0000000000..4b487645c9
--- /dev/null
+++ b/openair3/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(S1AP)
diff --git a/openair3/S1AP/CMakeLists.txt b/openair3/S1AP/CMakeLists.txt
new file mode 100644
index 0000000000..7537bd661d
--- /dev/null
+++ b/openair3/S1AP/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(MESSAGES)
diff --git a/openair3/S1AP/MESSAGES/ASN1/R15/s1ap-15.6.0.asn1 b/openair3/S1AP/MESSAGES/ASN1/R15/s1ap-15.6.0.asn1
old mode 100755
new mode 100644
diff --git a/openair3/S1AP/MESSAGES/ASN1/R15/s1ap-15.6.0.cmake b/openair3/S1AP/MESSAGES/ASN1/R15/s1ap-15.6.0.cmake
new file mode 100644
index 0000000000..8f8758c7dc
--- /dev/null
+++ b/openair3/S1AP/MESSAGES/ASN1/R15/s1ap-15.6.0.cmake
@@ -0,0 +1,1361 @@
+set(S1AP_GRAMMAR ASN1/R15/s1ap-15.6.0.asn1)
+
+set(s1ap_source
+    ANY.c
+    asn_application.c
+    asn_bit_data.c
+    asn_codecs_prim.c
+    asn_internal.c
+    asn_random_fill.c
+    asn_SEQUENCE_OF.c
+    asn_SET_OF.c
+    ber_decoder.c
+    ber_tlv_length.c
+    ber_tlv_tag.c
+    BIT_STRING.c
+    BOOLEAN.c
+    constraints.c
+    constr_CHOICE.c
+    constr_SEQUENCE.c
+    constr_SEQUENCE_OF.c
+    constr_SET_OF.c
+    constr_TYPE.c
+    der_encoder.c
+    INTEGER.c
+    NativeEnumerated.c
+    NativeInteger.c
+    NULL.c
+    OBJECT_IDENTIFIER.c
+    OCTET_STRING.c
+    OPEN_TYPE.c
+    per_decoder.c
+    per_encoder.c
+    per_opentype.c
+    per_support.c
+    PrintableString.c
+    S1AP_ActivatedCellsList.c
+    S1AP_ActivatedCellsList-Item.c
+    S1AP_AdditionalCSFallbackIndicator.c
+    S1AP_Additional-GUTI.c
+    S1AP_AerialUEsubscriptionInformation.c
+    S1AP_AllocationAndRetentionPriority.c
+    S1AP_AreaScopeOfMDT.c
+    S1AP_AreaScopeOfQMC.c
+    S1AP_AssistanceDataForCECapableUEs.c
+    S1AP_AssistanceDataForPaging.c
+    S1AP_AssistanceDataForRecommendedCells.c
+    S1AP_Bearers-SubjectToStatusTransfer-Item.c
+    S1AP_Bearers-SubjectToStatusTransferList.c
+    S1AP_BearerType.c
+    S1AP_BitRate.c
+    S1AP_BluetoothMeasConfig.c
+    S1AP_BluetoothMeasConfigNameList.c
+    S1AP_BluetoothMeasurementConfiguration.c
+    S1AP_BluetoothName.c
+    S1AP_BPLMNs.c
+    S1AP_BroadcastCancelledAreaList.c
+    S1AP_BroadcastCompletedAreaList.c
+    S1AP_CancelledCellinEAI.c
+    S1AP_CancelledCellinEAI-Item.c
+    S1AP_CancelledCellinTAI.c
+    S1AP_CancelledCellinTAI-Item.c
+    S1AP_CandidateCellList.c
+    S1AP_CandidatePCI.c
+    S1AP_CandidatePCIList.c
+    S1AP_Cause.c
+    S1AP_CauseMisc.c
+    S1AP_CauseNas.c
+    S1AP_CauseProtocol.c
+    S1AP_CauseRadioNetwork.c
+    S1AP_CauseTransport.c
+    S1AP_Cdma2000HORequiredIndication.c
+    S1AP_Cdma2000HOStatus.c
+    S1AP_Cdma2000OneXMEID.c
+    S1AP_Cdma2000OneXMSI.c
+    S1AP_Cdma2000OneXPilot.c
+    S1AP_Cdma2000OneXRAND.c
+    S1AP_Cdma2000OneXSRVCCInfo.c
+    S1AP_Cdma2000PDU.c
+    S1AP_Cdma2000RATType.c
+    S1AP_Cdma2000SectorID.c
+    S1AP_CELevel.c
+    S1AP_CellAccessMode.c
+    S1AP_CellActivationCause.c
+    S1AP_CellActivationRequest.c
+    S1AP_CellActivationResponse.c
+    S1AP_CellBasedMDT.c
+    S1AP_CellBasedQMC.c
+    S1AP_CellID-Broadcast.c
+    S1AP_CellID-Broadcast-Item.c
+    S1AP_CellID-Cancelled.c
+    S1AP_CellID-Cancelled-Item.c
+    S1AP_CellIdentifierAndCELevelForCECapableUEs.c
+    S1AP_CellIdentity.c
+    S1AP_CellIdListforMDT.c
+    S1AP_CellIdListforQMC.c
+    S1AP_CellLoadReportingCause.c
+    S1AP_CellLoadReportingResponse.c
+    S1AP_Cell-Size.c
+    S1AP_CellStateIndication.c
+    S1AP_CellStateIndicationCause.c
+    S1AP_CellsToActivateList.c
+    S1AP_CellsToActivateList-Item.c
+    S1AP_CellTrafficTrace.c
+    S1AP_CellType.c
+    S1AP_CE-ModeBRestricted.c
+    S1AP_CE-mode-B-SupportIndicator.c
+    S1AP_CGI.c
+    S1AP_CI.c
+    S1AP_CNDomain.c
+    S1AP_CNType.c
+    S1AP_CNTypeRestrictions.c
+    S1AP_CNTypeRestrictions-Item.c
+    S1AP_CompletedCellinEAI.c
+    S1AP_CompletedCellinEAI-Item.c
+    S1AP_CompletedCellinTAI.c
+    S1AP_CompletedCellinTAI-Item.c
+    S1AP_CompositeAvailableCapacityGroup.c
+    S1AP_ConcurrentWarningMessageIndicator.c
+    S1AP_ConnectedengNBItem.c
+    S1AP_ConnectedengNBList.c
+    S1AP_ConnectionEstablishmentIndication.c
+    S1AP_Correlation-ID.c
+    S1AP_COUNTvalue.c
+    S1AP_COUNTValueExtended.c
+    S1AP_COUNTvaluePDCP-SNlength18.c
+    S1AP_Coverage-Level.c
+    S1AP_Criticality.c
+    S1AP_CriticalityDiagnostics.c
+    S1AP_CriticalityDiagnostics-IE-Item.c
+    S1AP_CriticalityDiagnostics-IE-List.c
+    S1AP_CSFallbackIndicator.c
+    S1AP_CSG-Id.c
+    S1AP_CSG-IdList.c
+    S1AP_CSG-IdList-Item.c
+    S1AP_CSGMembershipInfo.c
+    S1AP_CSGMembershipStatus.c
+    S1AP_DataCodingScheme.c
+    S1AP_Data-Forwarding-Not-Possible.c
+    S1AP_DCN-ID.c
+    S1AP_DeactivateTrace.c
+    S1AP_Direct-Forwarding-Path-Availability.c
+    S1AP_DL-CP-SecurityInformation.c
+    S1AP_DL-Forwarding.c
+    S1AP_DL-NAS-MAC.c
+    S1AP_DLNASPDUDeliveryAckRequest.c
+    S1AP_DownlinkNASTransport.c
+    S1AP_DownlinkNonUEAssociatedLPPaTransport.c
+    S1AP_DownlinkS1cdma2000tunnelling.c
+    S1AP_DownlinkUEAssociatedLPPaTransport.c
+    S1AP_EARFCN.c
+    S1AP_ECGI-List.c
+    S1AP_ECGIList.c
+    S1AP_ECGIListForRestart.c
+    S1AP_EDT-Session.c
+    S1AP_EHRPDCapacityValue.c
+    S1AP_EHRPDCompositeAvailableCapacity.c
+    S1AP_EHRPDMultiSectorLoadReportingResponseItem.c
+    S1AP_EHRPDSectorCapacityClassValue.c
+    S1AP_EHRPD-Sector-ID.c
+    S1AP_EHRPDSectorLoadReportingResponse.c
+    S1AP_EmergencyAreaID-Broadcast.c
+    S1AP_EmergencyAreaID-Broadcast-Item.c
+    S1AP_EmergencyAreaID.c
+    S1AP_EmergencyAreaID-Cancelled.c
+    S1AP_EmergencyAreaID-Cancelled-Item.c
+    S1AP_EmergencyAreaIDList.c
+    S1AP_EmergencyAreaIDListForRestart.c
+    S1AP_ENBConfigurationTransfer.c
+    S1AP_ENBConfigurationUpdateAcknowledge.c
+    S1AP_ENBConfigurationUpdate.c
+    S1AP_ENBConfigurationUpdateFailure.c
+    S1AP_ENBCPRelocationIndication.c
+    S1AP_ENBDirectInformationTransfer.c
+    S1AP_ENB-ID.c
+    S1AP_ENBIndirectX2TransportLayerAddresses.c
+    S1AP_ENBname.c
+    S1AP_ENBStatusTransfer.c
+    S1AP_ENB-StatusTransfer-TransparentContainer.c
+    S1AP_ENB-UE-S1AP-ID.c
+    S1AP_ENBX2ExtTLA.c
+    S1AP_ENBX2ExtTLAs.c
+    S1AP_ENBX2GTPTLAs.c
+    S1AP_ENBX2TLAs.c
+    S1AP_EncryptionAlgorithms.c
+    S1AP_EN-DCSONConfigurationTransfer.c
+    S1AP_EN-DCSONeNBIdentification.c
+    S1AP_EN-DCSONengNBIdentification.c
+    S1AP_EN-DCSONTransferType.c
+    S1AP_EN-DCTransferTypeReply.c
+    S1AP_EN-DCTransferTypeRequest.c
+    S1AP_EndIndication.c
+    S1AP_En-gNB-ID.c
+    S1AP_EnhancedCoverageRestricted.c
+    S1AP_EPLMNs.c
+    S1AP_E-RABAdmittedItem.c
+    S1AP_E-RABAdmittedList.c
+    S1AP_E-RABDataForwardingItem.c
+    S1AP_E-RABFailedToResumeItemResumeReq.c
+    S1AP_E-RABFailedToResumeItemResumeRes.c
+    S1AP_E-RABFailedToResumeListResumeReq.c
+    S1AP_E-RABFailedToResumeListResumeRes.c
+    S1AP_E-RABFailedToSetupItemHOReqAck.c
+    S1AP_E-RABFailedtoSetupListHOReqAck.c
+    S1AP_E-RAB-ID.c
+    S1AP_E-RAB-IE-ContainerList.c
+    S1AP_E-RAB-IE-ContainerPairList.c
+    S1AP_E-RABInformationList.c
+    S1AP_E-RABInformationListItem.c
+    S1AP_E-RABItem.c
+    S1AP_E-RABLevelQoSParameters.c
+    S1AP_E-RABList.c
+    S1AP_E-RABModificationConfirm.c
+    S1AP_E-RABModificationIndication.c
+    S1AP_E-RABModifyItemBearerModConf.c
+    S1AP_E-RABModifyItemBearerModRes.c
+    S1AP_E-RABModifyListBearerModConf.c
+    S1AP_E-RABModifyListBearerModRes.c
+    S1AP_E-RABModifyRequest.c
+    S1AP_E-RABModifyResponse.c
+    S1AP_E-RABNotToBeModifiedItemBearerModInd.c
+    S1AP_E-RABNotToBeModifiedListBearerModInd.c
+    S1AP_E-RABReleaseCommand.c
+    S1AP_E-RABReleaseIndication.c
+    S1AP_E-RABReleaseItemBearerRelComp.c
+    S1AP_E-RABReleaseListBearerRelComp.c
+    S1AP_E-RABReleaseResponse.c
+    S1AP_E-RABSetupItemBearerSURes.c
+    S1AP_E-RABSetupItemCtxtSURes.c
+    S1AP_E-RABSetupListBearerSURes.c
+    S1AP_E-RABSetupListCtxtSURes.c
+    S1AP_E-RABSetupRequest.c
+    S1AP_E-RABSetupResponse.c
+    S1AP_E-RABSubjecttoDataForwardingList.c
+    S1AP_E-RABToBeModifiedItemBearerModInd.c
+    S1AP_E-RABToBeModifiedItemBearerModReq.c
+    S1AP_E-RABToBeModifiedListBearerModInd.c
+    S1AP_E-RABToBeModifiedListBearerModReq.c
+    S1AP_E-RABToBeSetupItemBearerSUReq.c
+    S1AP_E-RABToBeSetupItemCtxtSUReq.c
+    S1AP_E-RABToBeSetupItemHOReq.c
+    S1AP_E-RABToBeSetupListBearerSUReq.c
+    S1AP_E-RABToBeSetupListCtxtSUReq.c
+    S1AP_E-RABToBeSetupListHOReq.c
+    S1AP_E-RABToBeSwitchedDLItem.c
+    S1AP_E-RABToBeSwitchedDLList.c
+    S1AP_E-RABToBeSwitchedULItem.c
+    S1AP_E-RABToBeSwitchedULList.c
+    S1AP_E-RABUsageReportItem.c
+    S1AP_E-RABUsageReportList.c
+    S1AP_ErrorIndication.c
+    S1AP_EUTRANcellLoadReportingResponse.c
+    S1AP_EUTRAN-CGI.c
+    S1AP_EUTRANResponse.c
+    S1AP_EUTRANRoundTripDelayEstimationInfo.c
+    S1AP_E-UTRAN-Trace-ID.c
+    S1AP_EventTriggeredCellLoadReportingRequest.c
+    S1AP_EventTriggeredCellLoadReportingResponse.c
+    S1AP_EventType.c
+    S1AP_ExpectedActivityPeriod.c
+    S1AP_ExpectedHOInterval.c
+    S1AP_ExpectedIdlePeriod.c
+    S1AP_ExpectedUEActivityBehaviour.c
+    S1AP_ExpectedUEBehaviour.c
+    S1AP_ExtendedBitRate.c
+    S1AP_ExtendedRepetitionPeriod.c
+    S1AP_ExtendedRNC-ID.c
+    S1AP_Extended-UEIdentityIndexValue.c
+    S1AP_FailureEventReport.c
+    S1AP_FailureEventReportingCause.c
+    S1AP_FiveGSTAC.c
+    S1AP_FiveGSTAI.c
+    S1AP_ForbiddenInterRATs.c
+    S1AP_ForbiddenLACs.c
+    S1AP_ForbiddenLAs.c
+    S1AP_ForbiddenLAs-Item.c
+    S1AP_ForbiddenTACs.c
+    S1AP_ForbiddenTAs.c
+    S1AP_ForbiddenTAs-Item.c
+    S1AP_GBR-QosInformation.c
+    S1AP_GERAN-Cell-ID.c
+    S1AP_Global-ENB-ID.c
+    S1AP_Global-en-gNB-ID.c
+    S1AP_Global-GNB-ID.c
+    S1AP_Global-RAN-NODE-ID.c
+    S1AP_GNB.c
+    S1AP_GNB-ID.c
+    S1AP_GNB-Identity.c
+    S1AP_GTP-TEID.c
+    S1AP_GUMMEI.c
+    S1AP_GUMMEIList.c
+    S1AP_GUMMEIType.c
+    S1AP_GWContextReleaseIndication.c
+    S1AP_HandoverCancelAcknowledge.c
+    S1AP_HandoverCancel.c
+    S1AP_HandoverCommand.c
+    S1AP_HandoverFailure.c
+    S1AP_HandoverFlag.c
+    S1AP_HandoverNotify.c
+    S1AP_HandoverPreparationFailure.c
+    S1AP_HandoverRequestAcknowledge.c
+    S1AP_HandoverRequest.c
+    S1AP_HandoverRequired.c
+    S1AP_HandoverRestrictionList.c
+    S1AP_HandoverType.c
+    S1AP_HFN.c
+    S1AP_HFNforPDCP-SNlength18.c
+    S1AP_HFNModified.c
+    S1AP_HOReport.c
+    S1AP_HOReportingCause.c
+    S1AP_HoReportType.c
+    S1AP_HoType.c
+    S1AP_ImmediateMDT.c
+    S1AP_IMSI.c
+    S1AP_InformationOnRecommendedCellsAndENBsForPaging.c
+    S1AP_InitialContextSetupFailure.c
+    S1AP_InitialContextSetupRequest.c
+    S1AP_InitialContextSetupResponse.c
+    S1AP_InitialUEMessage.c
+    S1AP_InitiatingMessage.c
+    S1AP_IntegrityProtectionAlgorithms.c
+    S1AP_IntendedNumberOfPagingAttempts.c
+    S1AP_InterfacesToTrace.c
+    S1AP_Inter-SystemInformationTransferType.c
+    S1AP_IRAT-Cell-ID.c
+    S1AP_KillAllWarningMessages.c
+    S1AP_KillRequest.c
+    S1AP_KillResponse.c
+    S1AP_L3-Information.c
+    S1AP_LAC.c
+    S1AP_LAI.c
+    S1AP_LastVisitedCell-Item.c
+    S1AP_LastVisitedEUTRANCellInformation.c
+    S1AP_LastVisitedGERANCellInformation.c
+    S1AP_LastVisitedNGRANCellInformation.c
+    S1AP_LastVisitedUTRANCellInformation.c
+    S1AP_LHN-ID.c
+    S1AP_Links-to-log.c
+    S1AP_ListeningSubframePattern.c
+    S1AP_LocationReport.c
+    S1AP_LocationReportingControl.c
+    S1AP_LocationReportingFailureIndication.c
+    S1AP_LoggedMBSFNMDT.c
+    S1AP_LoggedMDT.c
+    S1AP_LoggingDuration.c
+    S1AP_LoggingInterval.c
+    S1AP_LPPa-PDU.c
+    S1AP_LTE-M-Indication.c
+    S1AP_M1PeriodicReporting.c
+    S1AP_M1ReportingTrigger.c
+    S1AP_M1ThresholdEventA2.c
+    S1AP_M3Configuration.c
+    S1AP_M3period.c
+    S1AP_M4Configuration.c
+    S1AP_M4period.c
+    S1AP_M5Configuration.c
+    S1AP_M5period.c
+    S1AP_M6Configuration.c
+    S1AP_M6delay-threshold.c
+    S1AP_M6report-Interval.c
+    S1AP_M7Configuration.c
+    S1AP_M7period.c
+    S1AP_ManagementBasedMDTAllowed.c
+    S1AP_Masked-IMEISV.c
+    S1AP_MBSFN-ResultToLog.c
+    S1AP_MBSFN-ResultToLogInfo.c
+    S1AP_MDT-Activation.c
+    S1AP_MDT-Configuration.c
+    S1AP_MDT-Location-Info.c
+    S1AP_MDTMode.c
+    S1AP_MDTMode-Extension.c
+    S1AP_MDTPLMNList.c
+    S1AP_MeasurementsToActivate.c
+    S1AP_MeasurementThresholdA2.c
+    S1AP_MessageIdentifier.c
+    S1AP_MME-Code.c
+    S1AP_MMEConfigurationTransfer.c
+    S1AP_MMEConfigurationUpdateAcknowledge.c
+    S1AP_MMEConfigurationUpdate.c
+    S1AP_MMEConfigurationUpdateFailure.c
+    S1AP_MMECPRelocationIndication.c
+    S1AP_MMEDirectInformationTransfer.c
+    S1AP_MME-Group-ID.c
+    S1AP_MMEname.c
+    S1AP_MMEPagingTarget.c
+    S1AP_MMERelaySupportIndicator.c
+    S1AP_MMEStatusTransfer.c
+    S1AP_MME-UE-S1AP-ID.c
+    S1AP_MSClassmark2.c
+    S1AP_MSClassmark3.c
+    S1AP_M-TMSI.c
+    S1AP_MultiCellLoadReportingRequest.c
+    S1AP_MultiCellLoadReportingResponse.c
+    S1AP_MultiCellLoadReportingResponse-Item.c
+    S1AP_MutingAvailabilityIndication.c
+    S1AP_MutingPatternInformation.c
+    S1AP_NASDeliveryIndication.c
+    S1AP_NASNonDeliveryIndication.c
+    S1AP_NAS-PDU.c
+    S1AP_NASSecurityParametersfromE-UTRAN.c
+    S1AP_NASSecurityParameterstoE-UTRAN.c
+    S1AP_NB-IoT-DefaultPagingDRX.c
+    S1AP_NB-IoT-Paging-eDRX-Cycle.c
+    S1AP_NB-IoT-Paging-eDRXInformation.c
+    S1AP_NB-IoT-PagingTimeWindow.c
+    S1AP_NB-IoT-UEIdentityIndexValue.c
+    S1AP_NextPagingAreaScope.c
+    S1AP_NG-eNB.c
+    S1AP_NotificationCellList.c
+    S1AP_NotificationCellList-Item.c
+    S1AP_NotifyFlag.c
+    S1AP_NRCellIdentity.c
+    S1AP_NR-CGI.c
+    S1AP_NRencryptionAlgorithms.c
+    S1AP_NRintegrityProtectionAlgorithms.c
+    S1AP_NRrestrictionin5GS.c
+    S1AP_NRrestrictioninEPSasSecondaryRAT.c
+    S1AP_NRUESecurityCapabilities.c
+    S1AP_NumberofBroadcastRequest.c
+    S1AP_NumberOfBroadcasts.c
+    S1AP_NumberOfMeasurementReportingLevels.c
+    S1AP_OldBSS-ToNewBSS-Information.c
+    S1AP_OverloadAction.c
+    S1AP_OverloadFlag.c
+    S1AP_OverloadResponse.c
+    S1AP_OverloadStart.c
+    S1AP_OverloadStop.c
+    S1AP_Packet-LossRate.c
+    S1AP_PagingAttemptCount.c
+    S1AP_PagingAttemptInformation.c
+    S1AP_Paging.c
+    S1AP_PagingDRX.c
+    S1AP_Paging-eDRX-Cycle.c
+    S1AP_Paging-eDRXInformation.c
+    S1AP_PagingPriority.c
+    S1AP_PagingTimeWindow.c
+    S1AP_PathSwitchRequestAcknowledge.c
+    S1AP_PathSwitchRequest.c
+    S1AP_PathSwitchRequestFailure.c
+    S1AP_PDCP-SN.c
+    S1AP_PDCP-SNExtended.c
+    S1AP_PDCP-SNlength18.c
+    S1AP_PedestrianUE.c
+    S1AP_PendingDataIndication.c
+    S1AP_PLMNAreaBasedQMC.c
+    S1AP_PLMNidentity.c
+    S1AP_PLMNListforQMC.c
+    S1AP_Port-Number.c
+    S1AP_Pre-emptionCapability.c
+    S1AP_Pre-emptionVulnerability.c
+    S1AP_Presence.c
+    S1AP_PriorityLevel.c
+    S1AP_PrivacyIndicator.c
+    S1AP_PrivateIE-Container.c
+    S1AP_PrivateIE-Field.c
+    S1AP_PrivateIE-ID.c
+    S1AP_PrivateMessage.c
+    S1AP_ProcedureCode.c
+    S1AP_ProSeAuthorized.c
+    S1AP_ProSeDirectCommunication.c
+    S1AP_ProSeDirectDiscovery.c
+    S1AP_ProSeUEtoNetworkRelaying.c
+    S1AP_ProtocolError-IE-ContainerList.c
+    S1AP_ProtocolExtensionContainer.c
+    S1AP_ProtocolExtensionField.c
+    S1AP_ProtocolExtensionID.c
+    S1AP_ProtocolIE-Container.c
+    S1AP_ProtocolIE-ContainerList.c
+    S1AP_ProtocolIE-ContainerPair.c
+    S1AP_ProtocolIE-ContainerPairList.c
+    S1AP_ProtocolIE-Field.c
+    S1AP_ProtocolIE-FieldPair.c
+    S1AP_ProtocolIE-ID.c
+    S1AP_ProtocolIE-SingleContainer.c
+    S1AP_PSCellInformation.c
+    S1AP_PS-ServiceNotAvailable.c
+    S1AP_PWSfailedECGIList.c
+    S1AP_PWSFailureIndication.c
+    S1AP_PWSRestartIndication.c
+    S1AP_QCI.c
+    S1AP_RAC.c
+    S1AP_RAT-Type.c
+    S1AP_ReceiveStatusofULPDCPSDUs.c
+    S1AP_ReceiveStatusOfULPDCPSDUsExtended.c
+    S1AP_ReceiveStatusOfULPDCPSDUsPDCP-SNlength18.c
+    S1AP_RecommendedCellItem.c
+    S1AP_RecommendedCellList.c
+    S1AP_RecommendedCellsForPaging.c
+    S1AP_RecommendedENBItem.c
+    S1AP_RecommendedENBList.c
+    S1AP_RecommendedENBsForPaging.c
+    S1AP_RelativeMMECapacity.c
+    S1AP_RelayNode-Indicator.c
+    S1AP_RepetitionPeriod.c
+    S1AP_ReportAmountMDT.c
+    S1AP_ReportArea.c
+    S1AP_ReportingCellList.c
+    S1AP_ReportingCellList-Item.c
+    S1AP_ReportIntervalMDT.c
+    S1AP_RequestedCellList.c
+    S1AP_RequestType.c
+    S1AP_RerouteNASRequest.c
+    S1AP_ResetAcknowledge.c
+    S1AP_ResetAll.c
+    S1AP_Reset.c
+    S1AP_ResetType.c
+    S1AP_RetrieveUEInformation.c
+    S1AP_RIMInformation.c
+    S1AP_RIMRoutingAddress.c
+    S1AP_RIMTransfer.c
+    S1AP_RLFReportInformation.c
+    S1AP_RNC-ID.c
+    S1AP_Routing-ID.c
+    S1AP_RRC-Container.c
+    S1AP_RRC-Establishment-Cause.c
+    S1AP_S1AP-IEs_MobilityInformation.c
+    S1AP_S1AP-PDU.c
+    S1AP_S1SetupFailure.c
+    S1AP_S1SetupRequest.c
+    S1AP_S1SetupResponse.c
+    S1AP_ScheduledCommunicationTime.c
+    S1AP_SecondaryRATDataUsageReport.c
+    S1AP_SecondaryRATDataUsageReportItem.c
+    S1AP_SecondaryRATDataUsageReportList.c
+    S1AP_SecondaryRATDataUsageRequest.c
+    S1AP_SecondaryRATType.c
+    S1AP_SecurityContext.c
+    S1AP_SecurityKey.c
+    S1AP_SerialNumber.c
+    S1AP_ServedDCNs.c
+    S1AP_ServedDCNsItem.c
+    S1AP_ServedGroupIDs.c
+    S1AP_ServedGUMMEIs.c
+    S1AP_ServedGUMMEIsItem.c
+    S1AP_ServedMMECs.c
+    S1AP_ServedPLMNs.c
+    S1AP_ServiceType.c
+    S1AP_SONConfigurationTransfer.c
+    S1AP_SONInformation.c
+    S1AP_SONInformation-Extension.c
+    S1AP_SONInformationReply.c
+    S1AP_SONInformationReport.c
+    S1AP_SONInformationRequest.c
+    S1AP_SONtransferApplicationIdentity.c
+    S1AP_SONtransferCause.c
+    S1AP_SonTransfer-IEs_MobilityInformation.c
+    S1AP_SONtransferRequestContainer.c
+    S1AP_SONtransferResponseContainer.c
+    S1AP_SourceBSS-ToTargetBSS-TransparentContainer.c
+    S1AP_SourceeNB-ID.c
+    S1AP_SourceeNB-ToTargeteNB-TransparentContainer.c
+    S1AP_SourceNgRanNode-ToTargetNgRanNode-TransparentContainer.c
+    S1AP_SourceOfUEActivityBehaviourInformation.c
+    S1AP_SourceRNC-ToTargetRNC-TransparentContainer.c
+    S1AP_Source-ToTarget-TransparentContainer.c
+    S1AP_SRVCCHOIndication.c
+    S1AP_SRVCCOperationNotPossible.c
+    S1AP_SRVCCOperationPossible.c
+    S1AP_S-TMSI.c
+    S1AP_StratumLevel.c
+    S1AP_SubscriberProfileIDforRFP.c
+    S1AP_Subscription-Based-UE-DifferentiationInfo.c
+    S1AP_SuccessfulOutcome.c
+    S1AP_SupportedTAs.c
+    S1AP_SupportedTAs-Item.c
+    S1AP_SynchronisationInformation.c
+    S1AP_SynchronisationStatus.c
+    S1AP_TABasedMDT.c
+    S1AP_TABasedQMC.c
+    S1AP_TAC.c
+    S1AP_TAIBasedMDT.c
+    S1AP_TAIBasedQMC.c
+    S1AP_TAI-Broadcast.c
+    S1AP_TAI-Broadcast-Item.c
+    S1AP_TAI.c
+    S1AP_TAI-Cancelled.c
+    S1AP_TAI-Cancelled-Item.c
+    S1AP_TAIItem.c
+    S1AP_TAIList.c
+    S1AP_TAIListforMDT.c
+    S1AP_TAIListforQMC.c
+    S1AP_TAIListForRestart.c
+    S1AP_TAIListforWarning.c
+    S1AP_TAListforMDT.c
+    S1AP_TAListforQMC.c
+    S1AP_TargetBSS-ToSourceBSS-TransparentContainer.c
+    S1AP_TargeteNB-ID.c
+    S1AP_TargeteNB-ToSourceeNB-TransparentContainer.c
+    S1AP_TargetID.c
+    S1AP_TargetNgRanNode-ID.c
+    S1AP_TargetNgRanNode-ToSourceNgRanNode-TransparentContainer.c
+    S1AP_TargetRNC-ID.c
+    S1AP_TargetRNC-ToSourceRNC-TransparentContainer.c
+    S1AP_Target-ToSource-TransparentContainer.c
+    S1AP_TBCD-STRING.c
+    S1AP_Threshold-RSRP.c
+    S1AP_Threshold-RSRQ.c
+    S1AP_TimeSynchronisationInfo.c
+    S1AP_TimeToWait.c
+    S1AP_Time-UE-StayedInCell.c
+    S1AP_Time-UE-StayedInCell-EnhancedGranularity.c
+    S1AP_TooEarlyInterRATHOReportReportFromEUTRAN.c
+    S1AP_TraceActivation.c
+    S1AP_TraceDepth.c
+    S1AP_TraceFailureIndication.c
+    S1AP_TraceStart.c
+    S1AP_TrafficLoadReductionIndication.c
+    S1AP_TransportInformation.c
+    S1AP_TransportLayerAddress.c
+    S1AP_TriggeringMessage.c
+    S1AP_TunnelInformation.c
+    S1AP_TypeOfError.c
+    S1AP_UEAggregateMaximumBitrate.c
+    S1AP_UEAppLayerMeasConfig.c
+    S1AP_UE-Application-Layer-Measurement-Capability.c
+    S1AP_UE-associatedLogicalS1-ConnectionItem.c
+    S1AP_UE-associatedLogicalS1-ConnectionListResAck.c
+    S1AP_UE-associatedLogicalS1-ConnectionListRes.c
+    S1AP_UECapabilityInfoIndication.c
+    S1AP_UECapabilityInfoRequest.c
+    S1AP_UEContextModificationConfirm.c
+    S1AP_UEContextModificationFailure.c
+    S1AP_UEContextModificationIndication.c
+    S1AP_UEContextModificationRequest.c
+    S1AP_UEContextModificationResponse.c
+    S1AP_UEContextReleaseCommand.c
+    S1AP_UEContextReleaseComplete.c
+    S1AP_UEContextReleaseRequest.c
+    S1AP_UEContextResumeFailure.c
+    S1AP_UEContextResumeRequest.c
+    S1AP_UEContextResumeResponse.c
+    S1AP_UEContextSuspendRequest.c
+    S1AP_UEContextSuspendResponse.c
+    S1AP_UE-HistoryInformation.c
+    S1AP_UE-HistoryInformationFromTheUE.c
+    S1AP_UEIdentityIndexValue.c
+    S1AP_UEInformationTransfer.c
+    S1AP_UEPagingID.c
+    S1AP_UERadioCapability.c
+    S1AP_UERadioCapabilityForPaging.c
+    S1AP_UERadioCapabilityMatchRequest.c
+    S1AP_UERadioCapabilityMatchResponse.c
+    S1AP_UE-RetentionInformation.c
+    S1AP_UE-RLF-Report-Container.c
+    S1AP_UE-RLF-Report-Container-for-extended-bands.c
+    S1AP_UE-S1AP-ID-pair.c
+    S1AP_UE-S1AP-IDs.c
+    S1AP_UESecurityCapabilities.c
+    S1AP_UESidelinkAggregateMaximumBitrate.c
+    S1AP_UE-Usage-Type.c
+    S1AP_UEUserPlaneCIoTSupportIndicator.c
+    S1AP_UL-CP-SecurityInformation.c
+    S1AP_UL-NAS-Count.c
+    S1AP_UL-NAS-MAC.c
+    S1AP_UnlicensedSpectrumRestriction.c
+    S1AP_UnsuccessfulOutcome.c
+    S1AP_UplinkNASTransport.c
+    S1AP_UplinkNonUEAssociatedLPPaTransport.c
+    S1AP_UplinkS1cdma2000tunnelling.c
+    S1AP_UplinkUEAssociatedLPPaTransport.c
+    S1AP_UserLocationInformation.c
+    S1AP_V2XServicesAuthorized.c
+    S1AP_VehicleUE.c
+    S1AP_VoiceSupportMatchIndicator.c
+    S1AP_WarningAreaCoordinates.c
+    S1AP_WarningAreaList.c
+    S1AP_WarningMessageContents.c
+    S1AP_WarningSecurityInfo.c
+    S1AP_WarningType.c
+    S1AP_WLANMeasConfig.c
+    S1AP_WLANMeasConfigNameList.c
+    S1AP_WLANMeasurementConfiguration.c
+    S1AP_WLANName.c
+    S1AP_WriteReplaceWarningRequest.c
+    S1AP_WriteReplaceWarningResponse.c
+    S1AP_X2TNLConfigurationInfo.c
+    xer_decoder.c
+    xer_encoder.c
+    xer_support.c
+)
+
+set(s1ap_headers
+    ANY.h
+    asn_application.h
+    asn_bit_data.h
+    asn_codecs.h
+    asn_codecs_prim.h
+    asn_internal.h
+    asn_ioc.h
+    asn_random_fill.h
+    asn_SEQUENCE_OF.h
+    asn_SET_OF.h
+    asn_system.h
+    ber_decoder.h
+    ber_tlv_length.h
+    ber_tlv_tag.h
+    BIT_STRING.h
+    BOOLEAN.h
+    constraints.h
+    constr_CHOICE.h
+    constr_SEQUENCE.h
+    constr_SEQUENCE_OF.h
+    constr_SET_OF.h
+    constr_TYPE.h
+    der_encoder.h
+    INTEGER.h
+    NativeEnumerated.h
+    NativeInteger.h
+    NULL.h
+    OBJECT_IDENTIFIER.h
+    OCTET_STRING.h
+    OPEN_TYPE.h
+    per_decoder.h
+    per_encoder.h
+    per_opentype.h
+    per_support.h
+    PrintableString.h
+    S1AP_ActivatedCellsList.h
+    S1AP_ActivatedCellsList-Item.h
+    S1AP_AdditionalCSFallbackIndicator.h
+    S1AP_Additional-GUTI.h
+    S1AP_AerialUEsubscriptionInformation.h
+    S1AP_AllocationAndRetentionPriority.h
+    S1AP_AreaScopeOfMDT.h
+    S1AP_AreaScopeOfQMC.h
+    S1AP_asn_constant.h
+    S1AP_AssistanceDataForCECapableUEs.h
+    S1AP_AssistanceDataForPaging.h
+    S1AP_AssistanceDataForRecommendedCells.h
+    S1AP_Bearers-SubjectToStatusTransfer-Item.h
+    S1AP_Bearers-SubjectToStatusTransferList.h
+    S1AP_BearerType.h
+    S1AP_BitRate.h
+    S1AP_BluetoothMeasConfig.h
+    S1AP_BluetoothMeasConfigNameList.h
+    S1AP_BluetoothMeasurementConfiguration.h
+    S1AP_BluetoothName.h
+    S1AP_BPLMNs.h
+    S1AP_BroadcastCancelledAreaList.h
+    S1AP_BroadcastCompletedAreaList.h
+    S1AP_CancelledCellinEAI.h
+    S1AP_CancelledCellinEAI-Item.h
+    S1AP_CancelledCellinTAI.h
+    S1AP_CancelledCellinTAI-Item.h
+    S1AP_CandidateCellList.h
+    S1AP_CandidatePCI.h
+    S1AP_CandidatePCIList.h
+    S1AP_Cause.h
+    S1AP_CauseMisc.h
+    S1AP_CauseNas.h
+    S1AP_CauseProtocol.h
+    S1AP_CauseRadioNetwork.h
+    S1AP_CauseTransport.h
+    S1AP_Cdma2000HORequiredIndication.h
+    S1AP_Cdma2000HOStatus.h
+    S1AP_Cdma2000OneXMEID.h
+    S1AP_Cdma2000OneXMSI.h
+    S1AP_Cdma2000OneXPilot.h
+    S1AP_Cdma2000OneXRAND.h
+    S1AP_Cdma2000OneXSRVCCInfo.h
+    S1AP_Cdma2000PDU.h
+    S1AP_Cdma2000RATType.h
+    S1AP_Cdma2000SectorID.h
+    S1AP_CELevel.h
+    S1AP_CellAccessMode.h
+    S1AP_CellActivationCause.h
+    S1AP_CellActivationRequest.h
+    S1AP_CellActivationResponse.h
+    S1AP_CellBasedMDT.h
+    S1AP_CellBasedQMC.h
+    S1AP_CellID-Broadcast.h
+    S1AP_CellID-Broadcast-Item.h
+    S1AP_CellID-Cancelled.h
+    S1AP_CellID-Cancelled-Item.h
+    S1AP_CellIdentifierAndCELevelForCECapableUEs.h
+    S1AP_CellIdentity.h
+    S1AP_CellIdListforMDT.h
+    S1AP_CellIdListforQMC.h
+    S1AP_CellLoadReportingCause.h
+    S1AP_CellLoadReportingResponse.h
+    S1AP_Cell-Size.h
+    S1AP_CellStateIndicationCause.h
+    S1AP_CellStateIndication.h
+    S1AP_CellsToActivateList.h
+    S1AP_CellsToActivateList-Item.h
+    S1AP_CellTrafficTrace.h
+    S1AP_CellType.h
+    S1AP_CE-ModeBRestricted.h
+    S1AP_CE-mode-B-SupportIndicator.h
+    S1AP_CGI.h
+    S1AP_CI.h
+    S1AP_CNDomain.h
+    S1AP_CNType.h
+    S1AP_CNTypeRestrictions.h
+    S1AP_CNTypeRestrictions-Item.h
+    S1AP_CompletedCellinEAI.h
+    S1AP_CompletedCellinEAI-Item.h
+    S1AP_CompletedCellinTAI.h
+    S1AP_CompletedCellinTAI-Item.h
+    S1AP_CompositeAvailableCapacityGroup.h
+    S1AP_ConcurrentWarningMessageIndicator.h
+    S1AP_ConnectedengNBItem.h
+    S1AP_ConnectedengNBList.h
+    S1AP_ConnectionEstablishmentIndication.h
+    S1AP_Correlation-ID.h
+    S1AP_COUNTValueExtended.h
+    S1AP_COUNTvalue.h
+    S1AP_COUNTvaluePDCP-SNlength18.h
+    S1AP_Coverage-Level.h
+    S1AP_CriticalityDiagnostics.h
+    S1AP_CriticalityDiagnostics-IE-Item.h
+    S1AP_CriticalityDiagnostics-IE-List.h
+    S1AP_Criticality.h
+    S1AP_CSFallbackIndicator.h
+    S1AP_CSG-Id.h
+    S1AP_CSG-IdList.h
+    S1AP_CSG-IdList-Item.h
+    S1AP_CSGMembershipInfo.h
+    S1AP_CSGMembershipStatus.h
+    S1AP_DataCodingScheme.h
+    S1AP_Data-Forwarding-Not-Possible.h
+    S1AP_DCN-ID.h
+    S1AP_DeactivateTrace.h
+    S1AP_Direct-Forwarding-Path-Availability.h
+    S1AP_DL-CP-SecurityInformation.h
+    S1AP_DL-Forwarding.h
+    S1AP_DL-NAS-MAC.h
+    S1AP_DLNASPDUDeliveryAckRequest.h
+    S1AP_DownlinkNASTransport.h
+    S1AP_DownlinkNonUEAssociatedLPPaTransport.h
+    S1AP_DownlinkS1cdma2000tunnelling.h
+    S1AP_DownlinkUEAssociatedLPPaTransport.h
+    S1AP_EARFCN.h
+    S1AP_ECGIListForRestart.h
+    S1AP_ECGI-List.h
+    S1AP_ECGIList.h
+    S1AP_EDT-Session.h
+    S1AP_EHRPDCapacityValue.h
+    S1AP_EHRPDCompositeAvailableCapacity.h
+    S1AP_EHRPDMultiSectorLoadReportingResponseItem.h
+    S1AP_EHRPDSectorCapacityClassValue.h
+    S1AP_EHRPD-Sector-ID.h
+    S1AP_EHRPDSectorLoadReportingResponse.h
+    S1AP_EmergencyAreaID-Broadcast.h
+    S1AP_EmergencyAreaID-Broadcast-Item.h
+    S1AP_EmergencyAreaID-Cancelled.h
+    S1AP_EmergencyAreaID-Cancelled-Item.h
+    S1AP_EmergencyAreaID.h
+    S1AP_EmergencyAreaIDListForRestart.h
+    S1AP_EmergencyAreaIDList.h
+    S1AP_ENBConfigurationTransfer.h
+    S1AP_ENBConfigurationUpdateAcknowledge.h
+    S1AP_ENBConfigurationUpdateFailure.h
+    S1AP_ENBConfigurationUpdate.h
+    S1AP_ENBCPRelocationIndication.h
+    S1AP_ENBDirectInformationTransfer.h
+    S1AP_ENB-ID.h
+    S1AP_ENBIndirectX2TransportLayerAddresses.h
+    S1AP_ENBname.h
+    S1AP_ENBStatusTransfer.h
+    S1AP_ENB-StatusTransfer-TransparentContainer.h
+    S1AP_ENB-UE-S1AP-ID.h
+    S1AP_ENBX2ExtTLA.h
+    S1AP_ENBX2ExtTLAs.h
+    S1AP_ENBX2GTPTLAs.h
+    S1AP_ENBX2TLAs.h
+    S1AP_EncryptionAlgorithms.h
+    S1AP_EN-DCSONConfigurationTransfer.h
+    S1AP_EN-DCSONeNBIdentification.h
+    S1AP_EN-DCSONengNBIdentification.h
+    S1AP_EN-DCSONTransferType.h
+    S1AP_EN-DCTransferTypeReply.h
+    S1AP_EN-DCTransferTypeRequest.h
+    S1AP_EndIndication.h
+    S1AP_En-gNB-ID.h
+    S1AP_EnhancedCoverageRestricted.h
+    S1AP_EPLMNs.h
+    S1AP_E-RABAdmittedItem.h
+    S1AP_E-RABAdmittedList.h
+    S1AP_E-RABDataForwardingItem.h
+    S1AP_E-RABFailedToResumeItemResumeReq.h
+    S1AP_E-RABFailedToResumeItemResumeRes.h
+    S1AP_E-RABFailedToResumeListResumeReq.h
+    S1AP_E-RABFailedToResumeListResumeRes.h
+    S1AP_E-RABFailedToSetupItemHOReqAck.h
+    S1AP_E-RABFailedtoSetupListHOReqAck.h
+    S1AP_E-RAB-ID.h
+    S1AP_E-RAB-IE-ContainerList.h
+    S1AP_E-RAB-IE-ContainerPairList.h
+    S1AP_E-RABInformationList.h
+    S1AP_E-RABInformationListItem.h
+    S1AP_E-RABItem.h
+    S1AP_E-RABLevelQoSParameters.h
+    S1AP_E-RABList.h
+    S1AP_E-RABModificationConfirm.h
+    S1AP_E-RABModificationIndication.h
+    S1AP_E-RABModifyItemBearerModConf.h
+    S1AP_E-RABModifyItemBearerModRes.h
+    S1AP_E-RABModifyListBearerModConf.h
+    S1AP_E-RABModifyListBearerModRes.h
+    S1AP_E-RABModifyRequest.h
+    S1AP_E-RABModifyResponse.h
+    S1AP_E-RABNotToBeModifiedItemBearerModInd.h
+    S1AP_E-RABNotToBeModifiedListBearerModInd.h
+    S1AP_E-RABReleaseCommand.h
+    S1AP_E-RABReleaseIndication.h
+    S1AP_E-RABReleaseItemBearerRelComp.h
+    S1AP_E-RABReleaseListBearerRelComp.h
+    S1AP_E-RABReleaseResponse.h
+    S1AP_E-RABSetupItemBearerSURes.h
+    S1AP_E-RABSetupItemCtxtSURes.h
+    S1AP_E-RABSetupListBearerSURes.h
+    S1AP_E-RABSetupListCtxtSURes.h
+    S1AP_E-RABSetupRequest.h
+    S1AP_E-RABSetupResponse.h
+    S1AP_E-RABSubjecttoDataForwardingList.h
+    S1AP_E-RABToBeModifiedItemBearerModInd.h
+    S1AP_E-RABToBeModifiedItemBearerModReq.h
+    S1AP_E-RABToBeModifiedListBearerModInd.h
+    S1AP_E-RABToBeModifiedListBearerModReq.h
+    S1AP_E-RABToBeSetupItemBearerSUReq.h
+    S1AP_E-RABToBeSetupItemCtxtSUReq.h
+    S1AP_E-RABToBeSetupItemHOReq.h
+    S1AP_E-RABToBeSetupListBearerSUReq.h
+    S1AP_E-RABToBeSetupListCtxtSUReq.h
+    S1AP_E-RABToBeSetupListHOReq.h
+    S1AP_E-RABToBeSwitchedDLItem.h
+    S1AP_E-RABToBeSwitchedDLList.h
+    S1AP_E-RABToBeSwitchedULItem.h
+    S1AP_E-RABToBeSwitchedULList.h
+    S1AP_E-RABUsageReportItem.h
+    S1AP_E-RABUsageReportList.h
+    S1AP_ErrorIndication.h
+    S1AP_EUTRANcellLoadReportingResponse.h
+    S1AP_EUTRAN-CGI.h
+    S1AP_EUTRANResponse.h
+    S1AP_EUTRANRoundTripDelayEstimationInfo.h
+    S1AP_E-UTRAN-Trace-ID.h
+    S1AP_EventTriggeredCellLoadReportingRequest.h
+    S1AP_EventTriggeredCellLoadReportingResponse.h
+    S1AP_EventType.h
+    S1AP_ExpectedActivityPeriod.h
+    S1AP_ExpectedHOInterval.h
+    S1AP_ExpectedIdlePeriod.h
+    S1AP_ExpectedUEActivityBehaviour.h
+    S1AP_ExpectedUEBehaviour.h
+    S1AP_ExtendedBitRate.h
+    S1AP_ExtendedRepetitionPeriod.h
+    S1AP_ExtendedRNC-ID.h
+    S1AP_Extended-UEIdentityIndexValue.h
+    S1AP_FailureEventReport.h
+    S1AP_FailureEventReportingCause.h
+    S1AP_FiveGSTAC.h
+    S1AP_FiveGSTAI.h
+    S1AP_ForbiddenInterRATs.h
+    S1AP_ForbiddenLACs.h
+    S1AP_ForbiddenLAs.h
+    S1AP_ForbiddenLAs-Item.h
+    S1AP_ForbiddenTACs.h
+    S1AP_ForbiddenTAs.h
+    S1AP_ForbiddenTAs-Item.h
+    S1AP_GBR-QosInformation.h
+    S1AP_GERAN-Cell-ID.h
+    S1AP_Global-ENB-ID.h
+    S1AP_Global-en-gNB-ID.h
+    S1AP_Global-GNB-ID.h
+    S1AP_Global-RAN-NODE-ID.h
+    S1AP_GNB.h
+    S1AP_GNB-Identity.h
+    S1AP_GNB-ID.h
+    S1AP_GTP-TEID.h
+    S1AP_GUMMEI.h
+    S1AP_GUMMEIList.h
+    S1AP_GUMMEIType.h
+    S1AP_GWContextReleaseIndication.h
+    S1AP_HandoverCancelAcknowledge.h
+    S1AP_HandoverCancel.h
+    S1AP_HandoverCommand.h
+    S1AP_HandoverFailure.h
+    S1AP_HandoverFlag.h
+    S1AP_HandoverNotify.h
+    S1AP_HandoverPreparationFailure.h
+    S1AP_HandoverRequestAcknowledge.h
+    S1AP_HandoverRequest.h
+    S1AP_HandoverRequired.h
+    S1AP_HandoverRestrictionList.h
+    S1AP_HandoverType.h
+    S1AP_HFNforPDCP-SNlength18.h
+    S1AP_HFN.h
+    S1AP_HFNModified.h
+    S1AP_HOReport.h
+    S1AP_HOReportingCause.h
+    S1AP_HoReportType.h
+    S1AP_HoType.h
+    S1AP_ImmediateMDT.h
+    S1AP_IMSI.h
+    S1AP_InformationOnRecommendedCellsAndENBsForPaging.h
+    S1AP_InitialContextSetupFailure.h
+    S1AP_InitialContextSetupRequest.h
+    S1AP_InitialContextSetupResponse.h
+    S1AP_InitialUEMessage.h
+    S1AP_InitiatingMessage.h
+    S1AP_IntegrityProtectionAlgorithms.h
+    S1AP_IntendedNumberOfPagingAttempts.h
+    S1AP_InterfacesToTrace.h
+    S1AP_Inter-SystemInformationTransferType.h
+    S1AP_IRAT-Cell-ID.h
+    S1AP_KillAllWarningMessages.h
+    S1AP_KillRequest.h
+    S1AP_KillResponse.h
+    S1AP_L3-Information.h
+    S1AP_LAC.h
+    S1AP_LAI.h
+    S1AP_LastVisitedCell-Item.h
+    S1AP_LastVisitedEUTRANCellInformation.h
+    S1AP_LastVisitedGERANCellInformation.h
+    S1AP_LastVisitedNGRANCellInformation.h
+    S1AP_LastVisitedUTRANCellInformation.h
+    S1AP_LHN-ID.h
+    S1AP_Links-to-log.h
+    S1AP_ListeningSubframePattern.h
+    S1AP_LocationReport.h
+    S1AP_LocationReportingControl.h
+    S1AP_LocationReportingFailureIndication.h
+    S1AP_LoggedMBSFNMDT.h
+    S1AP_LoggedMDT.h
+    S1AP_LoggingDuration.h
+    S1AP_LoggingInterval.h
+    S1AP_LPPa-PDU.h
+    S1AP_LTE-M-Indication.h
+    S1AP_M1PeriodicReporting.h
+    S1AP_M1ReportingTrigger.h
+    S1AP_M1ThresholdEventA2.h
+    S1AP_M3Configuration.h
+    S1AP_M3period.h
+    S1AP_M4Configuration.h
+    S1AP_M4period.h
+    S1AP_M5Configuration.h
+    S1AP_M5period.h
+    S1AP_M6Configuration.h
+    S1AP_M6delay-threshold.h
+    S1AP_M6report-Interval.h
+    S1AP_M7Configuration.h
+    S1AP_M7period.h
+    S1AP_ManagementBasedMDTAllowed.h
+    S1AP_Masked-IMEISV.h
+    S1AP_MBSFN-ResultToLog.h
+    S1AP_MBSFN-ResultToLogInfo.h
+    S1AP_MDT-Activation.h
+    S1AP_MDT-Configuration.h
+    S1AP_MDT-Location-Info.h
+    S1AP_MDTMode-Extension.h
+    S1AP_MDTMode.h
+    S1AP_MDTPLMNList.h
+    S1AP_MeasurementsToActivate.h
+    S1AP_MeasurementThresholdA2.h
+    S1AP_MessageIdentifier.h
+    S1AP_MME-Code.h
+    S1AP_MMEConfigurationTransfer.h
+    S1AP_MMEConfigurationUpdateAcknowledge.h
+    S1AP_MMEConfigurationUpdateFailure.h
+    S1AP_MMEConfigurationUpdate.h
+    S1AP_MMECPRelocationIndication.h
+    S1AP_MMEDirectInformationTransfer.h
+    S1AP_MME-Group-ID.h
+    S1AP_MMEname.h
+    S1AP_MMEPagingTarget.h
+    S1AP_MMERelaySupportIndicator.h
+    S1AP_MMEStatusTransfer.h
+    S1AP_MME-UE-S1AP-ID.h
+    S1AP_MSClassmark2.h
+    S1AP_MSClassmark3.h
+    S1AP_M-TMSI.h
+    S1AP_MultiCellLoadReportingRequest.h
+    S1AP_MultiCellLoadReportingResponse.h
+    S1AP_MultiCellLoadReportingResponse-Item.h
+    S1AP_MutingAvailabilityIndication.h
+    S1AP_MutingPatternInformation.h
+    S1AP_NASDeliveryIndication.h
+    S1AP_NASNonDeliveryIndication.h
+    S1AP_NAS-PDU.h
+    S1AP_NASSecurityParametersfromE-UTRAN.h
+    S1AP_NASSecurityParameterstoE-UTRAN.h
+    S1AP_NB-IoT-DefaultPagingDRX.h
+    S1AP_NB-IoT-Paging-eDRX-Cycle.h
+    S1AP_NB-IoT-Paging-eDRXInformation.h
+    S1AP_NB-IoT-PagingTimeWindow.h
+    S1AP_NB-IoT-UEIdentityIndexValue.h
+    S1AP_NextPagingAreaScope.h
+    S1AP_NG-eNB.h
+    S1AP_NotificationCellList.h
+    S1AP_NotificationCellList-Item.h
+    S1AP_NotifyFlag.h
+    S1AP_NRCellIdentity.h
+    S1AP_NR-CGI.h
+    S1AP_NRencryptionAlgorithms.h
+    S1AP_NRintegrityProtectionAlgorithms.h
+    S1AP_NRrestrictionin5GS.h
+    S1AP_NRrestrictioninEPSasSecondaryRAT.h
+    S1AP_NRUESecurityCapabilities.h
+    S1AP_NumberofBroadcastRequest.h
+    S1AP_NumberOfBroadcasts.h
+    S1AP_NumberOfMeasurementReportingLevels.h
+    S1AP_OldBSS-ToNewBSS-Information.h
+    S1AP_OverloadAction.h
+    S1AP_OverloadFlag.h
+    S1AP_OverloadResponse.h
+    S1AP_OverloadStart.h
+    S1AP_OverloadStop.h
+    S1AP_Packet-LossRate.h
+    S1AP_PagingAttemptCount.h
+    S1AP_PagingAttemptInformation.h
+    S1AP_PagingDRX.h
+    S1AP_Paging-eDRX-Cycle.h
+    S1AP_Paging-eDRXInformation.h
+    S1AP_Paging.h
+    S1AP_PagingPriority.h
+    S1AP_PagingTimeWindow.h
+    S1AP_PathSwitchRequestAcknowledge.h
+    S1AP_PathSwitchRequestFailure.h
+    S1AP_PathSwitchRequest.h
+    S1AP_PDCP-SNExtended.h
+    S1AP_PDCP-SN.h
+    S1AP_PDCP-SNlength18.h
+    S1AP_PedestrianUE.h
+    S1AP_PendingDataIndication.h
+    S1AP_PLMNAreaBasedQMC.h
+    S1AP_PLMNidentity.h
+    S1AP_PLMNListforQMC.h
+    S1AP_Port-Number.h
+    S1AP_Pre-emptionCapability.h
+    S1AP_Pre-emptionVulnerability.h
+    S1AP_Presence.h
+    S1AP_PriorityLevel.h
+    S1AP_PrivacyIndicator.h
+    S1AP_PrivateIE-Container.h
+    S1AP_PrivateIE-Field.h
+    S1AP_PrivateIE-ID.h
+    S1AP_PrivateMessage.h
+    S1AP_ProcedureCode.h
+    S1AP_ProSeAuthorized.h
+    S1AP_ProSeDirectCommunication.h
+    S1AP_ProSeDirectDiscovery.h
+    S1AP_ProSeUEtoNetworkRelaying.h
+    S1AP_ProtocolError-IE-ContainerList.h
+    S1AP_ProtocolExtensionContainer.h
+    S1AP_ProtocolExtensionField.h
+    S1AP_ProtocolExtensionID.h
+    S1AP_ProtocolIE-Container.h
+    S1AP_ProtocolIE-ContainerList.h
+    S1AP_ProtocolIE-ContainerPair.h
+    S1AP_ProtocolIE-ContainerPairList.h
+    S1AP_ProtocolIE-Field.h
+    S1AP_ProtocolIE-FieldPair.h
+    S1AP_ProtocolIE-ID.h
+    S1AP_ProtocolIE-SingleContainer.h
+    S1AP_PSCellInformation.h
+    S1AP_PS-ServiceNotAvailable.h
+    S1AP_PWSfailedECGIList.h
+    S1AP_PWSFailureIndication.h
+    S1AP_PWSRestartIndication.h
+    S1AP_QCI.h
+    S1AP_RAC.h
+    S1AP_RAT-Type.h
+    S1AP_ReceiveStatusOfULPDCPSDUsExtended.h
+    S1AP_ReceiveStatusofULPDCPSDUs.h
+    S1AP_ReceiveStatusOfULPDCPSDUsPDCP-SNlength18.h
+    S1AP_RecommendedCellItem.h
+    S1AP_RecommendedCellList.h
+    S1AP_RecommendedCellsForPaging.h
+    S1AP_RecommendedENBItem.h
+    S1AP_RecommendedENBList.h
+    S1AP_RecommendedENBsForPaging.h
+    S1AP_RelativeMMECapacity.h
+    S1AP_RelayNode-Indicator.h
+    S1AP_RepetitionPeriod.h
+    S1AP_ReportAmountMDT.h
+    S1AP_ReportArea.h
+    S1AP_ReportingCellList.h
+    S1AP_ReportingCellList-Item.h
+    S1AP_ReportIntervalMDT.h
+    S1AP_RequestedCellList.h
+    S1AP_RequestType.h
+    S1AP_RerouteNASRequest.h
+    S1AP_ResetAcknowledge.h
+    S1AP_ResetAll.h
+    S1AP_Reset.h
+    S1AP_ResetType.h
+    S1AP_RetrieveUEInformation.h
+    S1AP_RIMInformation.h
+    S1AP_RIMRoutingAddress.h
+    S1AP_RIMTransfer.h
+    S1AP_RLFReportInformation.h
+    S1AP_RNC-ID.h
+    S1AP_Routing-ID.h
+    S1AP_RRC-Container.h
+    S1AP_RRC-Establishment-Cause.h
+    S1AP_S1AP-IEs_MobilityInformation.h
+    S1AP_S1AP-PDU.h
+    S1AP_S1SetupFailure.h
+    S1AP_S1SetupRequest.h
+    S1AP_S1SetupResponse.h
+    S1AP_ScheduledCommunicationTime.h
+    S1AP_SecondaryRATDataUsageReport.h
+    S1AP_SecondaryRATDataUsageReportItem.h
+    S1AP_SecondaryRATDataUsageReportList.h
+    S1AP_SecondaryRATDataUsageRequest.h
+    S1AP_SecondaryRATType.h
+    S1AP_SecurityContext.h
+    S1AP_SecurityKey.h
+    S1AP_SerialNumber.h
+    S1AP_ServedDCNs.h
+    S1AP_ServedDCNsItem.h
+    S1AP_ServedGroupIDs.h
+    S1AP_ServedGUMMEIs.h
+    S1AP_ServedGUMMEIsItem.h
+    S1AP_ServedMMECs.h
+    S1AP_ServedPLMNs.h
+    S1AP_ServiceType.h
+    S1AP_SONConfigurationTransfer.h
+    S1AP_SONInformation-Extension.h
+    S1AP_SONInformation.h
+    S1AP_SONInformationReply.h
+    S1AP_SONInformationReport.h
+    S1AP_SONInformationRequest.h
+    S1AP_SONtransferApplicationIdentity.h
+    S1AP_SONtransferCause.h
+    S1AP_SonTransfer-IEs_MobilityInformation.h
+    S1AP_SONtransferRequestContainer.h
+    S1AP_SONtransferResponseContainer.h
+    S1AP_SourceBSS-ToTargetBSS-TransparentContainer.h
+    S1AP_SourceeNB-ID.h
+    S1AP_SourceeNB-ToTargeteNB-TransparentContainer.h
+    S1AP_SourceNgRanNode-ToTargetNgRanNode-TransparentContainer.h
+    S1AP_SourceOfUEActivityBehaviourInformation.h
+    S1AP_SourceRNC-ToTargetRNC-TransparentContainer.h
+    S1AP_Source-ToTarget-TransparentContainer.h
+    S1AP_SRVCCHOIndication.h
+    S1AP_SRVCCOperationNotPossible.h
+    S1AP_SRVCCOperationPossible.h
+    S1AP_S-TMSI.h
+    S1AP_StratumLevel.h
+    S1AP_SubscriberProfileIDforRFP.h
+    S1AP_Subscription-Based-UE-DifferentiationInfo.h
+    S1AP_SuccessfulOutcome.h
+    S1AP_SupportedTAs.h
+    S1AP_SupportedTAs-Item.h
+    S1AP_SynchronisationInformation.h
+    S1AP_SynchronisationStatus.h
+    S1AP_TABasedMDT.h
+    S1AP_TABasedQMC.h
+    S1AP_TAC.h
+    S1AP_TAIBasedMDT.h
+    S1AP_TAIBasedQMC.h
+    S1AP_TAI-Broadcast.h
+    S1AP_TAI-Broadcast-Item.h
+    S1AP_TAI-Cancelled.h
+    S1AP_TAI-Cancelled-Item.h
+    S1AP_TAI.h
+    S1AP_TAIItem.h
+    S1AP_TAIListforMDT.h
+    S1AP_TAIListforQMC.h
+    S1AP_TAIListForRestart.h
+    S1AP_TAIListforWarning.h
+    S1AP_TAIList.h
+    S1AP_TAListforMDT.h
+    S1AP_TAListforQMC.h
+    S1AP_TargetBSS-ToSourceBSS-TransparentContainer.h
+    S1AP_TargeteNB-ID.h
+    S1AP_TargeteNB-ToSourceeNB-TransparentContainer.h
+    S1AP_TargetID.h
+    S1AP_TargetNgRanNode-ID.h
+    S1AP_TargetNgRanNode-ToSourceNgRanNode-TransparentContainer.h
+    S1AP_TargetRNC-ID.h
+    S1AP_TargetRNC-ToSourceRNC-TransparentContainer.h
+    S1AP_Target-ToSource-TransparentContainer.h
+    S1AP_TBCD-STRING.h
+    S1AP_Threshold-RSRP.h
+    S1AP_Threshold-RSRQ.h
+    S1AP_TimeSynchronisationInfo.h
+    S1AP_TimeToWait.h
+    S1AP_Time-UE-StayedInCell-EnhancedGranularity.h
+    S1AP_Time-UE-StayedInCell.h
+    S1AP_TooEarlyInterRATHOReportReportFromEUTRAN.h
+    S1AP_TraceActivation.h
+    S1AP_TraceDepth.h
+    S1AP_TraceFailureIndication.h
+    S1AP_TraceStart.h
+    S1AP_TrafficLoadReductionIndication.h
+    S1AP_TransportInformation.h
+    S1AP_TransportLayerAddress.h
+    S1AP_TriggeringMessage.h
+    S1AP_TunnelInformation.h
+    S1AP_TypeOfError.h
+    S1AP_UEAggregateMaximumBitrate.h
+    S1AP_UEAppLayerMeasConfig.h
+    S1AP_UE-Application-Layer-Measurement-Capability.h
+    S1AP_UE-associatedLogicalS1-ConnectionItem.h
+    S1AP_UE-associatedLogicalS1-ConnectionListResAck.h
+    S1AP_UE-associatedLogicalS1-ConnectionListRes.h
+    S1AP_UECapabilityInfoIndication.h
+    S1AP_UECapabilityInfoRequest.h
+    S1AP_UEContextModificationConfirm.h
+    S1AP_UEContextModificationFailure.h
+    S1AP_UEContextModificationIndication.h
+    S1AP_UEContextModificationRequest.h
+    S1AP_UEContextModificationResponse.h
+    S1AP_UEContextReleaseCommand.h
+    S1AP_UEContextReleaseComplete.h
+    S1AP_UEContextReleaseRequest.h
+    S1AP_UEContextResumeFailure.h
+    S1AP_UEContextResumeRequest.h
+    S1AP_UEContextResumeResponse.h
+    S1AP_UEContextSuspendRequest.h
+    S1AP_UEContextSuspendResponse.h
+    S1AP_UE-HistoryInformationFromTheUE.h
+    S1AP_UE-HistoryInformation.h
+    S1AP_UEIdentityIndexValue.h
+    S1AP_UEInformationTransfer.h
+    S1AP_UEPagingID.h
+    S1AP_UERadioCapabilityForPaging.h
+    S1AP_UERadioCapability.h
+    S1AP_UERadioCapabilityMatchRequest.h
+    S1AP_UERadioCapabilityMatchResponse.h
+    S1AP_UE-RetentionInformation.h
+    S1AP_UE-RLF-Report-Container-for-extended-bands.h
+    S1AP_UE-RLF-Report-Container.h
+    S1AP_UE-S1AP-ID-pair.h
+    S1AP_UE-S1AP-IDs.h
+    S1AP_UESecurityCapabilities.h
+    S1AP_UESidelinkAggregateMaximumBitrate.h
+    S1AP_UE-Usage-Type.h
+    S1AP_UEUserPlaneCIoTSupportIndicator.h
+    S1AP_UL-CP-SecurityInformation.h
+    S1AP_UL-NAS-Count.h
+    S1AP_UL-NAS-MAC.h
+    S1AP_UnlicensedSpectrumRestriction.h
+    S1AP_UnsuccessfulOutcome.h
+    S1AP_UplinkNASTransport.h
+    S1AP_UplinkNonUEAssociatedLPPaTransport.h
+    S1AP_UplinkS1cdma2000tunnelling.h
+    S1AP_UplinkUEAssociatedLPPaTransport.h
+    S1AP_UserLocationInformation.h
+    S1AP_V2XServicesAuthorized.h
+    S1AP_VehicleUE.h
+    S1AP_VoiceSupportMatchIndicator.h
+    S1AP_WarningAreaCoordinates.h
+    S1AP_WarningAreaList.h
+    S1AP_WarningMessageContents.h
+    S1AP_WarningSecurityInfo.h
+    S1AP_WarningType.h
+    S1AP_WLANMeasConfig.h
+    S1AP_WLANMeasConfigNameList.h
+    S1AP_WLANMeasurementConfiguration.h
+    S1AP_WLANName.h
+    S1AP_WriteReplaceWarningRequest.h
+    S1AP_WriteReplaceWarningResponse.h
+    S1AP_X2TNLConfigurationInfo.h
+    xer_decoder.h
+    xer_encoder.h
+    xer_support.h
+)
diff --git a/openair3/S1AP/MESSAGES/CMakeLists.txt b/openair3/S1AP/MESSAGES/CMakeLists.txt
new file mode 100644
index 0000000000..5c6db417ea
--- /dev/null
+++ b/openair3/S1AP/MESSAGES/CMakeLists.txt
@@ -0,0 +1,20 @@
+set(S1AP_VERSION 15 6 0)
+make_version(S1AP_cc ${S1AP_VERSION})
+#add_definitions(-DS1AP_VERSION=${S1AP_cc})
+string(REPLACE ";" "." S1AP_RELEASE "${S1AP_VERSION}")
+
+if(S1AP_RELEASE VERSION_EQUAL "15.6.0")
+  include(ASN1/R15/s1ap-15.6.0.cmake)
+else()
+  message(FATAL_ERROR "unknown S1AP_RELEASE ${S1AP_RELEASE}")
+endif()
+
+add_custom_command(OUTPUT ${s1ap_source} ${s1ap_headers}
+  COMMAND ASN1C_PREFIX=S1AP_ asn1c -gen-PER -no-gen-OER -fcompound-names -no-gen-example -fno-include-deps -D ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${S1AP_GRAMMAR}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${S1AP_GRAMMAR}
+  COMMENT "Generating S1AP source files from ${CMAKE_CURRENT_SOURCE_DIR}/${S1AP_GRAMMAR}"
+)
+
+add_library(asn1_s1ap ${s1ap_source})
+target_include_directories(asn1_s1ap PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
+target_compile_options(asn1_s1ap PRIVATE -DASN_DISABLE_OER_SUPPORT -w)