chore: source level tweaks and breaking API changes.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>

21 files changed, 44 insertions, 39 deletions

diff --git a/src/CompilerKit/AE.h b/src/CompilerKit/AE.h
index a1f56e6..a856689 100644
--- a/src/CompilerKit/AE.h
+++ b/src/CompilerKit/AE.h
@@ -11,6 +11,7 @@
 #define _NECTI_AE_H_
 
 #include <CompilerKit/Config.h>
+#include <fstream>
 
 #define kAEIdentVersion (0x0122)
 
diff --git a/src/CompilerKit/AST.h b/src/CompilerKit/AST.h
index 3cb5a08..fb38ac8 100644
--- a/src/CompilerKit/AST.h
+++ b/src/CompilerKit/AST.h
@@ -6,7 +6,8 @@
 
 #pragma once
 
-#include <CompilerKit/Compiler.h>
+#include <CompilerKit/CodeGenerator.h>
+#include <vector>
 
 #define CK_COMPILER_FRONTEND : public ::CompilerKit::CompilerFrontendInterface
 
diff --git a/src/CompilerKit/Compiler.h b/src/CompilerKit/CodeGenerator.h
index b02f1ef..f3f71d0 100644
--- a/src/CompilerKit/Compiler.h
+++ b/src/CompilerKit/CodeGenerator.h
@@ -9,6 +9,7 @@
 #include <CompilerKit/Config.h>
 #include <CompilerKit/Macros.h>
 #include <CompilerKit/StringKit.h>
+#include <cstring>
 
 #define CK_ASSEMBLY_INTERFACE : public ::CompilerKit::AssemblyInterface
 #define CK_ENCODER : public ::CompilerKit::EncoderInterface
diff --git a/src/CompilerKit/Config.h b/src/CompilerKit/Config.h
index 59efcf0..637d56e 100644
--- a/src/CompilerKit/Config.h
+++ b/src/CompilerKit/Config.h
@@ -56,18 +56,29 @@
 #include <signal.h>
 #include <unistd.h>
 #include <cassert>
-#include <cctype>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
-#include <filesystem>
-#include <fstream>
-#include <iostream>
-#include <memory>
-#include <new>
+#include <time.h>
 #include <string>
-#include <utility>
-#include <vector>
+#include <stdint.h>
+
+#define kDistVersion "v0.0.7-compilerkit"
+#define kDistVersionBCD 0x0002
+
+#define ToString(X) Stringify(X)
+#define Stringify(X) #X
+
+#define kDistRelease ToString(kDistReleaseBranch)
+
+#ifndef kDistRelease
+
+#define kDistVersion "v0.0.7-compilerkit"
+#define kDistVersionBCD 0x0002
+
+#define ToString(X) Stringify(X)
+#define Stringify(X) #X
+
+#define kDistRelease ToString(kDistReleaseBranch)
+
+#endif // !kDistRelease
 
 #define nullPtr std::nullptr_t
 
diff --git a/src/CompilerKit/ErrorOr.h b/src/CompilerKit/ErrorOr.h
index 54c1c45..9e1e801 100644
--- a/src/CompilerKit/ErrorOr.h
+++ b/src/CompilerKit/ErrorOr.h
@@ -18,7 +18,6 @@
 #include <CompilerKit/Config.h>
 #include <CompilerKit/ErrorID.h>
 #include <CompilerKit/Ref.h>
