diff --git a/.github/scripts/validate-and-lint.sh b/.github/scripts/validate-and-lint.sh
index cfb5d5f..4088cf4 100755
--- a/.github/scripts/validate-and-lint.sh
+++ b/.github/scripts/validate-and-lint.sh
@@ -12,6 +12,9 @@ echo "Validating XML file structure and linting XSD and XML files ..."
 PARSING_ERROR=0
 # Iterate all XML and XSD files
 while IFS= read -r -d $'\0' filename; do
+  if [[ "$filename" =~ \.git/ ]]; then
+    continue  # Skip files inside the .git directory
+  fi
   # Prettify the file using xmllint and save the result to ${filename}.pretty
   if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 "${filename}" >"${filename}.pretty"; then
     # Remove lines containing the term "xmlspy" to get rid of advertising this and save the result as ${filename}
diff --git a/xsd/acsb/acsb_accessibility.xsd b/xsd/acsb/acsb_accessibility.xsd
index a712595..6517bc3 100644
--- a/xsd/acsb/acsb_accessibility.xsd
+++ b/xsd/acsb/acsb_accessibility.xsd
@@ -56,7 +56,9 @@ Rail transport, Roads and road transport
 	</xsd:annotation>
 	<xsd:include schemaLocation="acsb_limitations.xsd"/>
 	<xsd:include schemaLocation="acsb_passengerMobility.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_time.xsd"/>
+	<!--===========================================================================================-->
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_allStopPlace.xsd"/>
 	<!--===========================================================================================-->
 	<xsd:simpleType name="LimitationIdType">
 		<xsd:annotation>
