Merge pull request #34 from OpenVicProject/fix/includes

15 files changed, 3 insertions, 25 deletions

diff --git a/include/openvic-dataloader/csv/LineObject.hpp b/include/openvic-dataloader/csv/LineObject.hpp
index c6d8e2a..6366c71 100644
--- a/include/openvic-dataloader/csv/LineObject.hpp
+++ b/include/openvic-dataloader/csv/LineObject.hpp
@@ -8,7 +8,6 @@
 #include <initializer_list>
 #include <optional>
 #include <ostream>
-#include <set>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/include/openvic-dataloader/csv/Parser.hpp b/include/openvic-dataloader/csv/Parser.hpp
index fffd92a..aa2a0fe 100644
--- a/include/openvic-dataloader/csv/Parser.hpp
+++ b/include/openvic-dataloader/csv/Parser.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <filesystem>
+
 #include <openvic-dataloader/csv/LineObject.hpp>
 #include <openvic-dataloader/detail/BasicParser.hpp>
 
diff --git a/include/openvic-dataloader/detail/BasicParser.hpp b/include/openvic-dataloader/detail/BasicParser.hpp
index 5493804..1e2fd14 100644
--- a/include/openvic-dataloader/detail/BasicParser.hpp
+++ b/include/openvic-dataloader/detail/BasicParser.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <filesystem>
-#include <optional>
-#include <string_view>
 #include <vector>
 
 #include <openvic-dataloader/ParseError.hpp>
diff --git a/include/openvic-dataloader/detail/Concepts.hpp b/include/openvic-dataloader/detail/Concepts.hpp
index 3e1c785..3ca210c 100644
--- a/include/openvic-dataloader/detail/Concepts.hpp
+++ b/include/openvic-dataloader/detail/Concepts.hpp
@@ -2,7 +2,6 @@
 
 #include <concepts>
 #include <optional>
-#include <type_traits>
 #include <utility>
 
 #include <openvic-dataloader/ParseError.hpp>
diff --git a/include/openvic-dataloader/v2script/Parser.hpp b/include/openvic-dataloader/v2script/Parser.hpp
index 5e9717f..885946d 100644
--- a/include/openvic-dataloader/v2script/Parser.hpp
+++ b/include/openvic-dataloader/v2script/Parser.hpp
@@ -2,12 +2,8 @@
 
 #include <cstddef>
 #include <filesystem>
-#include <functional>
 #include <memory>
-#include <optional>
-#include <ostream>
 #include <string_view>
-#include <vector>
 
 #include <openvic-dataloader/ParseError.hpp>
 #include <openvic-dataloader/ParseWarning.hpp>
diff --git a/src/headless/main.cpp b/src/headless/main.cpp
index 1f0b4c3..688b479 100644
--- a/src/headless/main.cpp
+++ b/src/headless/main.cpp
@@ -4,9 +4,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <iterator>
-#include <string>
 #include <string_view>
-#include <vector>
 
 #include <openvic-dataloader/ParseWarning.hpp>
 #include <openvic-dataloader/csv/LineObject.hpp>
diff --git a/src/openvic-dataloader/csv/Parser.cpp b/src/openvic-dataloader/csv/Parser.cpp
index 14ef553..0ca3402 100644
--- a/src/openvic-dataloader/csv/Parser.cpp
+++ b/src/openvic-dataloader/csv/Parser.cpp
@@ -12,7 +12,6 @@
 
 #include "csv/CsvGrammar.hpp"
 #include "detail/BasicBufferHandler.hpp"
-#include "detail/Errors.hpp"
 #include "detail/LexyReportError.hpp"
 #include "detail/OStreamOutputIterator.hpp"
 
diff --git a/src/openvic-dataloader/detail/LexyReportError.hpp b/src/openvic-dataloader/detail/LexyReportError.hpp
index 684b5db..9629963 100644
--- a/src/openvic-dataloader/detail/LexyReportError.hpp
+++ b/src/openvic-dataloader/detail/LexyReportError.hpp
@@ -2,7 +2,6 @@
 
 #include <cstddef>
 #include <sstream>
