From 12ec94b091fa7c9a8b35aac8f6db97bc7c7ccda0 Mon Sep 17 00:00:00 2001
From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 5 Aug 2017 21:10:39 +1000
Subject: [PATCH] menu: remove _all

---
 qcsrc/menu/_all.inc  | 10 ----------
 qcsrc/menu/_all.qh   |  5 -----
 qcsrc/menu/_mod.inc  |  6 ++++++
 qcsrc/menu/_mod.qh   |  6 ++++++
 qcsrc/menu/item.qh   |  2 ++
 qcsrc/menu/progs.inc |  6 +++++-
 6 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100644 qcsrc/menu/_all.inc
 delete mode 100644 qcsrc/menu/_all.qh

diff --git a/qcsrc/menu/_all.inc b/qcsrc/menu/_all.inc
deleted file mode 100644
index e5198f591..000000000
--- a/qcsrc/menu/_all.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <menu/_all.qh>
-#include "_mod.inc"
-
-#include "anim/_mod.inc"
-#include "command/_mod.inc"
-#include "item/_mod.inc"
-#include "mutators/_mod.inc"
-#include "xonotic/_mod.inc"
-
-#include <common/_all.inc>
diff --git a/qcsrc/menu/_all.qh b/qcsrc/menu/_all.qh
deleted file mode 100644
index 21f784e32..000000000
--- a/qcsrc/menu/_all.qh
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#include "draw.qh"
-#include "xonotic/util.qh"
-#include "menu.qh"
diff --git a/qcsrc/menu/_mod.inc b/qcsrc/menu/_mod.inc
index e1a26e76b..d2a8d702f 100644
--- a/qcsrc/menu/_mod.inc
+++ b/qcsrc/menu/_mod.inc
@@ -3,3 +3,9 @@
 #include <menu/item.qc>
 #include <menu/matrix.qc>
 #include <menu/menu.qc>
+
+#include <menu/anim/_mod.inc>
+#include <menu/command/_mod.inc>
+#include <menu/item/_mod.inc>
+#include <menu/mutators/_mod.inc>
+#include <menu/xonotic/_mod.inc>
diff --git a/qcsrc/menu/_mod.qh b/qcsrc/menu/_mod.qh
index a5fe87d3e..da8675831 100644
--- a/qcsrc/menu/_mod.qh
+++ b/qcsrc/menu/_mod.qh
@@ -3,3 +3,9 @@
 #include <menu/item.qh>
 #include <menu/matrix.qh>
 #include <menu/menu.qh>
+
+#include <menu/anim/_mod.qh>
+#include <menu/command/_mod.qh>
+#include <menu/item/_mod.qh>
+#include <menu/mutators/_mod.qh>
+#include <menu/xonotic/_mod.qh>
diff --git a/qcsrc/menu/item.qh b/qcsrc/menu/item.qh
index 00dae2ed3..a5df52680 100644
--- a/qcsrc/menu/item.qh
+++ b/qcsrc/menu/item.qh
@@ -2,6 +2,8 @@
 
 // convenience
 #include "skin.qh"
+#include "draw.qh"
+#include "menu.qh"
 
 CLASS(Item, Object)
 	METHOD(Item, draw, void(Item));
diff --git a/qcsrc/menu/progs.inc b/qcsrc/menu/progs.inc
index 404c6f2e5..e5b6fb98d 100644
--- a/qcsrc/menu/progs.inc
+++ b/qcsrc/menu/progs.inc
@@ -1,7 +1,11 @@
 #include <lib/_all.inc>
 
 #if XONOTIC
-#include <menu/_all.inc>
+
+#include "_mod.inc"
+
+#include <common/_all.inc>
+
 #endif
 
 #ifdef BUILD_MOD
-- 
2.39.2