From f7026401ce24e0ed12295d663dc5541d30059619 Mon Sep 17 00:00:00 2001
From: Spartan322 <Megacake1234@gmail.com>
Date: Wed, 7 Oct 2026 04:39:21 -0400
Subject: [PATCH] Remove broken private include shortcut

The private include breaks header inclusion for downstream uses
This also prevents include-what-you-use's header insert feature from shortening header paths
---
 CMakeLists.txt                                  | 1 -
 src/openvic-simulation/map/ProvinceInstance.cpp | 2 +-
 src/openvic-simulation/testing/Requirement.cpp  | 2 +-
 src/openvic-simulation/testing/TestScript.cpp   | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e07ded069..dcade9f5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,6 @@ set(sim_gen_dir ${CMAKE_CURRENT_BINARY_DIR}/gen-include)
 target_include_directories(
     openvic-simulation
     PUBLIC src $<BUILD_INTERFACE:${sim_gen_dir}>
-    PRIVATE src/openvic-simulation
 )
 
 openvic_generate_commit_info(
diff --git a/src/openvic-simulation/map/ProvinceInstance.cpp b/src/openvic-simulation/map/ProvinceInstance.cpp
index aa058883b..14bdb6d3e 100644
--- a/src/openvic-simulation/map/ProvinceInstance.cpp
+++ b/src/openvic-simulation/map/ProvinceInstance.cpp
@@ -1,6 +1,5 @@
 #include "ProvinceInstance.hpp"
 #include "ProvinceInstanceDeps.hpp"
-#include "population/PopsAggregateDeps.hpp"
 
 #include <type_traits>
 
@@ -16,6 +15,7 @@
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
 #include "openvic-simulation/modifier/StaticModifierCache.hpp"
+#include "openvic-simulation/population/PopsAggregateDeps.hpp"
 #include "openvic-simulation/types/ConstructorTags.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
diff --git a/src/openvic-simulation/testing/Requirement.cpp b/src/openvic-simulation/testing/Requirement.cpp
index eb48f5b7e..7ff4e6415 100644
--- a/src/openvic-simulation/testing/Requirement.cpp
+++ b/src/openvic-simulation/testing/Requirement.cpp
@@ -1,4 +1,4 @@
-#include <testing/Requirement.hpp>
+#include "Requirement.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/testing/TestScript.cpp b/src/openvic-simulation/testing/TestScript.cpp
index 58959918c..f9d01f439 100644
--- a/src/openvic-simulation/testing/TestScript.cpp
+++ b/src/openvic-simulation/testing/TestScript.cpp
@@ -1,7 +1,7 @@
 #include <memory>
 
-#include <testing/Requirement.hpp>
-#include <testing/TestScript.hpp>
+#include "openvic-simulation/testing/Requirement.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 using namespace OpenVic;