From a94772b0c477bbab2ccc2475957f2b2c559732f3 Mon Sep 17 00:00:00 2001
From: Tau <tau@nowhere>
Date: Tue, 5 Nov 2019 20:11:25 -0500
Subject: [PATCH] Shift hook DLL config structs around

---
 chunihook/config.c |  4 ++++
 chunihook/config.h | 12 +++++-------
 chunihook/slider.c |  1 -
 chunihook/slider.h |  6 +++++-
 divahook/config.c  |  3 +++
 divahook/config.h  |  6 ++++--
 idzhook/config.c   |  3 +++
 idzhook/config.h   | 10 ++++------
 idzhook/zinput.h   |  6 +++++-
 9 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/chunihook/config.c b/chunihook/config.c
index 20bb33f..66b3dc4 100644
--- a/chunihook/config.c
+++ b/chunihook/config.c
@@ -4,15 +4,19 @@
 #include <stdbool.h>
 #include <stddef.h>
 
+#include "amex/amex.h"
 #include "amex/config.h"
 
 #include "board/config.h"
+#include "board/sg-reader.h"
 
 #include "chunihook/config.h"
 
 #include "hooklib/config.h"
+#include "hooklib/gfx.h"
 
 #include "platform/config.h"
+#include "platform/platform.h"
 
 void slider_config_load(struct slider_config *cfg, const wchar_t *filename)
 {
diff --git a/chunihook/config.h b/chunihook/config.h
index 4b7a683..8d9e66d 100644
--- a/chunihook/config.h
+++ b/chunihook/config.h
@@ -3,17 +3,15 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "amex/config.h"
+#include "amex/amex.h"
 
-#include "board/config.h"
+#include "board/sg-reader.h"
 
-#include "hooklib/config.h"
+#include "chunihook/slider.h"
 
-#include "platform/config.h"
+#include "hooklib/gfx.h"
 
-struct slider_config {
-    bool enable;
-};
+#include "platform/platform.h"
 
 struct chuni_hook_config {
     struct platform_config platform;
diff --git a/chunihook/slider.c b/chunihook/slider.c
index b9a89e2..13b9850 100644
--- a/chunihook/slider.c
+++ b/chunihook/slider.c
@@ -9,7 +9,6 @@
 #include "board/slider-cmd.h"
 #include "board/slider-frame.h"
 
-#include "chunihook/config.h"
 #include "chunihook/slider.h"
 
 #include "chuniio/chuniio.h"
diff --git a/chunihook/slider.h b/chunihook/slider.h
index 1277fc0..7053e04 100644
--- a/chunihook/slider.h
+++ b/chunihook/slider.h
@@ -2,6 +2,10 @@
 
 #include <windows.h>
 
-#include "chunihook/config.h"
+#include <stdbool.h>
+
+struct slider_config {
+    bool enable;
+};
 
 HRESULT slider_hook_init(const struct slider_config *cfg);
diff --git a/divahook/config.c b/divahook/config.c
index b72b1a0..1b52c3e 100644
--- a/divahook/config.c
+++ b/divahook/config.c
@@ -1,13 +1,16 @@
 #include <assert.h>
 #include <stddef.h>
 
+#include "amex/amex.h"
 #include "amex/config.h"
 
 #include "board/config.h"
+#include "board/sg-reader.h"
 
 #include "divahook/config.h"
 
 #include "platform/config.h"
+#include "platform/platform.h"
 
 void diva_hook_config_load(
         struct diva_hook_config *cfg,
diff --git a/divahook/config.h b/divahook/config.h
index d71bb79..c7ca22f 100644
--- a/divahook/config.h
+++ b/divahook/config.h
@@ -2,9 +2,11 @@
 
 #include <stddef.h>
 
-#include "amex/config.h"
+#include "amex/amex.h"
 
-#include "platform/config.h"
+#include "board/sg-reader.h"
+
+#include "platform/platform.h"
 
 struct diva_hook_config {
     struct platform_config platform;
diff --git a/idzhook/config.c b/idzhook/config.c
index 0331504..2987584 100644
--- a/idzhook/config.c
+++ b/idzhook/config.c
@@ -1,13 +1,16 @@
 #include <assert.h>
 #include <stddef.h>
 
+#include "amex/amex.h"
 #include "amex/config.h"
 
 #include "board/config.h"
+#include "board/sg-reader.h"
 
 #include "idzhook/config.h"
 
 #include "platform/config.h"
+#include "platform/platform.h"
 
 void idz_hook_config_load(
         struct idz_hook_config *cfg,
diff --git a/idzhook/config.h b/idzhook/config.h
index 6e3acdd..a93cb11 100644
--- a/idzhook/config.h
+++ b/idzhook/config.h
@@ -3,15 +3,13 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "amex/config.h"
+#include "amex/amex.h"
 
-#include "board/config.h"
+#include "board/sg-reader.h"
 
-#include "platform/config.h"
+#include "idzhook/zinput.h"
 
-struct zinput_config {
-    bool enable;
-};
+#include "platform/platform.h"
 
 struct idz_hook_config {
     struct platform_config platform;
diff --git a/idzhook/zinput.h b/idzhook/zinput.h
index cea1b37..13a46cd 100644
--- a/idzhook/zinput.h
+++ b/idzhook/zinput.h
@@ -2,6 +2,10 @@
 
 #include <windows.h>
 
-#include "idzhook/config.h"
+#include <stdbool.h>
+
+struct zinput_config {
+    bool enable;
+};
 
 HRESULT zinput_hook_init(struct zinput_config *cfg);