From 3f4b026071412a964d86ca954a1013adccbc9017 Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Mon, 21 Sep 2020 14:01:19 +0200
Subject: [PATCH] Header cleanup.

---
 CInterface/Core.hpp       | 1 -
 src/Enum.hpp              | 1 +
 src/String/StringView.hpp | 3 +--
 tests/EnumTests.cpp       | 4 +++-
 tests/StringViewTests.cpp | 6 +++++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CInterface/Core.hpp b/CInterface/Core.hpp
index e14f416..a0c7394 100644
--- a/CInterface/Core.hpp
+++ b/CInterface/Core.hpp
@@ -1,7 +1,6 @@
 #ifndef ARBUTILS_CORE_HPP
 #define ARBUTILS_CORE_HPP
 
-#include <cstring>
 #include <exception>
 #include <string>
 #include "../src/Exception.hpp"
diff --git a/src/Enum.hpp b/src/Enum.hpp
index 9458280..3f4e384 100644
--- a/src/Enum.hpp
+++ b/src/Enum.hpp
@@ -5,6 +5,7 @@
 #include <vector>
 #include "MacroUtils.hpp"
 #include "StringView.hpp"
+#include <variant>
 
 #define ENUM_VALUE(x, value) x = value,
 #
diff --git a/src/String/StringView.hpp b/src/String/StringView.hpp
index 22c55c6..510e7a0 100644
--- a/src/String/StringView.hpp
+++ b/src/String/StringView.hpp
@@ -1,12 +1,11 @@
 #ifndef ARBUTILS_STRINGVIEW_HPP
 #define ARBUTILS_STRINGVIEW_HPP
 
-#include <atomic>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
 #include <memory>
-#include <string>
+#include <string_view>
 #include "BasicStringView.hpp"
 
 #if WINDOWS
diff --git a/tests/EnumTests.cpp b/tests/EnumTests.cpp
index e92d51b..4ef825e 100644
--- a/tests/EnumTests.cpp
+++ b/tests/EnumTests.cpp
@@ -1,7 +1,9 @@
 #ifdef TESTS_BUILD
-#include <cstring>
+#include <stdint.h>
+#include <vector>
 #include "../extern/catch.hpp"
 #include "../src/Enum.hpp"
+#include "../src/MacroUtils.hpp"
 
 ENUM(TestEnum, uint8_t, Val1, Val2, Val3)
 
diff --git a/tests/StringViewTests.cpp b/tests/StringViewTests.cpp
index 8eb2ef8..2475cab 100644
--- a/tests/StringViewTests.cpp
+++ b/tests/StringViewTests.cpp
@@ -1,9 +1,13 @@
 #ifdef TESTS_BUILD
 #include <cstring>
 #include <sstream>
+#include <stdint.h>
+#include <string>
 #include <unordered_map>
 #include "../extern/catch.hpp"
-#include "../src/StringView.hpp"
+#include "../src/String/BasicStringView.hpp"
+#include "../src/String/StringView.hpp"
+#include "../src/String/StringViewLiteral.hpp"
 
 TEST_CASE("Initialize compile time", "[Utilities]") {
     static_assert("foo"_cnc.Length() == 3);