Remove unnecessary headers in favor of directory headers (#800)

mm/2s2h/BenGui/BenMenuBar.cpp

@@ -8,13 +8,7 @@
 #include <unordered_map>
 #include <string>
 #include "2s2h/Enhancements/Enhancements.h"
-#include "2s2h/Enhancements/Graphics/3DItemDrops.h"
-#include "2s2h/Enhancements/Graphics/MotionBlur.h"
-#include "2s2h/Enhancements/Graphics/PlayAsKafei.h"
-#include "2s2h/Enhancements/Modes/TimeMovesWhenYouMove.h"
 #include "2s2h/DeveloperTools/DeveloperTools.h"
-#include "2s2h/Enhancements/Cheats/Cheats.h"
-#include "2s2h/Enhancements/Player/Player.h"
 #include "HudEditor.h"
 
 extern "C" {

mm/2s2h/BenGui/Menu.cpp

@@ -4,8 +4,6 @@
 #include "UIWidgets.hpp"
 #include "graphic/Fast3D/gfx_rendering_api.h"
 #include "2s2h/Enhancements/Enhancements.h"
-#include "2s2h/Enhancements/Graphics/MotionBlur.h"
-#include "2s2h/Enhancements/Graphics/PlayAsKafei.h"
 #include "2s2h/DeveloperTools/DeveloperTools.h"
 #include "window/gui/GuiMenuBar.h"
 #include "window/gui/GuiElement.h"

mm/2s2h/BenGui/SearchableMenuItems.h

@@ -1,6 +1,5 @@
 #include "2s2h/Enhancements/Enhancements.h"
 #include "2s2h/DeveloperTools/DeveloperTools.h"
-#include "2s2h/Enhancements/Graphics/3DItemDrops.h"
 #include "UIWidgets.hpp"
 #include "BenMenuBar.h"
 #include "macros.h"

mm/2s2h/Enhancements/Camera/Camera.h

@@ -0,0 +1,8 @@
+#ifndef CAMERA_H
+#define CAMERA_H
+
+void RegisterCameraInterpolationFixes();
+void RegisterDebugCam();
+void RegisterCameraFreeLook();
+
+#endif // CAMERA_H

mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.cpp

@@ -1,4 +1,4 @@
-#include "CameraInterpolationFixes.h"
+#include "Camera.h"
 #include <libultraship/bridge.h>
 #include "Enhancements/GameInteractor/GameInteractor.h"
 #include "CameraUtils.h"

mm/2s2h/Enhancements/Camera/CameraInterpolationFixes.h

@@ -1,6 +0,0 @@
-#ifndef CAMERA_INTERPOLATE_FIXES_H
-#define CAMERA_INTERPOLATE_FIXES_H
-
-void RegisterCameraInterpolationFixes();
-
-#endif // CAMERA_INTERPOLATE_FIXES_H

mm/2s2h/Enhancements/Camera/DebugCam.cpp

@@ -1,4 +1,3 @@
-#include "DebugCam.h"
 #include <libultraship/bridge.h>
 #include "Enhancements/GameInteractor/GameInteractor.h"
 #include "CameraUtils.h"

mm/2s2h/Enhancements/Camera/DebugCam.h

@@ -1,6 +0,0 @@
-#ifndef FREE_CAM_H
-#define FREE_CAM_H
-
-void RegisterDebugCam();
-
-#endif // FREE_CAM_H

mm/2s2h/Enhancements/Camera/FreeLook.cpp

@@ -1,4 +1,3 @@
-#include "FreeLook.h"
 #include <libultraship/bridge.h>
 #include "Enhancements/GameInteractor/GameInteractor.h"
 #include "CameraUtils.h"

mm/2s2h/Enhancements/Camera/FreeLook.h

@@ -1,6 +0,0 @@
-#ifndef FREE_LOOK_H
-#define FREE_LOOK_H
-
-void RegisterCameraFreeLook();
-
-#endif // FREE_LOOK_H

mm/2s2h/Enhancements/Cheats/Cheats.h

@@ -1,6 +1,11 @@
 #ifndef CHEATS_H
 #define CHEATS_H
 
+void RegisterInfiniteCheats();
 void RegisterLongerFlowerGlide();
+void RegisterMoonJumpOnL();
+void RegisterTimeStopInTemples();
+void RegisterUnbreakableRazorSword();
+void RegisterUnrestrictedItems();
 
 #endif // CHEATS_H

mm/2s2h/Enhancements/Cheats/Infinite.cpp

@@ -1,4 +1,3 @@
-#include "Infinite.h"
 #include <libultraship/bridge.h>
 #include "Enhancements/GameInteractor/GameInteractor.h"
 #include "variables.h"

mm/2s2h/Enhancements/Cheats/Infinite.h

@@ -1,6 +0,0 @@
-#ifndef CHEATS_INFINITE_H
-#define CHEATS_INFINITE_H
-
-void RegisterInfiniteCheats();
-
-#endif // CHEATS_INFINITE_H

mm/2s2h/Enhancements/Cheats/MoonJump.cpp

@@ -1,4 +1,3 @@
-#include "MoonJump.h"
 #include <libultraship/bridge.h>
 #include "Enhancements/GameInteractor/GameInteractor.h"
 #include "variables.h"

mm/2s2h/Enhancements/Cheats/MoonJump.h

@@ -1,6 +0,0 @@
-#ifndef CHEATS_MOONJUMP_H
-#define CHEATS_MOONJUMP_H
-
-void RegisterMoonJumpOnL();
-
-#endif // CHEATS_MOONJUMP_H

mm/2s2h/Enhancements/Cheats/TimeStop.h

@@ -1,6 +0,0 @@
-#ifndef CHEATS_TIME_STOPS_H
-#define CHEATS_TIME_STOPS_H
-
-void RegisterTimeStopInTemples();
-
-#endif // CHEATS_TIME_STOPS_H

mm/2s2h/Enhancements/Cheats/UnbreakableRazorSword.h

@@ -1,6 +0,0 @@
-#ifndef CHEATS_UNBREAKABLE_RAZOR_SWORD_H
-#define CHEATS_UNBREAKABLE_RAZOR_SWORD_H
-
-void RegisterUnbreakableRazorSword();
-
-#endif // CHEATS_UNBREAKABLE_RAZOR_SWORD_H

mm/2s2h/Enhancements/Cheats/UnrestrictedItems.h

@@ -1,6 +0,0 @@
-#ifndef CHEATS_UNRESTRICTED_ITEMS_H
-#define CHEATS_UNRESTRICTED_ITEMS_H
-
-void RegisterUnrestrictedItems();
-
-#endif // CHEATS_UNRESTRICTED_ITEMS_H

mm/2s2h/Enhancements/Cycle/Cycle.h

@@ -0,0 +1,6 @@
+#ifndef CYCLE_H
+#define CYCLE_H
+
+void RegisterEndOfCycleSaveHooks();
+
+#endif // CYCLE_H

mm/2s2h/Enhancements/Cycle/EndOfCycle.h

@@ -1,6 +0,0 @@
-#ifndef CYCLES_END_H
-#define CYCLES_END_H
-
-void RegisterEndOfCycleSaveHooks();
-
-#endif // CYCLES_END_H