diff --git a/code/game/machinery/airlock_control/_airlock_control_defines.dm b/code/__DEFINES/airlock_control_defines.dm
similarity index 71%
rename from code/game/machinery/airlock_control/_airlock_control_defines.dm
rename to code/__DEFINES/airlock_control_defines.dm
index c72eddee8b9..c61518a3f16 100644
--- a/code/game/machinery/airlock_control/_airlock_control_defines.dm
+++ b/code/__DEFINES/airlock_control_defines.dm
@@ -1,14 +1,14 @@
-// Controller control states
+// Airlock controller control states
 #define CONTROL_STATE_IDLE			0
 #define CONTROL_STATE_PREPARE		1
 #define CONTROL_STATE_DEPRESSURIZE	2
 #define CONTROL_STATE_PRESSURIZE	3
 
-// Controller target states
+// Airlock controller target states
 #define TARGET_NONE			0
 #define TARGET_INOPEN		-1
 #define TARGET_OUTOPEN		-2
 
-// Button modes
+// Airlock controller button modes
 #define MODE_INTERIOR "int"
 #define MODE_EXTERIOR "ext"
diff --git a/code/game/machinery/airlock_control/z_airlock_undef.dm b/code/game/machinery/airlock_control/z_airlock_undef.dm
deleted file mode 100644
index 115680cbcc1..00000000000
--- a/code/game/machinery/airlock_control/z_airlock_undef.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#undef CONTROL_STATE_IDLE
-#undef CONTROL_STATE_PREPARE
-#undef CONTROL_STATE_DEPRESSURIZE
-#undef CONTROL_STATE_PRESSURIZE
-#undef TARGET_NONE
-#undef TARGET_INOPEN
-#undef TARGET_OUTOPEN
-#undef MODE_INTERIOR
-#undef MODE_EXTERIOR
diff --git a/paradise.dme b/paradise.dme
index 46c82369531..28f9fffe16c 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -32,6 +32,7 @@
 #include "code\__DEFINES\action_button_defines.dm"
 #include "code\__DEFINES\action_defines.dm"
 #include "code\__DEFINES\admin_defines.dm"
+#include "code\__DEFINES\airlock_control_defines.dm"
 #include "code\__DEFINES\announce_defines.dm"
 #include "code\__DEFINES\antag_defines.dm"
 #include "code\__DEFINES\apc_defines.dm"
@@ -935,10 +936,8 @@
 #include "code\game\machinery\turret_control.dm"
 #include "code\game\machinery\wall_holosign.dm"
 #include "code\game\machinery\washing_machine.dm"
-#include "code\game\machinery\airlock_control\_airlock_control_defines.dm"
 #include "code\game\machinery\airlock_control\airlock_button.dm"
 #include "code\game\machinery\airlock_control\airlock_controllers.dm"
-#include "code\game\machinery\airlock_control\z_airlock_undef.dm"
 #include "code\game\machinery\camera\camera.dm"
 #include "code\game\machinery\camera\camera_assembly.dm"
 #include "code\game\machinery\camera\camera_presets.dm"