summaryrefslogtreecommitdiffhomepage
path: root/dev
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-10-21 20:28:30 +0200
committerAmlal El Mahrouss <amlal.elmahrouss@icloud.com>2024-10-21 20:28:30 +0200
commit5d096ddd5228e554a2ef71d34dd469484e50b961 (patch)
tree4f3aaf6409e94a220a06c7236fbe6009f01f625f /dev
parent662860f03cdff8ea18b691dca1f3c84a4aaf07d5 (diff)
IMP: Major refactor of header and source files extensions.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev')
-rw-r--r--dev/LibC++/base_alloc.h2
-rw-r--r--dev/LibC++/base_exception.h4
-rw-r--r--dev/LibC++/defines.h6
-rw-r--r--dev/LibC++/math.h4
-rw-r--r--dev/ToolchainKit/AAL/Asm.h6
-rw-r--r--dev/ToolchainKit/AAL/CPU/32x0.h2
-rw-r--r--dev/ToolchainKit/AAL/CPU/64x0.h2
-rw-r--r--dev/ToolchainKit/AAL/CPU/amd64.h2
-rw-r--r--dev/ToolchainKit/AAL/CPU/arm64.h2
-rw-r--r--dev/ToolchainKit/NFC/AE.h2
-rw-r--r--dev/ToolchainKit/NFC/ErrorID.h4
-rw-r--r--dev/ToolchainKit/NFC/ErrorOr.h4
-rw-r--r--dev/ToolchainKit/NFC/PEF.h2
-rw-r--r--dev/ToolchainKit/NFC/Ref.h2
-rw-r--r--dev/ToolchainKit/NFC/String.h4
-rw-r--r--dev/ToolchainKit/NFC/XCOFF.h2
-rw-r--r--dev/ToolchainKit/Parser.h2
-rw-r--r--dev/ToolchainKit/src/Assembler32x0.cc8
-rw-r--r--dev/ToolchainKit/src/Assembler64x0.cc8
-rw-r--r--dev/ToolchainKit/src/AssemblerAMD64.cc10
-rw-r--r--dev/ToolchainKit/src/AssemblerPower.cc14
-rw-r--r--dev/ToolchainKit/src/AssemblyFactory.cc4
-rw-r--r--dev/ToolchainKit/src/CCompiler64x0.cc8
-rw-r--r--dev/ToolchainKit/src/CCompilerPower64.cc8
-rw-r--r--dev/ToolchainKit/src/CPlusPlusCompilerAMD64.cc6
-rw-r--r--dev/ToolchainKit/src/CPlusPlusCompilerPreProcessor.cc4
-rw-r--r--dev/ToolchainKit/src/Detail/AsmUtils.h4
-rw-r--r--dev/ToolchainKit/src/Detail/ClUtils.h4
-rw-r--r--dev/ToolchainKit/src/IdlCompiler.cc12
-rw-r--r--dev/ToolchainKit/src/Linker.cc12
-rw-r--r--dev/ToolchainKit/src/String.cc2
31 files changed, 78 insertions, 78 deletions
diff --git a/dev/LibC++/base_alloc.h b/dev/LibC++/base_alloc.h
index 51ed861..1d0fded 100644
--- a/dev/LibC++/base_alloc.h
+++ b/dev/LibC++/base_alloc.h
@@ -6,7 +6,7 @@
#pragma once
-#include <LibC++/defines.hxx>
+#include <LibC++/defines.h>
namespace std::base_alloc
{
diff --git a/dev/LibC++/base_exception.h b/dev/LibC++/base_exception.h
index 9efe209..9d9dcc9 100644
--- a/dev/LibC++/base_exception.h
+++ b/dev/LibC++/base_exception.h
@@ -6,8 +6,8 @@
#pragma once
-#include <LibC++/defines.hxx>
-#include <LibC++/exit.hxx>
+#include <LibC++/defines.h>
+#include <LibC++/exit.h>
namespace std
{
diff --git a/dev/LibC++/defines.h b/dev/LibC++/defines.h
index c65b254..209913a 100644
--- a/dev/LibC++/defines.h
+++ b/dev/LibC++/defines.h
@@ -34,7 +34,7 @@ typedef char* caddr_t;
#endif // !null
#ifdef __GNUC__
-#include <LibC++/alloca.hxx>
+#include <LibC++/alloca.h>
#elif defined(__NDK__)
#define __alloca(sz) __ndk_alloca(sz)
#endif
@@ -94,8 +94,8 @@ typedef union double_cast {
#ifdef __STD_CXX__
-#include <LibC++/base_exception.hxx>
-#include <LibC++/base_alloc.hxx>
+#include <LibC++/base_exception.h>
+#include <LibC++/base_alloc.h>
#endif // ifdef __STD_CXX__
diff --git a/dev/LibC++/math.h b/dev/LibC++/math.h
index b6cd6a8..a09c092 100644
--- a/dev/LibC++/math.h
+++ b/dev/LibC++/math.h
@@ -6,9 +6,9 @@
#pragma once
-#include <LibC++/defines.hxx>
+#include <LibC++/defines.h>
-/// @file Math.hxx
+/// @file Math.h
/// @brief Math functions.
#ifdef __ZKA_USE_DOUBLE__
diff --git a/dev/ToolchainKit/AAL/Asm.h b/dev/ToolchainKit/AAL/Asm.h
index 5de4d3d..9d87f65 100644
--- a/dev/ToolchainKit/AAL/Asm.h
+++ b/dev/ToolchainKit/AAL/Asm.h
@@ -6,9 +6,9 @@
#pragma once
-#include <ToolchainKit/Macros.hxx>
-#include <ToolchainKit/Defines.hxx>
-#include <ToolchainKit/NFC/String.hxx>
+#include <ToolchainKit/Macros.h>
+#include <ToolchainKit/Defines.h>
+#include <ToolchainKit/NFC/String.h>
namespace NDK
{
diff --git a/dev/ToolchainKit/AAL/CPU/32x0.h b/dev/ToolchainKit/AAL/CPU/32x0.h
index 11ce4af..fed7123 100644
--- a/dev/ToolchainKit/AAL/CPU/32x0.h
+++ b/dev/ToolchainKit/AAL/CPU/32x0.h
@@ -6,7 +6,7 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
// @brief 32x0 support.
// @file CPU/32x0.hpp
diff --git a/dev/ToolchainKit/AAL/CPU/64x0.h b/dev/ToolchainKit/AAL/CPU/64x0.h
index a822a5c..f4d6f38 100644
--- a/dev/ToolchainKit/AAL/CPU/64x0.h
+++ b/dev/ToolchainKit/AAL/CPU/64x0.h
@@ -6,7 +6,7 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
#include <vector>
// @brief 64x0 support.
diff --git a/dev/ToolchainKit/AAL/CPU/amd64.h b/dev/ToolchainKit/AAL/CPU/amd64.h
index fe9a06f..d576af2 100644
--- a/dev/ToolchainKit/AAL/CPU/amd64.h
+++ b/dev/ToolchainKit/AAL/CPU/amd64.h
@@ -6,7 +6,7 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
// @brief AMD64 support.
// @file CPU/amd64.hpp
diff --git a/dev/ToolchainKit/AAL/CPU/arm64.h b/dev/ToolchainKit/AAL/CPU/arm64.h
index dbb6565..1442348 100644
--- a/dev/ToolchainKit/AAL/CPU/arm64.h
+++ b/dev/ToolchainKit/AAL/CPU/arm64.h
@@ -6,7 +6,7 @@ Copyright ZKA Web Services Co
#pragma once
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
/// @brief ARM64 encoding support.
/// @file CPU/arm64.hpp
diff --git a/dev/ToolchainKit/NFC/AE.h b/dev/ToolchainKit/NFC/AE.h
index 5b8cd21..db791e3 100644
--- a/dev/ToolchainKit/NFC/AE.h
+++ b/dev/ToolchainKit/NFC/AE.h
@@ -9,7 +9,7 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
#define kAEMag0 'A'
#define kAEMag1 'E'
diff --git a/dev/ToolchainKit/NFC/ErrorID.h b/dev/ToolchainKit/NFC/ErrorID.h
index 0557617..935199d 100644
--- a/dev/ToolchainKit/NFC/ErrorID.h
+++ b/dev/ToolchainKit/NFC/ErrorID.h
@@ -9,8 +9,8 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
-#include <ToolchainKit/NFC/ErrorOr.hxx>
+#include <ToolchainKit/Defines.h>
+#include <ToolchainKit/NFC/ErrorOr.h>
#define NDK_EXEC_ERROR -30
#define NDK_FILE_NOT_FOUND -31
diff --git a/dev/ToolchainKit/NFC/ErrorOr.h b/dev/ToolchainKit/NFC/ErrorOr.h
index 3f2b448..3a81bd6 100644
--- a/dev/ToolchainKit/NFC/ErrorOr.h
+++ b/dev/ToolchainKit/NFC/ErrorOr.h
@@ -9,8 +9,8 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
-#include <ToolchainKit/NFC/Ref.hxx>
+#include <ToolchainKit/Defines.h>
+#include <ToolchainKit/NFC/Ref.h>
namespace NDK
{
diff --git a/dev/ToolchainKit/NFC/PEF.h b/dev/ToolchainKit/NFC/PEF.h
index d04dd85..bc3bd0e 100644
--- a/dev/ToolchainKit/NFC/PEF.h
+++ b/dev/ToolchainKit/NFC/PEF.h
@@ -6,7 +6,7 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
// @file PEF.hpp
// @brief Preferred Executable Format
diff --git a/dev/ToolchainKit/NFC/Ref.h b/dev/ToolchainKit/NFC/Ref.h
index 830f6c8..3fe2ec1 100644
--- a/dev/ToolchainKit/NFC/Ref.h
+++ b/dev/ToolchainKit/NFC/Ref.h
@@ -10,7 +10,7 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
namespace NDK
{
diff --git a/dev/ToolchainKit/NFC/String.h b/dev/ToolchainKit/NFC/String.h
index 78d6019..4024693 100644
--- a/dev/ToolchainKit/NFC/String.h
+++ b/dev/ToolchainKit/NFC/String.h
@@ -9,8 +9,8 @@
#pragma once
-#include <ToolchainKit/Defines.hxx>
-#include <ToolchainKit/NFC/ErrorOr.hxx>
+#include <ToolchainKit/Defines.h>
+#include <ToolchainKit/NFC/ErrorOr.h>
namespace NDK
{
diff --git a/dev/ToolchainKit/NFC/XCOFF.h b/dev/ToolchainKit/NFC/XCOFF.h
index 20b279a..14e5237 100644
--- a/dev/ToolchainKit/NFC/XCOFF.h
+++ b/dev/ToolchainKit/NFC/XCOFF.h
@@ -14,7 +14,7 @@
#ifndef __XCOFF__
#define __XCOFF__
-#include <ToolchainKit/Defines.hxx>
+#include <ToolchainKit/Defines.h>
#define kXCOFF64Magic 0x01F7
diff --git a/dev/ToolchainKit/Parser.h b/dev/ToolchainKit/Parser.h
index 7d61825..4d6a862 100644
--- a/dev/ToolchainKit/Parser.h
+++ b/dev/ToolchainKit/Parser.h
@@ -6,7 +6,7 @@
#pragma once
-#include <ToolchainKit/AAL/Asm.hxx>
+#include <ToolchainKit/AAL/Asm.h>
#include <vector>
namespace NDK
diff --git a/dev/ToolchainKit/src/Assembler32x0.cc b/dev/ToolchainKit/src/Assembler32x0.cc
index b691e6a..e04fdf5 100644
--- a/dev/ToolchainKit/src/Assembler32x0.cc
+++ b/dev/ToolchainKit/src/Assembler32x0.cc
@@ -19,10 +19,10 @@
#define __ASM_NEED_32x0__ 1
-#include <ToolchainKit/AAL/CPU/32x0.hxx>
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/NFC/AE.hxx>
-#include <ToolchainKit/NFC/PEF.hxx>
+#include <ToolchainKit/AAL/CPU/32x0.h>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/NFC/AE.h>
+#include <ToolchainKit/NFC/PEF.h>
/////////////////////
diff --git a/dev/ToolchainKit/src/Assembler64x0.cc b/dev/ToolchainKit/src/Assembler64x0.cc
index d0c581b..d91bdcf 100644
--- a/dev/ToolchainKit/src/Assembler64x0.cc
+++ b/dev/ToolchainKit/src/Assembler64x0.cc
@@ -19,10 +19,10 @@
#define __ASM_NEED_64x0__ 1
-#include <ToolchainKit/AAL/CPU/64x0.hxx>
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/NFC/AE.hxx>
-#include <ToolchainKit/NFC/PEF.hxx>
+#include <ToolchainKit/AAL/CPU/64x0.h>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/NFC/AE.h>
+#include <ToolchainKit/NFC/PEF.h>
#include <algorithm>
#include <filesystem>
#include <fstream>
diff --git a/dev/ToolchainKit/src/AssemblerAMD64.cc b/dev/ToolchainKit/src/AssemblerAMD64.cc
index ae8ba2f..118e5d8 100644
--- a/dev/ToolchainKit/src/AssemblerAMD64.cc
+++ b/dev/ToolchainKit/src/AssemblerAMD64.cc
@@ -27,10 +27,10 @@
#define kAssemblerPragmaSymStr "#"
#define kAssemblerPragmaSym '#'
-#include <ToolchainKit/AAL/CPU/amd64.hxx>
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/NFC/AE.hxx>
-#include <ToolchainKit/NFC/PEF.hxx>
+#include <ToolchainKit/AAL/CPU/amd64.h>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/NFC/AE.h>
+#include <ToolchainKit/NFC/PEF.h>
#include <algorithm>
#include <cstdlib>
#include <filesystem>
@@ -85,7 +85,7 @@ static const std::string kRelocSymbol = ":RuntimeSymbol:";
// \brief forward decl.
static bool asm_read_attributes(std::string& line);
-#include <AsmUtils.hxx>
+#include <AsmUtils.h>
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/dev/ToolchainKit/src/AssemblerPower.cc b/dev/ToolchainKit/src/AssemblerPower.cc
index fbcbe98..63c0858 100644
--- a/dev/ToolchainKit/src/AssemblerPower.cc
+++ b/dev/ToolchainKit/src/AssemblerPower.cc
@@ -17,12 +17,12 @@
#define __ASM_NEED_PPC__ 1
-#include <ToolchainKit/NFC/ErrorID.hxx>
-#include <ToolchainKit/AAL/CPU/power64.hxx>
-#include <ToolchainKit/NFC/PEF.hxx>
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/NFC/AE.hxx>
-#include <ToolchainKit/Version.hxx>
+#include <ToolchainKit/NFC/ErrorID.h>
+#include <ToolchainKit/AAL/CPU/power64.h>
+#include <ToolchainKit/NFC/PEF.h>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/NFC/AE.h>
+#include <ToolchainKit/Version.h>
#include <filesystem>
#include <algorithm>
#include <iostream>
@@ -73,7 +73,7 @@ static const std::string kRelocSymbol = ":RuntimeSymbol:";
static bool asm_read_attributes(std::string& line);
/// Do not move it on top! it uses the assembler detail namespace!
-#include <AsmUtils.hxx>
+#include <AsmUtils.h>
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/dev/ToolchainKit/src/AssemblyFactory.cc b/dev/ToolchainKit/src/AssemblyFactory.cc
index 0d47a06..df6d1cb 100644
--- a/dev/ToolchainKit/src/AssemblyFactory.cc
+++ b/dev/ToolchainKit/src/AssemblyFactory.cc
@@ -4,8 +4,8 @@
------------------------------------------- */
-#include <ToolchainKit/AAL/Asm.hxx>
-#include <ToolchainKit/NFC/ErrorID.hxx>
+#include <ToolchainKit/AAL/Asm.h>
+#include <ToolchainKit/NFC/ErrorID.h>
/**
* @file AssemblyFactory.cxx
diff --git a/dev/ToolchainKit/src/CCompiler64x0.cc b/dev/ToolchainKit/src/CCompiler64x0.cc
index ae8e5b8..e84e140 100644
--- a/dev/ToolchainKit/src/CCompiler64x0.cc
+++ b/dev/ToolchainKit/src/CCompiler64x0.cc
@@ -10,9 +10,9 @@
/// BUGS: 0
/// TODO: none
-#include <ToolchainKit/AAL/CPU/64x0.hxx>
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/UUID.hxx>
+#include <ToolchainKit/AAL/CPU/64x0.h>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/UUID.h>
#include <filesystem>
#include <cstdio>
#include <fstream>
@@ -1479,7 +1479,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////
-#include <Version.hxx>
+#include <Version.h>
#define kPrintF printf
#define kSplashCxx() \
diff --git a/dev/ToolchainKit/src/CCompilerPower64.cc b/dev/ToolchainKit/src/CCompilerPower64.cc
index ad98987..9c6d7e3 100644
--- a/dev/ToolchainKit/src/CCompilerPower64.cc
+++ b/dev/ToolchainKit/src/CCompilerPower64.cc
@@ -7,9 +7,9 @@
* ========================================================
*/
-#include <ToolchainKit/AAL/CPU/power64.hxx>
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/UUID.hxx>
+#include <ToolchainKit/AAL/CPU/power64.h>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/UUID.h>
#include <filesystem>
#include <fstream>
#include <iostream>
@@ -1499,7 +1499,7 @@ public:
/////////////////////////////////////////////////////////////////////////////////////////
-#include <Version.hxx>
+#include <Version.h>
#define kPrintF printf
#define kSplashCxx() \
diff --git a/dev/ToolchainKit/src/CPlusPlusCompilerAMD64.cc b/dev/ToolchainKit/src/CPlusPlusCompilerAMD64.cc
index 35f83c7..5dc0855 100644
--- a/dev/ToolchainKit/src/CPlusPlusCompilerAMD64.cc
+++ b/dev/ToolchainKit/src/CPlusPlusCompilerAMD64.cc
@@ -20,9 +20,9 @@
// extern_segment, @MLAutoRelease { ... }, fn foo() -> auto { ... }
-#include <ToolchainKit/AAL/CPU/amd64.hxx>
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/UUID.hxx>
+#include <ToolchainKit/AAL/CPU/amd64.h>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/UUID.h>
/* ZKA C++ Compiler driver */
/* This is part of the NDK. */
diff --git a/dev/ToolchainKit/src/CPlusPlusCompilerPreProcessor.cc b/dev/ToolchainKit/src/CPlusPlusCompilerPreProcessor.cc
index 802f8cb..6ffb175 100644
--- a/dev/ToolchainKit/src/CPlusPlusCompilerPreProcessor.cc
+++ b/dev/ToolchainKit/src/CPlusPlusCompilerPreProcessor.cc
@@ -9,8 +9,8 @@
/// BUGS: 0
-#include <ToolchainKit/Parser.hxx>
-#include <ToolchainKit/NFC/ErrorID.hxx>
+#include <ToolchainKit/Parser.h>
+#include <ToolchainKit/NFC/ErrorID.h>
#include <algorithm>
#include <filesystem>
#include <fstream>
diff --git a/dev/ToolchainKit/src/Detail/AsmUtils.h b/dev/ToolchainKit/src/Detail/AsmUtils.h
index c401181..a921b54 100644
--- a/dev/ToolchainKit/src/Detail/AsmUtils.h
+++ b/dev/ToolchainKit/src/Detail/AsmUtils.h
@@ -6,8 +6,8 @@
#pragma once
-#include <ToolchainKit/AAL/Asm.hxx>
-#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/AAL/Asm.h>
+#include <ToolchainKit/Parser.h>
using namespace NDK;
diff --git a/dev/ToolchainKit/src/Detail/ClUtils.h b/dev/ToolchainKit/src/Detail/ClUtils.h
index b9e7e80..5aa8b39 100644
--- a/dev/ToolchainKit/src/Detail/ClUtils.h
+++ b/dev/ToolchainKit/src/Detail/ClUtils.h
@@ -6,8 +6,8 @@
#pragma once
-#include <ToolchainKit/AAL/Asm.hxx>
-#include <ToolchainKit/Parser.hxx>
+#include <ToolchainKit/AAL/Asm.h>
+#include <ToolchainKit/Parser.h>
#define kZero64Section ".zero64"
#define kCode64Section ".code64"
diff --git a/dev/ToolchainKit/src/IdlCompiler.cc b/dev/ToolchainKit/src/IdlCompiler.cc
index 8bdaa1e..e3189f3 100644
--- a/dev/ToolchainKit/src/IdlCompiler.cc
+++ b/dev/ToolchainKit/src/IdlCompiler.cc
@@ -7,20 +7,20 @@
------------------------------------------- */
-#include <ToolchainKit/NFC/ErrorID.hxx>
+#include <ToolchainKit/NFC/ErrorID.h>
//! Assembler Kit
-#include <ToolchainKit/AAL/Asm.hxx>
+#include <ToolchainKit/AAL/Asm.h>
//! Preferred Executable Format
-#include <ToolchainKit/NFC/PEF.hxx>
-#include <ToolchainKit/UUID.hxx>
+#include <ToolchainKit/NFC/PEF.h>
+#include <ToolchainKit/UUID.h>
//! Dist version
-#include <ToolchainKit/Version.hxx>
+#include <ToolchainKit/Version.h>
//! Advanced Executable Object Format
-#include <ToolchainKit/NFC/AE.hxx>
+#include <ToolchainKit/NFC/AE.h>
/***
@brief IDL compiler maih.
diff --git a/dev/ToolchainKit/src/Linker.cc b/dev/ToolchainKit/src/Linker.cc
index 9a39935..78478c2 100644
--- a/dev/ToolchainKit/src/Linker.cc
+++ b/dev/ToolchainKit/src/Linker.cc
@@ -16,19 +16,19 @@
/// @note Do not look up for anything with .code64/.data64/.zero64!
/// It will be loaded when program will start up!
-#include <ToolchainKit/NFC/ErrorID.hxx>
+#include <ToolchainKit/NFC/ErrorID.h>
//! Assembler Kit
-#include <ToolchainKit/AAL/Asm.hxx>
+#include <ToolchainKit/AAL/Asm.h>
//! Preferred Executable Format
-#include <ToolchainKit/NFC/PEF.hxx>
-#include <ToolchainKit/UUID.hxx>
+#include <ToolchainKit/NFC/PEF.h>
+#include <ToolchainKit/UUID.h>
//! Dist version
-#include <ToolchainKit/Version.hxx>
+#include <ToolchainKit/Version.h>
//! Advanced Executable Object Format
-#include <ToolchainKit/NFC/AE.hxx>
+#include <ToolchainKit/NFC/AE.h>
#define kLinkerVersion "ZKA Linker Driver %s, (c) ZKA Web Services Co 2024, all rights reserved.\n"
diff --git a/dev/ToolchainKit/src/String.cc b/dev/ToolchainKit/src/String.cc
index 004e79c..3850e97 100644
--- a/dev/ToolchainKit/src/String.cc
+++ b/dev/ToolchainKit/src/String.cc
@@ -18,7 +18,7 @@
*
*/
-#include <ToolchainKit/NFC/String.hxx>
+#include <ToolchainKit/NFC/String.h>
namespace NDK
{