Major refactor, bump.

Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>

51 files changed, 71 insertions, 71 deletions

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index a708ead..7cfae59 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,7 +3,7 @@
     {
       "name": "Macintosh (CLang)",
       "includePath": [
-        "${workspaceFolder}/ndkdll/**",
+        "${workspaceFolder}/NDK/**",
         "${workspaceFolder}/Sources/Detail/**",
         "${workspaceFolder}/**"
       ],
@@ -16,7 +16,7 @@
     {
       "name": "Windows (Cygwin)",
       "includePath": [
-        "${workspaceFolder}/ndkdll/**",
+        "${workspaceFolder}/NDK/**",
         "${workspaceFolder}/Sources/Detail/**",
         "${workspaceFolder}/**"
       ],
diff --git a/build-unix.json b/build-unix.json
index 3eb1269..685d8d5 100644
--- a/build-unix.json
+++ b/build-unix.json
@@ -1,8 +1,8 @@
 {
   "compiler_path": "g++",
   "compiler_std": "c++20",
-  "headers_path": ["./dev/ndkdll", "./dev", "./dev/ndkdll/Sources/Detail"],
-  "sources_path": ["dev/ndkdll/Sources/*.cxx"],
+  "headers_path": ["./dev/NDK", "./dev", "./dev/NDK/Sources/Detail"],
+  "sources_path": ["dev/NDK/Sources/*.cxx"],
   "output_name": "/usr/local/lib/libndk.dylib",
   "compiler_flags": ["-fPIC", "-shared", "-fPIC"],
   "cpp_macros": ["__NDK_DLL__=202401"]
diff --git a/build.json b/build.json
index 29b108c..9eddf04 100644
--- a/build.json
+++ b/build.json
@@ -1,8 +1,8 @@
 {
   "compiler_path": "x86_64-w64-mingw32-g++.exe",
   "compiler_std": "c++20",
-  "headers_path": ["./dev/ndkdll", "./dev", "./dev/ndkdll/Sources/Detail"],
-  "sources_path": ["dev/ndkdll/Sources/*.cxx"],
+  "headers_path": ["./dev/NDK", "./dev", "./dev/NDK/Sources/Detail"],
+  "sources_path": ["dev/NDK/Sources/*.cxx"],
   "output_name": "ndk.dll",
   "compiler_flags": ["-fPIC", "-shared", "-fPIC"],
   "cpp_macros": ["__NDK_DLL__=202401"]
diff --git a/dev/crtdll/__ndk_alloca.hxx b/dev/CRT/__ndk_alloca.hxx
index 48732a0..48732a0 100644
--- a/dev/crtdll/__ndk_alloca.hxx
+++ b/dev/CRT/__ndk_alloca.hxx
diff --git a/dev/crtdll/__ndk_defines.hxx b/dev/CRT/__ndk_defines.hxx
index e899ef2..e899ef2 100644
--- a/dev/crtdll/__ndk_defines.hxx
+++ b/dev/CRT/__ndk_defines.hxx
diff --git a/dev/crtdll/__ndk_exception.hxx b/dev/CRT/__ndk_exception.hxx
index dac42ad..dac42ad 100644
--- a/dev/crtdll/__ndk_exception.hxx
+++ b/dev/CRT/__ndk_exception.hxx
diff --git a/dev/crtdll/__ndk_hint.hxx b/dev/CRT/__ndk_hint.hxx
index 02dbc94..02dbc94 100644
--- a/dev/crtdll/__ndk_hint.hxx
+++ b/dev/CRT/__ndk_hint.hxx
diff --git a/dev/crtdll/__ndk_malloc.hxx b/dev/CRT/__ndk_malloc.hxx
index eeaa67b..eeaa67b 100644
--- a/dev/crtdll/__ndk_malloc.hxx
+++ b/dev/CRT/__ndk_malloc.hxx
diff --git a/dev/crtdll/__ndk_power.inc b/dev/CRT/__ndk_power.inc
index cada02e..cada02e 100644
--- a/dev/crtdll/__ndk_power.inc
+++ b/dev/CRT/__ndk_power.inc
diff --git a/dev/ndkdll/Asm/Asm.hxx b/dev/NDK/Asm/Asm.hxx
index fb90143..9cd6638 100644
--- a/dev/ndkdll/Asm/Asm.hxx
+++ b/dev/NDK/Asm/Asm.hxx
@@ -6,9 +6,9 @@
 
 #pragma once
 
-#include <ndkdll/Macros.hxx>
-#include <ndkdll/Defines.hxx>
-#include <ndkdll/NFC/String.hxx>
+#include <NDK/Macros.hxx>
+#include <NDK/Defines.hxx>
+#include <NDK/NFC/String.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndkdll/Asm/CPU/32x0.hxx b/dev/NDK/Asm/CPU/32x0.hxx
index 4b1387e..93ca990 100644
--- a/dev/ndkdll/Asm/CPU/32x0.hxx
+++ b/dev/NDK/Asm/CPU/32x0.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
+#include <NDK/Defines.hxx>
 
 // @brief 32x0 support.
 // @file CPU/32x0.hpp
diff --git a/dev/ndkdll/Asm/CPU/64x0.hxx b/dev/NDK/Asm/CPU/64x0.hxx
index 6cbed92..8f1cb52 100644
--- a/dev/ndkdll/Asm/CPU/64x0.hxx
+++ b/dev/NDK/Asm/CPU/64x0.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
+#include <NDK/Defines.hxx>
 #include <vector>
 
 // @brief 64x0 support.
diff --git a/dev/ndkdll/Asm/CPU/amd64.hxx b/dev/NDK/Asm/CPU/amd64.hxx
index a272724..ef99101 100644
--- a/dev/ndkdll/Asm/CPU/amd64.hxx
+++ b/dev/NDK/Asm/CPU/amd64.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
+#include <NDK/Defines.hxx>
 
 // @brief AMD64 support.
 // @file CPU/amd64.hpp
diff --git a/dev/ndkdll/Asm/CPU/arm64.hxx b/dev/NDK/Asm/CPU/arm64.hxx
index c75735c..aaab744 100644
--- a/dev/ndkdll/Asm/CPU/arm64.hxx
+++ b/dev/NDK/Asm/CPU/arm64.hxx
@@ -6,7 +6,7 @@ Copyright ZKA Technologies
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
+#include <NDK/Defines.hxx>
 
 /// @brief ARM64 encoding support.
 /// @file CPU/arm64.hpp
diff --git a/dev/ndkdll/Asm/CPU/power64.hxx b/dev/NDK/Asm/CPU/power64.hxx
index e3ea6c5..e3ea6c5 100644
--- a/dev/ndkdll/Asm/CPU/power64.hxx
+++ b/dev/NDK/Asm/CPU/power64.hxx
diff --git a/dev/ndkdll/Defines.hxx b/dev/NDK/Defines.hxx
index 0b7c559..0b7c559 100644
--- a/dev/ndkdll/Defines.hxx
+++ b/dev/NDK/Defines.hxx
diff --git a/dev/ndkdll/Macros.hxx b/dev/NDK/Macros.hxx
index 96530ed..96530ed 100644
--- a/dev/ndkdll/Macros.hxx
+++ b/dev/NDK/Macros.hxx
diff --git a/dev/ndkdll/NFC/AE.hxx b/dev/NDK/NFC/AE.hxx
index c26d3b3..bb0e8cf 100644
--- a/dev/ndkdll/NFC/AE.hxx
+++ b/dev/NDK/NFC/AE.hxx
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
+#include <NDK/Defines.hxx>
 
 #define kAEMag0 'A'
 #define kAEMag1 'E'
diff --git a/dev/ndkdll/NFC/ErrorID.hxx b/dev/NDK/NFC/ErrorID.hxx
index 3816bca..6275550 100644
--- a/dev/ndkdll/NFC/ErrorID.hxx
+++ b/dev/NDK/NFC/ErrorID.hxx
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
-#include <ndkdll/NFC/ErrorOr.hxx>
+#include <NDK/Defines.hxx>
+#include <NDK/NFC/ErrorOr.hxx>
 
 #define NDK_EXEC_ERROR	   -30
 #define NDK_FILE_NOT_FOUND -31
diff --git a/dev/ndkdll/NFC/ErrorOr.hxx b/dev/NDK/NFC/ErrorOr.hxx
index f7e2803..f376346 100644
--- a/dev/ndkdll/NFC/ErrorOr.hxx
+++ b/dev/NDK/NFC/ErrorOr.hxx
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
-#include <ndkdll/NFC/Ref.hxx>
+#include <NDK/Defines.hxx>
+#include <NDK/NFC/Ref.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndkdll/NFC/PEF.hxx b/dev/NDK/NFC/PEF.hxx
index 07ff121..022fc77 100644
--- a/dev/ndkdll/NFC/PEF.hxx
+++ b/dev/NDK/NFC/PEF.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
+#include <NDK/Defines.hxx>
 
 // @file PEF.hpp
 // @brief Preferred Executable Format
diff --git a/dev/ndkdll/NFC/Ref.hxx b/dev/NDK/NFC/Ref.hxx
index 0ffcecc..0ffcecc 100644
--- a/dev/ndkdll/NFC/Ref.hxx
+++ b/dev/NDK/NFC/Ref.hxx
diff --git a/dev/ndkdll/NFC/String.hxx b/dev/NDK/NFC/String.hxx
index c42c412..71abaa4 100644
--- a/dev/ndkdll/NFC/String.hxx
+++ b/dev/NDK/NFC/String.hxx
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include <ndkdll/Defines.hxx>
-#include <ndkdll/NFC/ErrorOr.hxx>
+#include <NDK/Defines.hxx>
+#include <NDK/NFC/ErrorOr.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndkdll/NFC/XCOFF.hxx b/dev/NDK/NFC/XCOFF.hxx
index 1f8797e..0673cfc 100644
--- a/dev/ndkdll/NFC/XCOFF.hxx
+++ b/dev/NDK/NFC/XCOFF.hxx
@@ -14,7 +14,7 @@
 #ifndef __XCOFF__
 #define __XCOFF__
 
-#include <ndkdll/Defines.hxx>
+#include <NDK/Defines.hxx>
 
 #define kXCOFF64Magic 0x01F7
 
diff --git a/dev/ndkdll/Parser.hxx b/dev/NDK/Parser.hxx
index bec8ca9..ca3c468 100644
--- a/dev/ndkdll/Parser.hxx
+++ b/dev/NDK/Parser.hxx
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <ndkdll/Asm/Asm.hxx>
+#include <NDK/Asm/Asm.hxx>
 #include <vector>
 
 namespace NDK
diff --git a/dev/ndkdll/ReadMe.md b/dev/NDK/ReadMe.md
index 2937259..2937259 100644
--- a/dev/ndkdll/ReadMe.md
+++ b/dev/NDK/ReadMe.md
diff --git a/dev/ndkdll/Sources/Assembler32x0.cxx b/dev/NDK/Sources/Assembler32x0.cxx
index f5d6ddd..6f98cdf 100644
--- a/dev/ndkdll/Sources/Assembler32x0.cxx
+++ b/dev/NDK/Sources/Assembler32x0.cxx
@@ -19,10 +19,10 @@
 
 #define __ASM_NEED_32x0__ 1
 
-#include <ndkdll/Asm/CPU/32x0.hxx>
-#include <ndkdll/Parser.hxx>
-#include <ndkdll/NFC/AE.hxx>
-#include <ndkdll/NFC/PEF.hxx>
+#include <NDK/Asm/CPU/32x0.hxx>
+#include <NDK/Parser.hxx>
+#include <NDK/NFC/AE.hxx>
+#include <NDK/NFC/PEF.hxx>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
diff --git a/dev/ndkdll/Sources/Assembler64x0.cxx b/dev/NDK/Sources/Assembler64x0.cxx
index ce4bd15..b5ec35b 100644
--- a/dev/ndkdll/Sources/Assembler64x0.cxx
+++ b/dev/NDK/Sources/Assembler64x0.cxx
@@ -19,10 +19,10 @@
 
 #define __ASM_NEED_64x0__ 1
 
-#include <ndkdll/Asm/CPU/64x0.hxx>
-#include <ndkdll/Parser.hxx>
-#include <ndkdll/NFC/AE.hxx>
-#include <ndkdll/NFC/PEF.hxx>
+#include <NDK/Asm/CPU/64x0.hxx>
+#include <NDK/Parser.hxx>
+#include <NDK/NFC/AE.hxx>
+#include <NDK/NFC/PEF.hxx>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
diff --git a/dev/ndkdll/Sources/AssemblerAMD64.cxx b/dev/NDK/Sources/AssemblerAMD64.cxx
index 7703c06..cfbed97 100644
--- a/dev/ndkdll/Sources/AssemblerAMD64.cxx
+++ b/dev/NDK/Sources/AssemblerAMD64.cxx
@@ -27,10 +27,10 @@
 #define kAssemblerPragmaSymStr "#"
 #define kAssemblerPragmaSym	   '#'
 
-#include <ndkdll/Asm/CPU/amd64.hxx>
-#include <ndkdll/Parser.hxx>
-#include <ndkdll/NFC/AE.hxx>
-#include <ndkdll/NFC/PEF.hxx>
+#include <NDK/Asm/CPU/amd64.hxx>
+#include <NDK/Parser.hxx>
+#include <NDK/NFC/AE.hxx>
+#include <NDK/NFC/PEF.hxx>
 #include <algorithm>
 #include <cstdlib>
 #include <filesystem>
diff --git a/dev/ndkdll/Sources/AssemblerPower.cxx b/dev/NDK/Sources/AssemblerPower.cxx
index c33157f..5b7c4fb 100644
--- a/dev/ndkdll/Sources/AssemblerPower.cxx
+++ b/dev/NDK/Sources/AssemblerPower.cxx
@@ -17,12 +17,12 @@
 
 #define __ASM_NEED_PPC__ 1
 
-#include <ndkdll/NFC/ErrorID.hxx>
-#include <ndkdll/Asm/CPU/power64.hxx>
-#include <ndkdll/NFC/PEF.hxx>
-#include <ndkdll/Parser.hxx>
-#include <ndkdll/NFC/AE.hxx>
-#include <ndkdll/Version.hxx>
+#include <NDK/NFC/ErrorID.hxx>
+#include <NDK/Asm/CPU/power64.hxx>
+#include <NDK/NFC/PEF.hxx>
+#include <NDK/Parser.hxx>
+#include <NDK/NFC/AE.hxx>
+#include <NDK/Version.hxx>
 #include <filesystem>
 #include <algorithm>
 #include <iostream>
diff --git a/dev/ndkdll/Sources/AssemblyFactory.cxx b/dev/NDK/Sources/AssemblyFactory.cxx
index 51c5d56..83e5677 100644
--- a/dev/ndkdll/Sources/AssemblyFactory.cxx
+++ b/dev/NDK/Sources/AssemblyFactory.cxx
@@ -4,8 +4,8 @@
 
 ------------------------------------------- */
 
-#include <ndkdll/Asm/Asm.hxx>
-#include <ndkdll/NFC/ErrorID.hxx>
+#include <NDK/Asm/Asm.hxx>
+#include <NDK/NFC/ErrorID.hxx>
 
 /**
  * @file AssemblyFactory.cxx
diff --git a/dev/ndkdll/Sources/CCompiler64x0.cxx b/dev/NDK/Sources/CCompiler64x0.cxx
index 9863a86..95f02f3 100644
--- a/dev/ndkdll/Sources/CCompiler64x0.cxx
+++ b/dev/NDK/Sources/CCompiler64x0.cxx
@@ -10,9 +10,9 @@
 /// BUGS: 0
 /// TODO: none
 
-#include <ndkdll/Asm/CPU/64x0.hxx>
-#include <ndkdll/Parser.hxx>
-#include <ndkdll/UUID.hxx>
+#include <NDK/Asm/CPU/64x0.hxx>
+#include <NDK/Parser.hxx>
+#include <NDK/UUID.hxx>
 #include <filesystem>
 #include <cstdio>
 #include <fstream>
diff --git a/dev/ndkdll/Sources/CCompilerPower64.cxx b/dev/NDK/Sources/CCompilerPower64.cxx
index 80ae869..a05271f 100644
--- a/dev/ndkdll/Sources/CCompilerPower64.cxx
+++ b/dev/NDK/Sources/CCompilerPower64.cxx
@@ -7,9 +7,9 @@
  * 	========================================================
  */
 
-#include <ndkdll/Asm/CPU/power64.hxx>
-#include <ndkdll/Parser.hxx>
-#include <ndkdll/UUID.hxx>
+#include <NDK/Asm/CPU/power64.hxx>
+#include <NDK/Parser.hxx>
+#include <NDK/UUID.hxx>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
diff --git a/dev/ndkdll/Sources/CPlusPlusCompilerAMD64.cxx b/dev/NDK/Sources/CPlusPlusCompilerAMD64.cxx
index 63b1bb3..fb524c2 100644
--- a/dev/ndkdll/Sources/CPlusPlusCompilerAMD64.cxx
+++ b/dev/NDK/Sources/CPlusPlusCompilerAMD64.cxx
@@ -20,8 +20,8 @@
 
 // extern_segment, @MLAutoRelease { ... }, fn foo() -> auto { ... }
 
-#include <ndkdll/Asm/CPU/amd64.hxx>
-#include <ndkdll/Parser.hxx>
+#include <NDK/Asm/CPU/amd64.hxx>
+#include <NDK/Parser.hxx>
 #include <UUID.hxx>
 
 #include <cctype>
diff --git a/dev/ndkdll/Sources/CPlusPlusCompilerPreProcessor.cxx b/dev/NDK/Sources/CPlusPlusCompilerPreProcessor.cxx
index 0f6b646..ed9cc92 100644
--- a/dev/ndkdll/Sources/CPlusPlusCompilerPreProcessor.cxx
+++ b/dev/NDK/Sources/CPlusPlusCompilerPreProcessor.cxx
@@ -9,8 +9,8 @@
 
 /// BUGS: 0
 
-#include <ndkdll/Parser.hxx>
-#include <ndkdll/NFC/ErrorID.hxx>
+#include <NDK/Parser.hxx>
+#include <NDK/NFC/ErrorID.hxx>
 #include <algorithm>
 #include <filesystem>
 #include <fstream>
diff --git a/dev/ndkdll/Sources/Detail/ReadMe.md b/dev/NDK/Sources/Detail/ReadMe.md
index e9d0a2c..e9d0a2c 100644
--- a/dev/ndkdll/Sources/Detail/ReadMe.md
+++ b/dev/NDK/Sources/Detail/ReadMe.md
diff --git a/dev/ndkdll/Sources/Detail/asmutils.hxx b/dev/NDK/Sources/Detail/asmutils.hxx
index b52329d..d63eab8 100644
--- a/dev/ndkdll/Sources/Detail/asmutils.hxx
+++ b/dev/NDK/Sources/Detail/asmutils.hxx
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <ndkdll/Asm/Asm.hxx>
-#include <ndkdll/Parser.hxx>
+#include <NDK/Asm/Asm.hxx>
+#include <NDK/Parser.hxx>
 
 using namespace NDK;
 
diff --git a/dev/ndkdll/Sources/Detail/compilerutils.hxx b/dev/NDK/Sources/Detail/compilerutils.hxx
index 84312a2..5981fd5 100644
--- a/dev/ndkdll/Sources/Detail/compilerutils.hxx
+++ b/dev/NDK/Sources/Detail/compilerutils.hxx
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <ndkdll/Asm/Asm.hxx>
-#include <ndkdll/Parser.hxx>
+#include <NDK/Asm/Asm.hxx>
+#include <NDK/Parser.hxx>
 
 #define kZero64Section ".zero64"
 #define kCode64Section ".code64"
diff --git a/dev/ndkdll/Sources/Linker.cxx b/dev/NDK/Sources/Linker.cxx
index 2b1c546..7864572 100644
--- a/dev/ndkdll/Sources/Linker.cxx
+++ b/dev/NDK/Sources/Linker.cxx
@@ -16,23 +16,23 @@
 /// @note Do not look up for anything with .code64/.data64/.zero64!
 /// It will be loaded when program will start up!
 
-#include <ndkdll/NFC/ErrorID.hxx>
+#include <NDK/NFC/ErrorID.hxx>
 
 //! Assembler Kit
-#include <ndkdll/Asm/Asm.hxx>
+#include <NDK/Asm/Asm.hxx>
 
 //! Preferred Executable Format
-#include <ndkdll/NFC/PEF.hxx>
-#include <ndkdll/UUID.hxx>
+#include <NDK/NFC/PEF.hxx>
+#include <NDK/UUID.hxx>
 #include <filesystem>
 #include <random>
 #include <vector>
 
 //! Dist version
-#include <ndkdll/Version.hxx>
+#include <NDK/Version.hxx>
 
 //! Advanced Executable Object Format
-#include <ndkdll/NFC/AE.hxx>
+#include <NDK/NFC/AE.hxx>
 
 //! C++ I/O headers.
 #include <fstream>
diff --git a/dev/ndkdll/Sources/String.cxx b/dev/NDK/Sources/String.cxx
index b7cfc2d..0df54c3 100644
--- a/dev/ndkdll/Sources/String.cxx
+++ b/dev/NDK/Sources/String.cxx
@@ -18,7 +18,7 @@
  *
  */
 
-#include <ndkdll/NFC/String.hxx>
+#include <NDK/NFC/String.hxx>
 
 namespace NDK
 {
diff --git a/dev/ndkdll/Sources/XIDL.cxx b/dev/NDK/Sources/XIDL.cxx
index 6284fd7..6284fd7 100644
--- a/dev/ndkdll/Sources/XIDL.cxx
+++ b/dev/NDK/Sources/XIDL.cxx
diff --git a/dev/ndkdll/Sources/compile_flags.txt b/dev/NDK/Sources/compile_flags.txt
index 6ec6b8a..6ec6b8a 100644
--- a/dev/ndkdll/Sources/compile_flags.txt
+++ b/dev/NDK/Sources/compile_flags.txt
diff --git a/dev/ndkdll/UUID.hxx b/dev/NDK/UUID.hxx
index 00b153b..00b153b 100644
--- a/dev/ndkdll/UUID.hxx
+++ b/dev/NDK/UUID.hxx
diff --git a/dev/ndkdll/Version.hxx b/dev/NDK/Version.hxx
index accfc79..accfc79 100644
--- a/dev/ndkdll/Version.hxx
+++ b/dev/NDK/Version.hxx
diff --git a/tools/asm-unix.json b/tools/asm-unix.json
index 410d108..4f8c36a 100644
--- a/tools/asm-unix.json
+++ b/tools/asm-unix.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "g++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/ndkdll", "../dev/", "../dev/ndkdll/Sources/Detail"],
+  "headers_path": ["../dev/NDK", "../dev/", "../dev/NDK/Sources/Detail"],
   "sources_path": ["asm.cxx"],
   "output_name": "asm.exe",
   "compiler_flags": ["-L/usr/local/lib", "-lndk"],
diff --git a/tools/asm.cxx b/tools/asm.cxx
index e214855..1697cbc 100644
--- a/tools/asm.cxx
+++ b/tools/asm.cxx
@@ -7,7 +7,7 @@
 /// @file Linker.cxx
 /// @brief ZKA C++ frontend for ZKA OS.
 
-#include <ndkdll/Version.hxx>
+#include <NDK/Version.hxx>
 #include <iostream>
 #include <cstring>
 #include <string>
diff --git a/tools/cl-unix.json b/tools/cl-unix.json
index 8ef5c24..c08b498 100644
--- a/tools/cl-unix.json
+++ b/tools/cl-unix.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "g++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/ndkdll", "../dev/", "../dev/ndkdll/Sources/Detail"],
+  "headers_path": ["../dev/NDK", "../dev/", "../dev/NDK/Sources/Detail"],
   "sources_path": ["cl.cxx"],
   "output_name": "cl.exe",
   "compiler_flags": ["-L/usr/local/lib", "-lndk"],
diff --git a/tools/cl.cxx b/tools/cl.cxx
index 63552d3..2f9cfc4 100644
--- a/tools/cl.cxx
+++ b/tools/cl.cxx
@@ -7,7 +7,7 @@
 /// @file Linker.cxx
 /// @brief ZKA C++ frontend for ZKA OS.
 
-#include <ndkdll/Version.hxx>
+#include <NDK/Version.hxx>
 #include <iostream>
 #include <cstring>
 #include <vector>
diff --git a/tools/cl.json b/tools/cl.json
index c226f56..de2390c 100644
--- a/tools/cl.json
+++ b/tools/cl.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "x86_64-w64-mingw32-g++.exe",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/ndkdll", "../dev/", "../dev/ndkdll/Sources/Detail"],
+  "headers_path": ["../dev/NDK", "../dev/", "../dev/NDK/Sources/Detail"],
   "sources_path": ["cl.cxx"],
   "output_name": "cl.exe",
   "compiler_flags": ["-L../", "-lndk"],
diff --git a/tools/link-unix.json b/tools/link-unix.json
index 92a25a1..50c1245 100644
--- a/tools/link-unix.json
+++ b/tools/link-unix.json
@@ -1,7 +1,7 @@
 {
   "compiler_path": "g++",
   "compiler_std": "c++20",
-  "headers_path": ["../dev/ndkdll", "../dev/", "../dev/ndkdll/Sources/Detail"],
+  "headers_path": ["../dev/NDK", "../dev/", "../dev/NDK/Sources/Detail"],
   "sources_path": ["link.cxx"],
   "output_name": "link.exe",
   "compiler_flags": ["-L/usr/local/lib", "-lndk"],
diff --git a/tools/link.json b/tools/link.json
index 7f8b4ae..eaa427b 100644
--- a/tools/link.json
+++ b/tools/link.json
@@ -1,7 +1,7 @@
 {
     "compiler_path": "x86_64-w64-mingw32-g++.exe",
     "compiler_std": "c++20",
-    "headers_path": ["../dev/ndkdll", "../dev/", "../dev/ndkdll/Sources/Detail"],
+    "headers_path": ["../dev/NDK", "../dev/", "../dev/NDK/Sources/Detail"],
     "sources_path": ["link.cxx"],
     "output_name": "link.exe",
     "compiler_flags": ["-L../", "-lndk"],