-#include <CompilerKit/StringKit.h>
 
 namespace CompilerKit {
 using ErrorT = Int32;
diff --git a/src/CompilerKit/PEF.h b/src/CompilerKit/PEF.h
index f69102a..ad47efd 100644
--- a/src/CompilerKit/PEF.h
+++ b/src/CompilerKit/PEF.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <CompilerKit/Config.h>
+#include <fstream>
 
 // @file PEF.h
 // @brief Preferred Executable Format
diff --git a/src/CompilerKit/StringKit.h b/src/CompilerKit/StringKit.h
index e4bc1c1..4f07a07 100644
--- a/src/CompilerKit/StringKit.h
+++ b/src/CompilerKit/StringKit.h
@@ -12,6 +12,7 @@
 
 #include <CompilerKit/Config.h>
 #include <CompilerKit/ErrorOr.h>
+#include <cstring>
 
 /// =========================================================== ///
 /// @file StringKit.h
diff --git a/src/CompilerKit/Version.h b/src/CompilerKit/Version.h
deleted file mode 100644
index efd174c..0000000
--- a/src/CompilerKit/Version.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ========================================
-
-  Copyright (C) 2024-2025 Amlal El Mahrouss, Licensed under the Apache 2.0 license
-
-======================================== */
-
-#pragma once
-
-#define kDistVersion "v0.0.7-compilerkit"
-#define kDistVersionBCD 0x0002
-
-#define ToString(X) Stringify(X)
-#define Stringify(X) #X
-
-#define kDistRelease ToString(kDistReleaseBranch)
diff --git a/src/CompilerKit/impl/32x0.h b/src/CompilerKit/impl/32x0.h
index 5996708..f55e4a6 100644
--- a/src/CompilerKit/impl/32x0.h
+++ b/src/CompilerKit/impl/32x0.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <CompilerKit/Config.h>
+#include <vector>
 
 // @brief Open32x0 support.
 // @file impl/32x0.h
diff --git a/src/CompilerKit/impl/X64.h b/src/CompilerKit/impl/X64.h
index e69d509..f97812d 100644
--- a/src/CompilerKit/impl/X64.h
+++ b/src/CompilerKit/impl/X64.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <CompilerKit/Config.h>
+#include <vector>
 
 // @brief AMD64 support.
 // @file impl/X64.h
diff --git a/src/CompilerKit/src/AssemblyFactory.cc b/src/CompilerKit/src/AssemblyFactory.cc
index 185c522..f386083 100644
--- a/src/CompilerKit/src/AssemblyFactory.cc
+++ b/src/CompilerKit/src/AssemblyFactory.cc
@@ -4,7 +4,7 @@
 
 ======================================== */
 
-#include <CompilerKit/Compiler.h>
+#include <CompilerKit/CodeGenerator.h>
 #include <CompilerKit/ErrorID.h>
 
 /**
diff --git a/src/CompilerKit/src/Backend/AssemblerARM64.cc b/src/CompilerKit/src/Backend/AssemblerARM64.cc
index 6aa8dea..2114fe6 100644
--- a/src/CompilerKit/src/Backend/AssemblerARM64.cc
+++ b/src/CompilerKit/src/Backend/AssemblerARM64.cc
@@ -23,7 +23,7 @@
 #include <CompilerKit/AST.h>
 #include <CompilerKit/ErrorID.h>
 #include <CompilerKit/PEF.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <CompilerKit/impl/Aarch64.h>
 #include <CompilerKit/utils/AsmUtils.h>
 #include <algorithm>
diff --git a/src/CompilerKit/src/Backend/AssemblerPowerPC.cc b/src/CompilerKit/src/Backend/AssemblerPowerPC.cc
index a845f8b..5da36cf 100644
--- a/src/CompilerKit/src/Backend/AssemblerPowerPC.cc
+++ b/src/CompilerKit/src/Backend/AssemblerPowerPC.cc
@@ -23,7 +23,7 @@
 #include <CompilerKit/AST.h>
 #include <CompilerKit/ErrorID.h>
 #include <CompilerKit/PEF.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <CompilerKit/impl/PowerPC.h>
 #include <CompilerKit/utils/AsmUtils.h>
 #include <algorithm>
diff --git a/src/CompilerKit/src/Frontend/CCompiler64x0.cc b/src/CompilerKit/src/Frontend/CCompiler64x0.cc
index ecc2c34..45306d7 100644
--- a/src/CompilerKit/src/Frontend/CCompiler64x0.cc
+++ b/src/CompilerKit/src/Frontend/CCompiler64x0.cc
@@ -1185,7 +1185,7 @@ class AssemblyCCInterface final CK_ASSEMBLY_INTERFACE {
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 
 #define kPrintF printf
 #define kSplashCxx() kPrintF(kWhite "NeCTI C Driver, %s, (c) Amlal El Mahrouss\n", kDistVersion)
diff --git a/src/CompilerKit/src/Frontend/CCompilerARM64.cc b/src/CompilerKit/src/Frontend/CCompilerARM64.cc
index 665c02d..b519193 100644
--- a/src/CompilerKit/src/Frontend/CCompilerARM64.cc
+++ b/src/CompilerKit/src/Frontend/CCompilerARM64.cc
@@ -1184,7 +1184,7 @@ class AssemblyCCInterface final CK_ASSEMBLY_INTERFACE {
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 
 #define kPrintF printf
 #define kSplashCxx() kPrintF(kWhite "NeCTI C Driver, %s, (c) Amlal El Mahrouss\n", kDistVersion)
diff --git a/src/CompilerKit/src/Frontend/CCompilerPower64.cc b/src/CompilerKit/src/Frontend/CCompilerPower64.cc
index 8a1a943..f67040d 100644
--- a/src/CompilerKit/src/Frontend/CCompilerPower64.cc
+++ b/src/CompilerKit/src/Frontend/CCompilerPower64.cc
@@ -1202,7 +1202,7 @@ class AssemblyMountpointCLang final CK_ASSEMBLY_INTERFACE {
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 
 #define kPrintF printf
 #define kSplashCxx() kPrintF(kWhite "cc, %s, (c) Amlal El Mahrouss\n", kDistVersion)
diff --git a/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc b/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc
index c0addff..8cc5af0 100644
--- a/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc
+++ b/src/CompilerKit/src/Frontend/CPlusPlusCompilerAMD64.cc
@@ -38,6 +38,7 @@
 #include <CompilerKit/utils/CompilerUtils.h>
 #include <csignal>
 #include <cstdlib>
+#include <filesystem>
 
 /* NeKernel C++ Compiler Driver */
 /* This is part of the CompilerKit. */
diff --git a/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc b/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc
index 7c56624..8c49601 100644
--- a/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc
+++ b/src/CompilerKit/src/Linker/DynamicLinker64PEF.cc
@@ -14,13 +14,14 @@
 /// It will be loaded when the program loader will start the image.
 
 #include <CompilerKit/AE.h>
-#include <CompilerKit/Compiler.h>
+#include <CompilerKit/CodeGenerator.h>
 #include <CompilerKit/Config.h>
 #include <CompilerKit/ErrorID.h>
 #include <CompilerKit/PEF.h>
 #include <CompilerKit/UUID.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <CompilerKit/utils/CompilerUtils.h>
+#include <filesystem>
 
 #define kLinkerVersionStr "NeCTI 64-Bit Linker (Preferred Executable Format)"
 
diff --git a/src/CompilerKit/src/StringKit.cc b/src/CompilerKit/src/StringKit.cc
index 95326bc..b3584e7 100644
--- a/src/CompilerKit/src/StringKit.cc
+++ b/src/CompilerKit/src/StringKit.cc
@@ -19,6 +19,7 @@
  */
 
 #include <CompilerKit/StringKit.h>
+#include <stdexcept>
 
 namespace CompilerKit {
 
diff --git a/src/CompilerKit/utils/AsmUtils.h b/src/CompilerKit/utils/AsmUtils.h
index 40fa133..2cde706 100644
--- a/src/CompilerKit/utils/AsmUtils.h
+++ b/src/CompilerKit/utils/AsmUtils.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <CompilerKit/AST.h>
-#include <CompilerKit/Compiler.h>
+#include <CompilerKit/CodeGenerator.h>
 #include <CompilerKit/utils/CompilerUtils.h>
 
 using namespace CompilerKit;
diff --git a/src/CompilerKit/utils/CompilerUtils.h b/src/CompilerKit/utils/CompilerUtils.h
index 8ae6291..e24ee37 100644
--- a/src/CompilerKit/utils/CompilerUtils.h
+++ b/src/CompilerKit/utils/CompilerUtils.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include <CompilerKit/AST.h>
-#include <CompilerKit/Compiler.h>
+#include <CompilerKit/CodeGenerator.h>
 #include <CompilerKit/ErrorID.h>
-#include <CompilerKit/Version.h>
+#include <CompilerKit/Config.h>
 #include <ThirdParty/Dialogs.h>
 #include <iostream>