From c173a2dcd6f3e872a5e99e6268df545da8cfdbce Mon Sep 17 00:00:00 2001
From: GenericHeroGuy <genericheroguy@noreply.codeberg.org>
Date: Wed, 29 Oct 2025 23:34:44 +0100
Subject: [PATCH] Fix transitive dependencies on k_waypoint.h

---
 src/d_player.h         | 3 ---
 src/k_bot.cpp          | 1 +
 src/k_bot.h            | 1 -
 src/k_botitem.cpp      | 1 +
 src/k_hud.c            | 1 +
 src/lua_script.c       | 1 +
 src/lua_waypointslib.c | 1 +
 src/p_mobj.c           | 1 +
 src/p_saveg.c          | 1 +
 src/p_spec.c           | 1 +
 10 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/d_player.h b/src/d_player.h
index a69aad896..597392385 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -29,9 +29,6 @@
 // as commands per game tick.
 #include "d_ticcmd.h"
 
-// the player struct stores a waypoint for racing
-#include "k_waypoint.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/k_bot.cpp b/src/k_bot.cpp
index dee535ab8..2a4d02491 100644
--- a/src/k_bot.cpp
+++ b/src/k_bot.cpp
@@ -43,6 +43,7 @@
 #include "i_net.h" // doomcom
 #include "blan/b_soc.h"
 #include "v_video.h" // for debugging
+#include "k_waypoint.h"
 
 consvar_t cv_forcebots = CVAR_INIT ("kartforcebots", "Off", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
 consvar_t cv_botcontrol = CVAR_INIT ("kartbotcontrol", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL);
diff --git a/src/k_bot.h b/src/k_bot.h
index 0facb20af..f8002f61d 100644
--- a/src/k_bot.h
+++ b/src/k_bot.h
@@ -14,7 +14,6 @@
 #define __K_BOT__
 
 #include "typedef.h"
-#include "k_waypoint.h"
 #include "d_player.h"
 #include "r_defs.h"
 
diff --git a/src/k_botitem.cpp b/src/k_botitem.cpp
index 327f8274f..bcaccaea9 100644
--- a/src/k_botitem.cpp
+++ b/src/k_botitem.cpp
@@ -30,6 +30,7 @@
 #include "r_things.h" // numskins
 #include "m_easing.h"
 #include "k_odds.h"
+#include "k_waypoint.h"
 
 // Looks for players around the bot, and presses the item button
 // if there is one in range.
diff --git a/src/k_hud.c b/src/k_hud.c
index 30985c4ab..d0f0ac9fc 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -42,6 +42,7 @@
 #include "g_party.h"
 #include "h_timers.h"
 #include "k_bot.h" // K_DrawBotDebugger
+#include "k_waypoint.h"
 
 #define NUMPOSNUMS 10
 #define NUMPOSFRAMES 7 // White, three blues, three reds
diff --git a/src/lua_script.c b/src/lua_script.c
index 2292fa952..e8893178a 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -28,6 +28,7 @@
 #include "p_polyobj.h" // polyobj_t, PolyObjects
 #include "k_battle.h"
 #include "k_odds.h"
+#include "k_waypoint.h"
 #ifdef LUA_ALLOW_BYTECODE
 #include "d_netfil.h" // for LUA_DumpFile
 #endif
diff --git a/src/lua_waypointslib.c b/src/lua_waypointslib.c
index b45158600..15bc8ea00 100644
--- a/src/lua_waypointslib.c
+++ b/src/lua_waypointslib.c
@@ -17,6 +17,7 @@
 #include "lua_script.h"
 #include "lua_libs.h"
 #include "p_local.h"
+#include "k_waypoint.h" // lol
 
 enum waypointvars {
 	waypointvars_valid = 0,
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7dc1e28cd..81d423a5c 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -51,6 +51,7 @@
 #include "k_collide.h"
 #include "k_objects.h"
 #include "k_odds.h"
+#include "k_waypoint.h"
 
 // BlanKart
 #include "blan/b_soc.h"
diff --git a/src/p_saveg.c b/src/p_saveg.c
index 5d5c01140..1071ec083 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -44,6 +44,7 @@
 #include "k_odds.h"
 #include "acs/interface.h"
 #include "g_party.h"
+#include "k_waypoint.h"
 
 #include <tracy/tracy/TracyC.h>
 
diff --git a/src/p_spec.c b/src/p_spec.c
index f233307d6..0b60d1284 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -48,6 +48,7 @@
 #include "k_terrain.h"
 #include "acs/interface.h"
 #include "blan/b_soc.h"
+#include "k_waypoint.h"
 
 #ifdef HW3SOUND
 #include "hardware/hw3sound.h"