diff --git a/xsd/ifopt/ifopt_allStopPlace.xsd b/xsd/ifopt/ifopt_allStopPlace.xsd
index f633b1d..a4332ec 100644
--- a/xsd/ifopt/ifopt_allStopPlace.xsd
+++ b/xsd/ifopt/ifopt_allStopPlace.xsd
@@ -14,7 +14,7 @@ The Purpose of this file is to overcome a technical limitation in Xerces (and po
 
  -->
 <xsd:schema xmlns="http://www.ifopt.org.uk/ifopt" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:acsb="http://www.ifopt.org.uk/acsb" xmlns:siri="http://www.siri.org.uk/siri" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.ifopt.org.uk/ifopt" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.3" id="ifopt_allStopPlace">
-	<!-- ===Global include of all ACSB namespace elements neeeded to work around XERCES limitation=====-->
+	<!-- Global import of all ACSB namespace elements needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_all.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri_utility/siri_location.xsd"/>
diff --git a/xsd/ifopt/ifopt_checkpoint.xsd b/xsd/ifopt/ifopt_checkpoint.xsd
index 19eae6d..c8b813b 100644
--- a/xsd/ifopt/ifopt_checkpoint.xsd
+++ b/xsd/ifopt/ifopt_checkpoint.xsd
@@ -58,7 +58,8 @@ Rail transport, Roads and road transport
 		</xsd:appinfo>
 		<xsd:documentation>Fixed Objects CHECK CONSTRAINT types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_accessibility.xsd"/>
+	<!-- Global import of all ACSB namespace elements needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_all.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri_utility/siri_types.xsd"/>
 	<xsd:include schemaLocation="ifopt_time.xsd"/>
 	<xsd:simpleType name="CheckPointIdType">
diff --git a/xsd/siri_facilityMonitoring_service.xsd b/xsd/siri_facilityMonitoring_service.xsd
index f576620..dec13fd 100644
--- a/xsd/siri_facilityMonitoring_service.xsd
+++ b/xsd/siri_facilityMonitoring_service.xsd
@@ -73,15 +73,11 @@ Rail transport, Roads and road transport
 		</xsd:appinfo>
 		<xsd:documentation>SIRI-FM Facility Monitoring Service.</xsd:documentation>
 	</xsd:annotation>
-	<!-- ===Global import of all IFOPT namespace elements used in SIRI needed to work around XERCES limitation=====-->
+	<!-- ======================================================================= -->
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="ifopt/ifopt_allStopPlace.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="ifopt/ifopt_stop.xsd"/>
-	<!--.....See facility for the actual dependencies...-->
-	<!-- ===Global import of all ACSB namespace elements needed to work around XERCES limitation This needs to be after ifopt=====-->
+	<!-- Global import of all ACSB namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="acsb/acsb_all.xsd"/>
-	<!--.....These are the actual dependencies...-->
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="acsb/acsb_passengerMobility.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="acsb/acsb_accessibility.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="siri_model/siri_facility.xsd"/>
 	<xsd:include schemaLocation="siri_model/siri_modelPermissions.xsd"/>
diff --git a/xsd/siri_model/siri_facility.xsd b/xsd/siri_model/siri_facility.xsd
index 359357e..54924f8 100644
--- a/xsd/siri_model/siri_facility.xsd
+++ b/xsd/siri_model/siri_facility.xsd
@@ -80,11 +80,10 @@ Rail transport, Roads and road transport
 	<xsd:include schemaLocation="siri_journey.xsd"/>
 	<xsd:include schemaLocation="siri_journey_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_equipment.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_stop.xsd"/>
-	<!-- ======================================================================= -->
-	<!--Needed to work around import limitation in jaxb - all namespaces acsb needs to be after ifopt. -->
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_accessibility.xsd"/>
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_allStopPlace.xsd"/>
+	<!-- Global import of all ACSB namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_all.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="../siri_utility/siri_utility.xsd"/>
 	<!-- ======================================================================= -->
diff --git a/xsd/siri_model/siri_journey.xsd b/xsd/siri_model/siri_journey.xsd
index 31e8f57..36be9ac 100644
--- a/xsd/siri_model/siri_journey.xsd
+++ b/xsd/siri_model/siri_journey.xsd
@@ -128,10 +128,10 @@ Rail transport, Roads and road transport
 	<xsd:include schemaLocation="../siri_model_discovery/siri_feature.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_location.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_equipment.xsd"/>
-	<!-- ======================================================================= -->
-	<!--Needed to work around import limitation in jaxb - all namespaces acsb needs to be after ifopt. -->
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_accessibility.xsd"/>
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_allStopPlace.xsd"/>
+	<!-- Global import of all ACSB namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_all.xsd"/>
 	<!-- ==== VEHICLEJOURNEY ================================================================== -->
 	<xsd:group name="JourneyInfoGroup">
 		<xsd:annotation>
diff --git a/xsd/siri_model/siri_situation.xsd b/xsd/siri_model/siri_situation.xsd
index 1878f96..91bdb04 100644
--- a/xsd/siri_model/siri_situation.xsd
+++ b/xsd/siri_model/siri_situation.xsd
@@ -14,10 +14,10 @@ siri_model\siri_situation-v2.0.xsd:
 - PublicationWindow changed to unbounded
 -->
 	<!-- ======================================================================= -->
-	<!--Needed to work around import limitation in JAXB - all namespaces. -->
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_allStopPlace.xsd"/>
+	<!-- Global import of all ACSB namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_all.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_accessibility.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_countries.xsd"/>
 	<xsd:import namespace="http://datex2.eu/schema/2_0RC1/2_0" schemaLocation="../datex2/DATEXIISchema.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="siri_situationIdentity.xsd"/>
diff --git a/xsd/siri_model/siri_situationAffects.xsd b/xsd/siri_model/siri_situationAffects.xsd
index f9a0993..23bbe4e 100644
--- a/xsd/siri_model/siri_situationAffects.xsd
+++ b/xsd/siri_model/siri_situationAffects.xsd
@@ -4,16 +4,11 @@
 	<xsd:include schemaLocation="siri_modes.xsd"/>
 	<xsd:include schemaLocation="siri_situationServiceTypes.xsd"/>
 	<xsd:include schemaLocation="siri_situationClassifiers.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_location.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_stop.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_modes.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_equipment.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_checkpoint.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_path.xsd"/>
+	<!-- ======================================================================= -->
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_allStopPlace.xsd"/>
+	<!-- Global import of all ACSB namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_all.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_accessibility.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_passengerMobility.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="../acsb/acsb_limitations.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/siri_model/siri_situationIdentity.xsd b/xsd/siri_model/siri_situationIdentity.xsd
index f966804..7a9bf9f 100644
--- a/xsd/siri_model/siri_situationIdentity.xsd
+++ b/xsd/siri_model/siri_situationIdentity.xsd
@@ -63,8 +63,10 @@ Rail transport, Roads and road transport
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="../siri_utility/siri_participant.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_utility.xsd"/>
+	<!-- ======================================================================= -->
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_allStopPlace.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_countries.xsd"/>
+	<!-- ======================================================================= -->
 	<!-- ==Situation Reference as a single field : Participant + SITUATION Number + SITUATION Version=================================================================== -->
 	<xsd:group name="SituationReferenceGroup">
 		<xsd:annotation>
diff --git a/xsd/siri_model_discovery/siri_line.xsd b/xsd/siri_model_discovery/siri_line.xsd
index 5d172d9..967b8fd 100644
--- a/xsd/siri_model_discovery/siri_line.xsd
+++ b/xsd/siri_model_discovery/siri_line.xsd
@@ -78,9 +78,10 @@ Rail transport, Roads and road transport
 		<xsd:documentation>SIRI subschema with view of  LINE for use in Discovery service</xsd:documentation>
 	</xsd:annotation>
 	<!-- ======================================================================= -->
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
+	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_allStopPlace.xsd"/>
+	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="../siri_model/siri_journey.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_stop.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="../ifopt/ifopt_location.xsd"/>
 	<xsd:include schemaLocation="siri_stopPoint.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- === LINE =================================================== -->
diff --git a/xsd/siri_situationExchange_service.xsd b/xsd/siri_situationExchange_service.xsd
index f92d009..16a2090 100644
--- a/xsd/siri_situationExchange_service.xsd
+++ b/xsd/siri_situationExchange_service.xsd
@@ -108,18 +108,15 @@ Rail transport, Roads and road transport
 		<xsd:documentation>SIRI-SX Situation Exchange Service.</xsd:documentation>
 	</xsd:annotation>
 	<!-- ======================================================================= -->
-	<!-- ===Global import of all IFOPT namespace elements used in SIRI neeeded to work around XERCES limitation=====-->
+	<!-- Global import of all IFOPT namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/ifopt" schemaLocation="ifopt/ifopt_allStopPlace.xsd"/>
-	<!--.....See SITUATION for the actual dependencies...-->
-	<!-- ===Global import of all ACSB namespace elements needed to work around XERCES limitation=====-->
+	<!-- Global import of all ACSB namespace elements used in SIRI needed to work around JAXB/XERCES/xmllint limitations -->
 	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="acsb/acsb_all.xsd"/>
-	<!--.....These are the actual dependencies...-->
+	<xsd:import namespace="http://datex2.eu/schema/2_0RC1/2_0" schemaLocation="datex2/DATEXIISchema.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="siri/siri_requests.xsd"/>
 	<xsd:include schemaLocation="siri_model/siri_situation.xsd"/>
 	<xsd:include schemaLocation="siri_model/siri_modelPermissions.xsd"/>
-	<xsd:import namespace="http://www.ifopt.org.uk/acsb" schemaLocation="acsb/acsb_passengerMobility.xsd"/>
-	<xsd:import namespace="http://datex2.eu/schema/2_0RC1/2_0" schemaLocation="datex2/DATEXIISchema.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:group name="SiriSituationExchangeServiceIndexGroup">
 		<xsd:annotation>