summaryrefslogtreecommitdiffhomepage
path: root/Kernel/KernelKit
diff options
context:
space:
mode:
authorAmlal EL Mahrouss <amlalelmahrouss@icloud.com>2024-08-02 20:11:24 +0200
committerAmlal EL Mahrouss <amlalelmahrouss@icloud.com>2024-08-02 20:11:24 +0200
commit59578978610f6af245f571a011694a51d94dc530 (patch)
tree3553807ef1c8095248520ee823c1426aef8738d8 /Kernel/KernelKit
parent9afcd1c001703c32964fed5906f36a2d913e91e9 (diff)
[unstable] [META] refactor whole project.
Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>
Diffstat (limited to 'Kernel/KernelKit')
-rw-r--r--Kernel/KernelKit/CodeManager.hxx (renamed from Kernel/KernelKit/CodeManager.hpp)0
-rw-r--r--Kernel/KernelKit/DebugOutput.hxx (renamed from Kernel/KernelKit/DebugOutput.hpp)6
-rw-r--r--Kernel/KernelKit/Defines.hxx (renamed from Kernel/KernelKit/Defines.hpp)2
-rw-r--r--Kernel/KernelKit/DeviceManager.hxx (renamed from Kernel/KernelKit/DeviceManager.hpp)2
-rw-r--r--Kernel/KernelKit/DriveManager.hxx8
-rw-r--r--Kernel/KernelKit/FileManager.hxx (renamed from Kernel/KernelKit/FileManager.hpp)6
-rw-r--r--Kernel/KernelKit/Framebuffer.hxx (renamed from Kernel/KernelKit/Framebuffer.hpp)2
-rw-r--r--Kernel/KernelKit/Heap.hxx2
-rw-r--r--Kernel/KernelKit/LPC.hxx2
-rw-r--r--Kernel/KernelKit/LoaderInterface.hxx (renamed from Kernel/KernelKit/LoaderInterface.hpp)4
-rw-r--r--Kernel/KernelKit/LockDelegate.hxx (renamed from Kernel/KernelKit/LockDelegate.hpp)4
-rw-r--r--Kernel/KernelKit/MP.hxx2
-rw-r--r--Kernel/KernelKit/MSDOS.hxx2
-rw-r--r--Kernel/KernelKit/PCI/Database.hxx (renamed from Kernel/KernelKit/PCI/Database.hpp)4
-rw-r--r--Kernel/KernelKit/PCI/Device.hxx (renamed from Kernel/KernelKit/PCI/Device.hpp)2
-rw-r--r--Kernel/KernelKit/PCI/Dma.hxx (renamed from Kernel/KernelKit/PCI/Dma.hpp)8
-rw-r--r--Kernel/KernelKit/PCI/Express.hxx (renamed from Kernel/KernelKit/PCI/Express.hpp)2
-rw-r--r--Kernel/KernelKit/PCI/IO.hxx (renamed from Kernel/KernelKit/PCI/IO.hpp)6
-rw-r--r--Kernel/KernelKit/PCI/Iterator.hxx (renamed from Kernel/KernelKit/PCI/Iterator.hpp)8
-rw-r--r--Kernel/KernelKit/PCI/PCI.hxx2
-rw-r--r--Kernel/KernelKit/PE.hxx2
-rw-r--r--Kernel/KernelKit/PECodeManager.hxx4
-rw-r--r--Kernel/KernelKit/PEF.hxx4
-rw-r--r--Kernel/KernelKit/PEFCodeManager.hxx6
-rw-r--r--Kernel/KernelKit/PEFSharedObject.hxx4
-rw-r--r--Kernel/KernelKit/ProcessHeap.hxx12
-rw-r--r--Kernel/KernelKit/ProcessScheduler.hxx9
-rw-r--r--Kernel/KernelKit/RLE.hxx2
-rw-r--r--Kernel/KernelKit/Semaphore.hxx (renamed from Kernel/KernelKit/Semaphore.hpp)4
-rw-r--r--Kernel/KernelKit/ThreadLocalStorage.hxx2
-rw-r--r--Kernel/KernelKit/Timer.hxx (renamed from Kernel/KernelKit/Timer.hpp)2
-rw-r--r--Kernel/KernelKit/User.hxx6
-rw-r--r--Kernel/KernelKit/XCOFF.hxx2
33 files changed, 67 insertions, 66 deletions
diff --git a/Kernel/KernelKit/CodeManager.hpp b/Kernel/KernelKit/CodeManager.hxx
index 5d1b5c86..5d1b5c86 100644
--- a/Kernel/KernelKit/CodeManager.hpp
+++ b/Kernel/KernelKit/CodeManager.hxx
diff --git a/Kernel/KernelKit/DebugOutput.hpp b/Kernel/KernelKit/DebugOutput.hxx
index 498b7972..6183c18d 100644
--- a/Kernel/KernelKit/DebugOutput.hpp
+++ b/Kernel/KernelKit/DebugOutput.hxx
@@ -6,10 +6,10 @@
#pragma once
-#include <KernelKit/DeviceManager.hpp>
+#include <KernelKit/DeviceManager.hxx>
#include <CompilerKit/CompilerKit.hxx>
-#include <NewKit/OwnPtr.hpp>
-#include <NewKit/Stream.hpp>
+#include <NewKit/OwnPtr.hxx>
+#include <NewKit/Stream.hxx>
#define kDebugMaxPorts 16
diff --git a/Kernel/KernelKit/Defines.hpp b/Kernel/KernelKit/Defines.hxx
index d69f4d1b..1daa922b 100644
--- a/Kernel/KernelKit/Defines.hpp
+++ b/Kernel/KernelKit/Defines.hxx
@@ -6,6 +6,6 @@
#pragma once
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
#define KERNELKIT_VERSION "1.02"
diff --git a/Kernel/KernelKit/DeviceManager.hpp b/Kernel/KernelKit/DeviceManager.hxx
index 8261834d..819fb498 100644
--- a/Kernel/KernelKit/DeviceManager.hpp
+++ b/Kernel/KernelKit/DeviceManager.hxx
@@ -18,7 +18,7 @@
/* @file KernelKit/DeviceManager.hpp */
/* @brief Device abstraction and I/O buffer. */
-#include <NewKit/ErrorOr.hpp>
+#include <NewKit/ErrorOr.hxx>
#include <NewKit/Ref.hxx>
// Last Rev
diff --git a/Kernel/KernelKit/DriveManager.hxx b/Kernel/KernelKit/DriveManager.hxx
index 3614f475..9baa9838 100644
--- a/Kernel/KernelKit/DriveManager.hxx
+++ b/Kernel/KernelKit/DriveManager.hxx
@@ -9,11 +9,11 @@
#include <KernelKit/ProcessScheduler.hxx>
#include <CompilerKit/CompilerKit.hxx>
-#include <KernelKit/DebugOutput.hpp>
-#include <KernelKit/DeviceManager.hpp>
+#include <KernelKit/DebugOutput.hxx>
+#include <KernelKit/DeviceManager.hxx>
#include <KernelKit/LPC.hxx>
-#include <NewKit/Defines.hpp>
-#include <NewKit/String.hpp>
+#include <NewKit/Defines.hxx>
+#include <NewKit/String.hxx>
#define kDriveManagerCount (4U)
diff --git a/Kernel/KernelKit/FileManager.hpp b/Kernel/KernelKit/FileManager.hxx
index a37360c7..57d8fe06 100644
--- a/Kernel/KernelKit/FileManager.hpp
+++ b/Kernel/KernelKit/FileManager.hxx
@@ -23,9 +23,9 @@
#include <CompilerKit/CompilerKit.hxx>
#include <HintKit/CompilerHint.hxx>
#include <KernelKit/LPC.hxx>
-#include <KernelKit/DebugOutput.hpp>
-#include <NewKit/Stream.hpp>
-#include <NewKit/ErrorOr.hpp>
+#include <KernelKit/DebugOutput.hxx>
+#include <NewKit/Stream.hxx>
+#include <NewKit/ErrorOr.hxx>
#include <NewKit/Ref.hxx>
/// @brief Filesystem manager, abstraction over mounted filesystem.
diff --git a/Kernel/KernelKit/Framebuffer.hpp b/Kernel/KernelKit/Framebuffer.hxx
index 3d0914ef..b4f6d212 100644
--- a/Kernel/KernelKit/Framebuffer.hpp
+++ b/Kernel/KernelKit/Framebuffer.hxx
@@ -10,7 +10,7 @@
#ifndef __INC_FB_HPP__
#define __INC_FB_HPP__
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
#include <NewKit/Ref.hxx>
namespace Kernel
diff --git a/Kernel/KernelKit/Heap.hxx b/Kernel/KernelKit/Heap.hxx
index 1ed029cd..ee176f3b 100644
--- a/Kernel/KernelKit/Heap.hxx
+++ b/Kernel/KernelKit/Heap.hxx
@@ -11,7 +11,7 @@
// file: KernelHeap.hxx
// description: heap allocation for the kernel.
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
namespace Kernel
{
diff --git a/Kernel/KernelKit/LPC.hxx b/Kernel/KernelKit/LPC.hxx
index fc322475..2450db20 100644
--- a/Kernel/KernelKit/LPC.hxx
+++ b/Kernel/KernelKit/LPC.hxx
@@ -6,7 +6,7 @@
#pragma once
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
/// @file LPC.hxx
/// @brief Local Process Codes.
diff --git a/Kernel/KernelKit/LoaderInterface.hpp b/Kernel/KernelKit/LoaderInterface.hxx
index e49e0085..46e4b5b5 100644
--- a/Kernel/KernelKit/LoaderInterface.hpp
+++ b/Kernel/KernelKit/LoaderInterface.hxx
@@ -8,8 +8,8 @@
#include <CompilerKit/CompilerKit.hxx>
#include <HintKit/CompilerHint.hxx>
-#include <NewKit/Defines.hpp>
-#include <NewKit/ErrorOr.hpp>
+#include <NewKit/Defines.hxx>
+#include <NewKit/ErrorOr.hxx>
namespace Kernel
{
diff --git a/Kernel/KernelKit/LockDelegate.hpp b/Kernel/KernelKit/LockDelegate.hxx
index 36a68054..adf4e492 100644
--- a/Kernel/KernelKit/LockDelegate.hpp
+++ b/Kernel/KernelKit/LockDelegate.hxx
@@ -6,8 +6,8 @@
#pragma once
-#include <NewKit/Atom.hpp>
-#include <NewKit/Defines.hpp>
+#include <NewKit/Atom.hxx>
+#include <NewKit/Defines.hxx>
namespace Kernel
{
diff --git a/Kernel/KernelKit/MP.hxx b/Kernel/KernelKit/MP.hxx
index 325e399c..df34bed8 100644
--- a/Kernel/KernelKit/MP.hxx
+++ b/Kernel/KernelKit/MP.hxx
@@ -7,7 +7,7 @@
#ifndef __INC_MP_MANAGER_HPP__
#define __INC_MP_MANAGER_HPP__
-#include <ArchKit/ArchKit.hpp>
+#include <ArchKit/ArchKit.hxx>
#include <CompilerKit/CompilerKit.hxx>
#include <NewKit/Ref.hxx>
diff --git a/Kernel/KernelKit/MSDOS.hxx b/Kernel/KernelKit/MSDOS.hxx
index 62fc1c64..b2730794 100644
--- a/Kernel/KernelKit/MSDOS.hxx
+++ b/Kernel/KernelKit/MSDOS.hxx
@@ -15,7 +15,7 @@
#define __MSDOS_EXEC__
#include <KernelKit/PE.hxx>
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
// Last Rev
// Sat Feb 24 CET 2024
diff --git a/Kernel/KernelKit/PCI/Database.hpp b/Kernel/KernelKit/PCI/Database.hxx
index 008cdb9a..03514207 100644
--- a/Kernel/KernelKit/PCI/Database.hpp
+++ b/Kernel/KernelKit/PCI/Database.hxx
@@ -5,8 +5,8 @@
------------------------------------------- */
#pragma once
-#include <KernelKit/PCI/Device.hpp>
-#include <NewKit/Defines.hpp>
+#include <KernelKit/PCI/Device.hxx>
+#include <NewKit/Defines.hxx>
namespace Kernel
{
diff --git a/Kernel/KernelKit/PCI/Device.hpp b/Kernel/KernelKit/PCI/Device.hxx
index bee1f631..68a77c18 100644
--- a/Kernel/KernelKit/PCI/Device.hpp
+++ b/Kernel/KernelKit/PCI/Device.hxx
@@ -5,7 +5,7 @@
------------------------------------------- */
#pragma once
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
namespace Kernel::PCI
{
diff --git a/Kernel/KernelKit/PCI/Dma.hpp b/Kernel/KernelKit/PCI/Dma.hxx
index dfac226f..7809d6cd 100644
--- a/Kernel/KernelKit/PCI/Dma.hpp
+++ b/Kernel/KernelKit/PCI/Dma.hxx
@@ -6,10 +6,10 @@
#pragma once
-#include <KernelKit/DeviceManager.hpp>
-#include <KernelKit/PCI/Device.hpp>
-#include <NewKit/Array.hpp>
-#include <NewKit/OwnPtr.hpp>
+#include <KernelKit/DeviceManager.hxx>
+#include <KernelKit/PCI/Device.hxx>
+#include <NewKit/Array.hxx>
+#include <NewKit/OwnPtr.hxx>
#include <NewKit/Ref.hxx>
namespace Kernel
diff --git a/Kernel/KernelKit/PCI/Express.hpp b/Kernel/KernelKit/PCI/Express.hxx
index 71ba4c50..41d07ad0 100644
--- a/Kernel/KernelKit/PCI/Express.hpp
+++ b/Kernel/KernelKit/PCI/Express.hxx
@@ -6,6 +6,6 @@
#pragma once
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
#define PCI_EXPRESS_BUS_COUNT (4096)
diff --git a/Kernel/KernelKit/PCI/IO.hpp b/Kernel/KernelKit/PCI/IO.hxx
index 90e9244d..55346d74 100644
--- a/Kernel/KernelKit/PCI/IO.hpp
+++ b/Kernel/KernelKit/PCI/IO.hxx
@@ -6,9 +6,9 @@
#pragma once
-#include <ArchKit/ArchKit.hpp>
-#include <NewKit/Array.hpp>
-#include <NewKit/Defines.hpp>
+#include <ArchKit/ArchKit.hxx>
+#include <NewKit/Array.hxx>
+#include <NewKit/Defines.hxx>
#include <NewKit/Ref.hxx>
namespace Kernel
diff --git a/Kernel/KernelKit/PCI/Iterator.hpp b/Kernel/KernelKit/PCI/Iterator.hxx
index 8c2df3b4..b299960d 100644
--- a/Kernel/KernelKit/PCI/Iterator.hpp
+++ b/Kernel/KernelKit/PCI/Iterator.hxx
@@ -7,10 +7,10 @@
#ifndef __PCI_ITERATOR_HPP__
#define __PCI_ITERATOR_HPP__
-#include <KernelKit/PCI/Database.hpp>
-#include <KernelKit/PCI/Device.hpp>
-#include <NewKit/Array.hpp>
-#include <NewKit/Defines.hpp>
+#include <KernelKit/PCI/Database.hxx>
+#include <KernelKit/PCI/Device.hxx>
+#include <NewKit/Array.hxx>
+#include <NewKit/Defines.hxx>
#include <NewKit/Ref.hxx>
#define NEWOS_BUS_COUNT (256)
diff --git a/Kernel/KernelKit/PCI/PCI.hxx b/Kernel/KernelKit/PCI/PCI.hxx
index e75215d6..f0dc477a 100644
--- a/Kernel/KernelKit/PCI/PCI.hxx
+++ b/Kernel/KernelKit/PCI/PCI.hxx
@@ -6,7 +6,7 @@
#pragma once
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
#define cPCIConfigAddressPort (0xCF8)
#define cPCIConfigDataPort (0xCFC)
diff --git a/Kernel/KernelKit/PE.hxx b/Kernel/KernelKit/PE.hxx
index 13b002d7..bcf325c6 100644
--- a/Kernel/KernelKit/PE.hxx
+++ b/Kernel/KernelKit/PE.hxx
@@ -14,7 +14,7 @@
#ifndef __KERNELKIT_INC_PE_HXX__
#define __KERNELKIT_INC_PE_HXX__
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
#define kPeMagic 0x00004550
diff --git a/Kernel/KernelKit/PECodeManager.hxx b/Kernel/KernelKit/PECodeManager.hxx
index 2de20405..51137803 100644
--- a/Kernel/KernelKit/PECodeManager.hxx
+++ b/Kernel/KernelKit/PECodeManager.hxx
@@ -20,5 +20,5 @@
////////////////////////////////////////////////////
#include <KernelKit/PE.hxx>
-#include <NewKit/ErrorOr.hpp>
-#include <NewKit/String.hpp>
+#include <NewKit/ErrorOr.hxx>
+#include <NewKit/String.hxx>
diff --git a/Kernel/KernelKit/PEF.hxx b/Kernel/KernelKit/PEF.hxx
index c3b1b94b..b560c572 100644
--- a/Kernel/KernelKit/PEF.hxx
+++ b/Kernel/KernelKit/PEF.hxx
@@ -15,8 +15,8 @@
#define __KERNELKIT_INC_PEF_HXX__
#include <CompilerKit/CompilerKit.hxx>
-#include <KernelKit/LoaderInterface.hpp>
-#include <NewKit/Defines.hpp>
+#include <KernelKit/LoaderInterface.hxx>
+#include <NewKit/Defines.hxx>
#define kPefMagic "Joy!"
#define kPefMagicFat "yoJ!"
diff --git a/Kernel/KernelKit/PEFCodeManager.hxx b/Kernel/KernelKit/PEFCodeManager.hxx
index 7f06e5ad..44a00360 100644
--- a/Kernel/KernelKit/PEFCodeManager.hxx
+++ b/Kernel/KernelKit/PEFCodeManager.hxx
@@ -8,9 +8,9 @@
#define _INC_CODE_MANAGER_PEF_HXX_
#include <KernelKit/PEF.hxx>
-#include <NewKit/ErrorOr.hpp>
-#include <NewKit/String.hpp>
-#include <KernelKit/FileManager.hpp>
+#include <NewKit/ErrorOr.hxx>
+#include <NewKit/String.hxx>
+#include <KernelKit/FileManager.hxx>
#define kPefApplicationMime "application/x-newos-exec"
diff --git a/Kernel/KernelKit/PEFSharedObject.hxx b/Kernel/KernelKit/PEFSharedObject.hxx
index 7b85937c..28c9081f 100644
--- a/Kernel/KernelKit/PEFSharedObject.hxx
+++ b/Kernel/KernelKit/PEFSharedObject.hxx
@@ -10,10 +10,10 @@
#ifndef __KERNELKIT_SHARED_OBJECT_HXX__
#define __KERNELKIT_SHARED_OBJECT_HXX__
-#include <KernelKit/LoaderInterface.hpp>
+#include <KernelKit/LoaderInterface.hxx>
#include <KernelKit/PEF.hxx>
#include <KernelKit/PEFCodeManager.hxx>
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
namespace Kernel
{
diff --git a/Kernel/KernelKit/ProcessHeap.hxx b/Kernel/KernelKit/ProcessHeap.hxx
index c7522da5..0a9b9a93 100644
--- a/Kernel/KernelKit/ProcessHeap.hxx
+++ b/Kernel/KernelKit/ProcessHeap.hxx
@@ -6,12 +6,12 @@
#pragma once
-#include <NewKit/Array.hpp>
-#include <NewKit/ArrayList.hpp>
-#include <NewKit/ErrorOr.hpp>
-#include <NewKit/PageManager.hpp>
+#include <NewKit/Array.hxx>
+#include <NewKit/ArrayList.hxx>
+#include <NewKit/ErrorOr.hxx>
+#include <NewKit/PageManager.hxx>
#include <NewKit/Ref.hxx>
-#include <NewKit/Pmm.hpp>
+#include <NewKit/Pmm.hxx>
/// @version 5/11/23
/// @file ProcessHeap.hxx
@@ -29,7 +29,7 @@ namespace Kernel
kUserHeapUser = 0x6,
/// @brief Read and Write heap.
kUserHeapRw = 0x8,
- } kUserHeapFlags;
+ } UserHeapFlags;
/// @brief Allocate a process heap, no zero out is done here.
/// @param flags the allocation flags.
diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx
index c15c5f76..afb3c89d 100644
--- a/Kernel/KernelKit/ProcessScheduler.hxx
+++ b/Kernel/KernelKit/ProcessScheduler.hxx
@@ -7,11 +7,11 @@
#ifndef _INC_PROCESS_SCHEDULER_HXX_
#define _INC_PROCESS_SCHEDULER_HXX_
-#include <ArchKit/ArchKit.hpp>
-#include <KernelKit/LockDelegate.hpp>
+#include <ArchKit/ArchKit.hxx>
+#include <KernelKit/LockDelegate.hxx>
#include <KernelKit/User.hxx>
#include <KernelKit/ProcessHeap.hxx>
-#include <NewKit/MutableArray.hpp>
+#include <NewKit/MutableArray.hxx>
#define kSchedMinMicroTime (AffinityKind::kStandard)
#define kSchedInvalidPID (-1)
@@ -28,10 +28,11 @@ namespace Kernel
{
//! @brief Forward declarations.
struct PROCESS_HEADER_BLOCK;
+
+ class PEFSharedObjectInterface;
class ProcessTeam;
class ProcessScheduler;
class ProcessHelper;
- class PEFSharedObjectInterface;
//! @brief Process identifier.
typedef Int64 ProcessID;
diff --git a/Kernel/KernelKit/RLE.hxx b/Kernel/KernelKit/RLE.hxx
index 9256c23b..78dda2ef 100644
--- a/Kernel/KernelKit/RLE.hxx
+++ b/Kernel/KernelKit/RLE.hxx
@@ -7,7 +7,7 @@
#ifndef __KERNELKIT_RLE_HXX__
#define __KERNELKIT_RLE_HXX__
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
EXTERN_C void rle_compress(void* data, long sz, void* out, long out_sz);
EXTERN_C void rle_decompress(void* data, long sz, void* out, long out_sz);
diff --git a/Kernel/KernelKit/Semaphore.hpp b/Kernel/KernelKit/Semaphore.hxx
index 1f67dbc6..4afedefb 100644
--- a/Kernel/KernelKit/Semaphore.hpp
+++ b/Kernel/KernelKit/Semaphore.hxx
@@ -6,8 +6,8 @@
#pragma once
-#include <NewKit/Defines.hpp>
-#include <KernelKit/Timer.hpp>
+#include <NewKit/Defines.hxx>
+#include <KernelKit/Timer.hxx>
#include <CompilerKit/CompilerKit.hxx>
namespace Kernel
diff --git a/Kernel/KernelKit/ThreadLocalStorage.hxx b/Kernel/KernelKit/ThreadLocalStorage.hxx
index 9332a47b..c6973fd4 100644
--- a/Kernel/KernelKit/ThreadLocalStorage.hxx
+++ b/Kernel/KernelKit/ThreadLocalStorage.hxx
@@ -7,7 +7,7 @@
#ifndef _KERNELKIT_TLS_HPP
#define _KERNELKIT_TLS_HPP
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
//! @brief TLS implementation in C++
diff --git a/Kernel/KernelKit/Timer.hpp b/Kernel/KernelKit/Timer.hxx
index eff075cc..014a504f 100644
--- a/Kernel/KernelKit/Timer.hpp
+++ b/Kernel/KernelKit/Timer.hxx
@@ -6,7 +6,7 @@
#pragma once
-#include <ArchKit/ArchKit.hpp>
+#include <ArchKit/ArchKit.hxx>
#include <CompilerKit/CompilerKit.hxx>
#include <KernelKit/LPC.hxx>
diff --git a/Kernel/KernelKit/User.hxx b/Kernel/KernelKit/User.hxx
index 3f78047c..5a91459b 100644
--- a/Kernel/KernelKit/User.hxx
+++ b/Kernel/KernelKit/User.hxx
@@ -9,8 +9,8 @@
#include <CompilerKit/CompilerKit.hxx>
#include <KernelKit/LPC.hxx>
-#include <NewKit/String.hpp>
-#include <NewKit/Defines.hpp>
+#include <NewKit/String.hxx>
+#include <NewKit/Defines.hxx>
// user mode users.
#define kSuperUser "Super"
@@ -26,8 +26,8 @@
namespace Kernel
{
- class User;
class UserManager;
+ class User;
enum class RingKind
{
diff --git a/Kernel/KernelKit/XCOFF.hxx b/Kernel/KernelKit/XCOFF.hxx
index 4d5a93be..dc0fb295 100644
--- a/Kernel/KernelKit/XCOFF.hxx
+++ b/Kernel/KernelKit/XCOFF.hxx
@@ -14,7 +14,7 @@
#ifndef __INC_XCOFF_HXX__
#define __INC_XCOFF_HXX__
-#include <NewKit/Defines.hpp>
+#include <NewKit/Defines.hxx>
#define cXCOFF64Magic (0x01F7)