diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index 383cce7a78..4a5ec56535 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -24,7 +24,7 @@
 
 	if(isobserver(user))
 		// If they turn on ghost AI control, admins can always interact.
-		if(isAdminGhostAI(user)) //IsAdminGhost
+		if(IsAdminGhost(user))
 			. = max(., UI_INTERACTIVE)
 
 		// Regular ghosts can always at least view if in range.
diff --git a/tgstation.dme b/tgstation.dme
index 2c5d30e2b7..dc2ef604c9 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3324,15 +3324,14 @@
 #include "code\modules\tgs\includes.dm"
 #include "code\modules\tgui\external.dm"
 #include "code\modules\tgui\states.dm"
-#include "code\modules\tgui\subsystem.dm"
 #include "code\modules\tgui\tgui.dm"
+#include "code\modules\tgui\tgui_window.dm"
 #include "code\modules\tgui\states\admin.dm"
 #include "code\modules\tgui\states\always.dm"
 #include "code\modules\tgui\states\conscious.dm"
 #include "code\modules\tgui\states\contained.dm"
 #include "code\modules\tgui\states\deep_inventory.dm"
 #include "code\modules\tgui\states\default.dm"
-#include "code\modules\tgui\states\default_contained.dm"
 #include "code\modules\tgui\states\hands.dm"
 #include "code\modules\tgui\states\human_adjacent.dm"
 #include "code\modules\tgui\states\inventory.dm"