diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 2b57cdc598..b1ae881a4d 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -4,12 +4,9 @@
 ADDON = false;
 
 // ACE Common Function
-PREP(addActionEventHandler);
-PREP(addActionMenuEventHandler);
+
 PREP(addCanInteractWithCondition);
 PREP(addLineToDebugDraw);
-PREP(addMapMarkerCreatedEventHandler);
-PREP(addScrollWheelEventHandler);
 PREP(addSetting);
 PREP(adminKick);
 PREP(ambientBrightness);
@@ -55,24 +52,16 @@ PREP(fixPosition);
 PREP(getAllDefinedSetVariables);
 PREP(getAllGear);
 PREP(getCaptivityStatus);
-PREP(getConfigCommander);
-PREP(getConfigGunner);
-PREP(getConfigType);
-PREP(getConfigTypeObject);
 PREP(getDeathAnim);
 PREP(getDefaultAnim);
 PREP(getDefinedVariable);
 PREP(getDefinedVariableDefault);
 PREP(getDefinedVariableInfo);
-PREP(getDoorTurrets);
 PREP(getFirstObjectIntersection);
 PREP(getFirstTerrainIntersection);
 PREP(getForceWalkStatus);
 PREP(getGunner);
-PREP(getHitPoints);
-PREP(getHitPointsWithSelections);
 PREP(getInPosition);
-PREP(getItemType);
 PREP(getMarkerType);
 PREP(getName);
 PREP(getNumberFromMissionSQM);
@@ -83,25 +72,13 @@ PREP(getStringFromMissionSQM);
 PREP(getTargetAzimuthAndInclination);
 PREP(getTargetDistance);
 PREP(getTargetObject);
-PREP(getTurretCommander);
-PREP(getTurretConfigPath);
-PREP(getTurretCopilot);
-PREP(getTurretGunner);
-PREP(getTurretIndex);
-PREP(getTurrets);
-PREP(getTurretsFFV);
-PREP(getTurretsOther);
 PREP(getUavControlPosition);
 PREP(getVehicleCargo);
 PREP(getVehicleCodriver);
-PREP(getVehicleCrew);
 PREP(getVersion);
 PREP(getWeaponAzimuthAndInclination);
 PREP(getWeaponIndex);
-PREP(getWeaponModes);
-PREP(getWeaponMuzzles);
 PREP(getWeaponState);
-PREP(getWeaponType);
 PREP(getWindDirection);
 PREP(goKneeling);
 PREP(hadamardProduct);
@@ -144,11 +121,7 @@ PREP(progressBar);
 PREP(queueAnimation);
 PREP(readSettingFromModule);
 PREP(receiveRequest);
-PREP(removeActionEventHandler);
-PREP(removeActionMenuEventHandler);
 PREP(removeCanInteractWithCondition);
-PREP(removeMapMarkerCreatedEventHandler);
-PREP(removeScrollWheelEventHandler);
 PREP(removeSpecificMagazine);
 PREP(requestCallback);
 PREP(resetAllDefaults);
@@ -191,6 +164,32 @@ PREP(useItem);
 PREP(useMagazine);
 PREP(waitAndExecute);
 
+// config items
+PREP(getConfigType);
+PREP(getItemType);
+PREP(getWeaponType);
+PREP(getWeaponModes);
+PREP(getWeaponMuzzles);
+
+// config objects
+PREP(getConfigTypeObject);
+PREP(getConfigGunner);
+PREP(getConfigCommander);
+PREP(getHitPoints);
+PREP(getHitPointsWithSelections);
+PREP(getVehicleCrew);
+
+// turrets
+PREP(getTurrets);
+PREP(getTurretIndex);
+PREP(getTurretConfigPath);
+PREP(getTurretGunner);
+PREP(getTurretCommander);
+PREP(getTurretCopilot);
+PREP(getDoorTurrets);
+PREP(getTurretsFFV);
+PREP(getTurretsOther);
+
 // ACE_Debug
 PREP(exportConfig);
 PREP(getChildren);
@@ -220,6 +219,17 @@ PREP(localEvent);
 PREP(removeEventHandler);
 PREP(removeAlLEventHandlers);
 
+// other eventhandlers
+PREP(addActionEventHandler);
+PREP(addActionMenuEventHandler);
+PREP(addScrollWheelEventHandler);
+PREP(addMapMarkerCreatedEventHandler);
+
+PREP(removeActionEventHandler);
+PREP(removeActionMenuEventHandler);
+PREP(removeScrollWheelEventHandler);
+PREP(removeMapMarkerCreatedEventHandler);
+
 // hashes
 PREP(hashCreate);
 PREP(hashSet);