-#include <string>
 #include <utility>
 #include <vector>
 
diff --git a/src/openvic-dataloader/detail/Warnings.hpp b/src/openvic-dataloader/detail/Warnings.hpp
index fc0fbed..6c0b34e 100644
--- a/src/openvic-dataloader/detail/Warnings.hpp
+++ b/src/openvic-dataloader/detail/Warnings.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-dataloader/v2script/Parser.hpp"
+#include <openvic-dataloader/v2script/Parser.hpp>
 
 namespace ovdl::v2script::warnings {
 	inline const ParseWarning make_utf8_warning(const char* file_path) {
diff --git a/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp b/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp
index 45150cb..182d559 100644
--- a/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp
+++ b/src/openvic-dataloader/v2script/AbstractSyntaxTree.cpp
@@ -1,4 +1,3 @@
-#include <concepts>
 #include <iomanip>
 #include <sstream>
 #include <string>
diff --git a/src/openvic-dataloader/v2script/AiBehaviorGrammar.hpp b/src/openvic-dataloader/v2script/AiBehaviorGrammar.hpp
index 012820f..e04f447 100644
--- a/src/openvic-dataloader/v2script/AiBehaviorGrammar.hpp
+++ b/src/openvic-dataloader/v2script/AiBehaviorGrammar.hpp
@@ -5,8 +5,6 @@
 #include <lexy/dsl.hpp>
 
 #include "ModifierGrammar.hpp"
-#include "SimpleGrammar.hpp"
-#include "TriggerGrammar.hpp"
 
 namespace ovdl::v2script::grammar {
 	struct AiBehaviorList {
diff --git a/src/openvic-dataloader/v2script/DecisionGrammar.hpp b/src/openvic-dataloader/v2script/DecisionGrammar.hpp
index a1c1e3e..3bd5cba 100644
--- a/src/openvic-dataloader/v2script/DecisionGrammar.hpp
+++ b/src/openvic-dataloader/v2script/DecisionGrammar.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <memory>
-#include <string>
 #include <vector>
 
 #include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp>
@@ -13,7 +11,6 @@
 #include <lexy/dsl/option.hpp>
 
 #include "AiBehaviorGrammar.hpp"
-#include "EffectGrammar.hpp"
 #include "SimpleGrammar.hpp"
 #include "TriggerGrammar.hpp"
 
diff --git a/src/openvic-dataloader/v2script/EventGrammar.hpp b/src/openvic-dataloader/v2script/EventGrammar.hpp
index e6e4c02..57cd170 100644
--- a/src/openvic-dataloader/v2script/EventGrammar.hpp
+++ b/src/openvic-dataloader/v2script/EventGrammar.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <string>
 #include <vector>
 
diff --git a/src/openvic-dataloader/v2script/Parser.cpp b/src/openvic-dataloader/v2script/Parser.cpp
index 3386e48..c46d326 100644
--- a/src/openvic-dataloader/v2script/Parser.cpp
+++ b/src/openvic-dataloader/v2script/Parser.cpp
@@ -1,7 +1,6 @@
 #include "openvic-dataloader/v2script/Parser.hpp"
 
 #include <functional>
-#include <iostream>
 #include <memory>
 #include <optional>
 #include <string>
@@ -23,9 +22,7 @@
 
 #include "detail/BasicBufferHandler.hpp"
 #include "detail/DetectUtf8.hpp"
-#include "detail/Errors.hpp"
 #include "detail/LexyReportError.hpp"
-#include "detail/NullBuff.hpp"
 #include "detail/OStreamOutputIterator.hpp"
 #include "detail/Warnings.hpp"
 #include "v2script/DecisionGrammar.hpp"
diff --git a/src/openvic-dataloader/v2script/SimpleGrammar.hpp b/src/openvic-dataloader/v2script/SimpleGrammar.hpp
index 99bbfca..e89f794 100644
--- a/src/openvic-dataloader/v2script/SimpleGrammar.hpp
+++ b/src/openvic-dataloader/v2script/SimpleGrammar.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <string>
 #include <vector>