diff --git a/arch/x86_64/features/x64.c b/arch/x86_64/features/x64.c
index eccbce1..15d124a 100644
--- a/arch/x86_64/features/x64.c
+++ b/arch/x86_64/features/x64.c
@@ -1,6 +1,6 @@
-#include "x64.h"
-#include "Console.h"
-#include "Io.h"
+#include <x64.h>
+#include <Console.h>
+#include <Io.h>
 
 static CpuFeatures cpu_features = {0};
 
diff --git a/arch/x86_64/features/x64.h b/arch/x86_64/features/x64.h
index b046fee..341318f 100644
--- a/arch/x86_64/features/x64.h
+++ b/arch/x86_64/features/x64.h
@@ -1,8 +1,8 @@
 #ifndef CPU_H
 #define CPU_H
 
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 typedef struct {
     bool sse;
diff --git a/arch/x86_64/gdt/Gdt.c b/arch/x86_64/gdt/Gdt.c
index deb737d..9337596 100644
--- a/arch/x86_64/gdt/Gdt.c
+++ b/arch/x86_64/gdt/Gdt.c
@@ -1,5 +1,5 @@
-#include "Gdt.h"
-#include "Panic.h"
+#include <Gdt.h>
+#include <Panic.h>
 
 // GDT with 7 entries: null, kcode, kdata, ucode, udata, tss_low, tss_high
 static struct GdtEntry gdt[7];
diff --git a/arch/x86_64/gdt/Gdt.h b/arch/x86_64/gdt/Gdt.h
index fd41c31..540dcfe 100644
--- a/arch/x86_64/gdt/Gdt.h
+++ b/arch/x86_64/gdt/Gdt.h
@@ -1,7 +1,7 @@
 #ifndef GDT_H
 #define GDT_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 #define GDT_ACCESS_CODE_PL0 0x9A // Present, Ring 0, Executable, Read/Write
 #define GDT_ACCESS_DATA_PL0 0x92 // Present, Ring 0, Read/Write
diff --git a/arch/x86_64/idt/Idt.c b/arch/x86_64/idt/Idt.c
index 05af4f7..c3c89d5 100644
--- a/arch/x86_64/idt/Idt.c
+++ b/arch/x86_64/idt/Idt.c
@@ -1,6 +1,6 @@
-#include "Idt.h"
-#include "Kernel.h"
-#include "Syscall.h"
+#include <Idt.h>
+#include <Kernel.h>
+#include <Syscall.h>
 #define IDT_ENTRIES 256
 
 struct IdtEntry g_Idt[IDT_ENTRIES];
diff --git a/arch/x86_64/idt/Idt.h b/arch/x86_64/idt/Idt.h
index a50266b..3ba47a8 100644
--- a/arch/x86_64/idt/Idt.h
+++ b/arch/x86_64/idt/Idt.h
@@ -1,7 +1,7 @@
 #ifndef IDT_H
 #define IDT_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // An entry in the IDT (64-bit)
 struct IdtEntry {
diff --git a/arch/x86_64/interrupts/Interrupts.c b/arch/x86_64/interrupts/Interrupts.c
index 01b164f..94d7256 100644
--- a/arch/x86_64/interrupts/Interrupts.c
+++ b/arch/x86_64/interrupts/Interrupts.c
@@ -1,15 +1,15 @@
-#include "Interrupts.h"
-#include "../../../drivers/APIC/APIC.h"
-#include "../../../drivers/storage/Ide.h"
-#include "Atomics.h"
-#include "Console.h"
-#include "Kernel.h"
-#include "PS2.h"
-#include "PageFaultHandler.h"
-#include "Panic.h"
-#include "Scheduler.h"
-#include "StackTrace.h"
-#include "ethernet/Network.h"
+#include <Interrupts.h>
+#include <../../../drivers/APIC/APIC.h>
+#include <../../../drivers/storage/Ide.h>
+#include <Atomics.h>
+#include <Console.h>
+#include <Kernel.h>
+#include <PS2.h>
+#include <PageFaultHandler.h>
+#include <Panic.h>
+#include <Scheduler.h>
+#include <StackTrace.h>
+#include <ethernet/Network.h>
 
 volatile uint32_t APICticks = 0;
 
diff --git a/arch/x86_64/interrupts/Interrupts.h b/arch/x86_64/interrupts/Interrupts.h
index d03c35c..4c89800 100644
--- a/arch/x86_64/interrupts/Interrupts.h
+++ b/arch/x86_64/interrupts/Interrupts.h
@@ -1,7 +1,7 @@
 #ifndef INTERRUPTS_H
 #define INTERRUPTS_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 uint64_t ToIRQ(uint64_t irn);
 
diff --git a/arch/x86_64/syscall/Syscall.c b/arch/x86_64/syscall/Syscall.c
index adc25f7..7537046 100644
--- a/arch/x86_64/syscall/Syscall.c
+++ b/arch/x86_64/syscall/Syscall.c
@@ -1,6 +1,6 @@
-#include "Syscall.h"
-#include "Console.h"
-#include "Scheduler.h"
+#include <Syscall.h>
+#include <Console.h>
+#include <Scheduler.h>
 
 uint64_t SyscallHandler(uint64_t syscall_num, uint64_t arg1, uint64_t arg2, uint64_t arg3) {
     switch (syscall_num) {
diff --git a/arch/x86_64/syscall/Syscall.h b/arch/x86_64/syscall/Syscall.h
index 4beb3cf..8632516 100644
--- a/arch/x86_64/syscall/Syscall.h
+++ b/arch/x86_64/syscall/Syscall.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_SYSCALL_H
 #define VOIDFRAME_SYSCALL_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 #define SYS_READ    0
 #define SYS_WRITE   1
diff --git a/crypto/CRC32.c b/crypto/CRC32.c
index 3d129cd..88f7736 100644
--- a/crypto/CRC32.c
+++ b/crypto/CRC32.c
@@ -1,4 +1,4 @@
-#include "CRC32.h"
+#include <CRC32.h>
 
 static uint32_t crc32_table[256];
 
diff --git a/crypto/RNG.c b/crypto/RNG.c
index 1b5adc7..ceedfe2 100644
--- a/crypto/RNG.c
+++ b/crypto/RNG.c
@@ -1,5 +1,5 @@
-#include "RNG.h"
-#include "Io.h"
+#include <RNG.h>
+#include <Io.h>
 
 static uint64_t s[2]; // state
 
diff --git a/crypto/RNG.h b/crypto/RNG.h
index 045dc12..52975f0 100644
--- a/crypto/RNG.h
+++ b/crypto/RNG.h
@@ -1,6 +1,6 @@
 #ifndef VOIDFRAME_RNG_H
 #define VOIDFRAME_RNG_H
-#include "stdint.h"
+#include <stdint.h>
 
 void rng_seed(uint64_t a, uint64_t b);
 uint64_t xoroshiro128plus();
diff --git a/crypto/SHA256.c b/crypto/SHA256.c
index 7c2686a..cd0f2c3 100644
--- a/crypto/SHA256.c
+++ b/crypto/SHA256.c
@@ -1,6 +1,6 @@
 
-#include "SHA256.h"
-#include "MemOps.h"
+#include <SHA256.h>
+#include <MemOps.h>
 
 #define ROTR(x, n) (((x) >> (n)) | ((x) << (32 - (n))))
 #define CH(x, y, z) (((x) & (y)) ^ (~(x) & (z)))
diff --git a/drivers/ACPI.c b/drivers/ACPI.c
index 2ea9c1c..ce8dc14 100644
--- a/drivers/ACPI.c
+++ b/drivers/ACPI.c
@@ -1,13 +1,13 @@
-#include "ACPI.h"
-#include "Console.h"
-#include "Io.h"
-#include "MemOps.h"
-#include "NVMe.h"
-#include "Scheduler.h"
-#include "StringOps.h"
-#include "VMem.h"
-#include "TSC.h"
-#include "VFS.h"
+#include <ACPI.h>
+#include <Console.h>
+#include <Io.h>
+#include <MemOps.h>
+#include <NVMe.h>
+#include <Scheduler.h>
+#include <StringOps.h>
+#include <VMem.h>
+#include <TSC.h>
+#include <VFS.h>
 
 static ACPIFADT* g_fadt = NULL;
 static bool g_acpi_initialized = false;
diff --git a/drivers/ACPI.h b/drivers/ACPI.h
index 8e7d683..fdd50ce 100644
--- a/drivers/ACPI.h
+++ b/drivers/ACPI.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 // ACPI Table signatures
 #define ACPI_RSDP_SIG "RSD PTR "
diff --git a/drivers/APIC/APIC.c b/drivers/APIC/APIC.c
index ee2a2c7..13fc969 100644
--- a/drivers/APIC/APIC.c
+++ b/drivers/APIC/APIC.c
@@ -1,11 +1,11 @@
-#include "APIC.h"
-#include "../../include/Io.h"
-#include "../../kernel/core/Kernel.h"
-#include "../../kernel/etc/Console.h"
-#include "../../mm/VMem.h"
-#include "../sound/Generic.h"
-#include "Panic.h"
-#include "x64.h"
+#include <APIC.h>
+#include <../../include/Io.h>
+#include <../../kernel/core/Kernel.h>
+#include <../../kernel/etc/Console.h>
+#include <../../mm/VMem.h>
+#include <../sound/Generic.h>
+#include <Panic.h>
+#include <x64.h>
 
 // --- Register Definitions ---
 
diff --git a/drivers/ISA/ISA.c b/drivers/ISA/ISA.c
index d0f8c9f..e5d017c 100644
--- a/drivers/ISA/ISA.c
+++ b/drivers/ISA/ISA.c
@@ -1,10 +1,10 @@
-#include "ISA.h"
-#include "../../mm/KernelHeap.h"
-#include "Console.h"
-#include "Io.h"
-#include "SB16.h"
-#include "VMem.h"
-#include "stdint.h"
+#include <ISA.h>
+#include <../../mm/KernelHeap.h>
+#include <Console.h>
+#include <Io.h>
+#include <SB16.h>
+#include <VMem.h>
+#include <stdint.h>
 
 static IsaBus g_isa_bus = {0};
 
diff --git a/drivers/ISA/ISA.h b/drivers/ISA/ISA.h
index 3634862..b1f8b6c 100644
--- a/drivers/ISA/ISA.h
+++ b/drivers/ISA/ISA.h
@@ -1,6 +1,6 @@
 #ifndef VOIDFRAME_ISA_H
 #define VOIDFRAME_ISA_H
-#include "stdint.h"
+#include <stdint.h>
 
 // ISA Bus I/O port ranges
 #define ISA_IO_BASE         0x000
diff --git a/drivers/LPT/LPT.c b/drivers/LPT/LPT.c
index a2feb76..115f490 100644
--- a/drivers/LPT/LPT.c
+++ b/drivers/LPT/LPT.c
@@ -1,8 +1,8 @@
-#include "LPT.h"
-#include "Io.h"
-#include "Console.h"
-#include "ISA.h"
-#include "stdint.h"
+#include <drivers/LPT/LPT.h>
+#include <Io.h>
+#include <Console.h>
+#include <ISA.h>
+#include <stdint.h>
 
 #define LPT_DATA_PORT    0
 #define LPT_STATUS_PORT  1
diff --git a/drivers/OPIC/OPIC.c b/drivers/OPIC/OPIC.c
index 4bd5db5..a1c4c17 100644
--- a/drivers/OPIC/OPIC.c
+++ b/drivers/OPIC/OPIC.c
@@ -9,13 +9,13 @@
  * like the AMD ÉlanSC520. Do not use this on modern systems.
  */
 
-#include "OPIC.h"
-#include "../../include/Io.h"
-#include "../../kernel/core/Kernel.h"
-#include "../../kernel/etc/Console.h"
-#include "../../mm/VMem.h"
-#include "x64.h"
-#include "Panic.h"
+#include <OPIC.h>
+#include <../../include/Io.h>
+#include <../../kernel/core/Kernel.h>
+#include <../../kernel/etc/Console.h>
+#include <../../mm/VMem.h>
+#include <x64.h>
+#include <Panic.h>
 
 // --- Register Definitions ---
 
diff --git a/drivers/PCI/PCI.c b/drivers/PCI/PCI.c
index 5ceefa3..7c956ee 100644
--- a/drivers/PCI/PCI.c
+++ b/drivers/PCI/PCI.c
@@ -1,11 +1,11 @@
-#include "PCI/PCI.h"
-#include "Console.h"
-#include "Io.h"
-#include "TSC.h"
-#include "stdbool.h"
-#include "stdint.h"
-#include "virtio/Virtio.h"
-#include "virtio/VirtioBlk.h"
+#include <PCI/PCI.h>
+#include <Console.h>
+#include <Io.h>
+#include <TSC.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <virtio/Virtio.h>
+#include <virtio/VirtioBlk.h>
 
 static uint8_t target_class;
 static uint8_t target_subclass;
diff --git a/drivers/PCI/PCI.h b/drivers/PCI/PCI.h
index f3f132d..3b38e30 100644
--- a/drivers/PCI/PCI.h
+++ b/drivers/PCI/PCI.h
@@ -1,7 +1,7 @@
 #ifndef PCI_H
 #define PCI_H
 
-#include "stdint.h" // Or your equivalent for standard types
+#include <stdint.h> // Or your equivalent for standard types
 
 // A structure to hold information about a discovered PCI device
 typedef struct {
diff --git a/drivers/PS2.c b/drivers/PS2.c
index 3fe5886..2634fbb 100644
--- a/drivers/PS2.c
+++ b/drivers/PS2.c
@@ -1,10 +1,10 @@
-#include "Compositor.h"
-#include "PS2.h"
+#include <Compositor.h>
+#include <PS2.h>
 
-#include "APIC/APIC.h"
-#include "Console.h"
-#include "Io.h"
-#include "Vesa.h"
+#include <APIC/APIC.h>
+#include <Console.h>
+#include <Io.h>
+#include <Vesa.h>
 
 // Keyboard buffer (unchanged)
 static volatile char input_buffer[256];
diff --git a/drivers/PS2.h b/drivers/PS2.h
index f0447af..5c96079 100644
--- a/drivers/PS2.h
+++ b/drivers/PS2.h
@@ -1,5 +1,5 @@
-#include "stdint.h"
-#include "Compositor.h"
+#include <stdint.h>
+#include <Compositor.h>
 
 #ifndef PS2_H
 #define PS2_H
diff --git a/drivers/RTC/Rtc.c b/drivers/RTC/Rtc.c
index d0c6ddf..0384392 100644
--- a/drivers/RTC/Rtc.c
+++ b/drivers/RTC/Rtc.c
@@ -1,6 +1,6 @@
-#include "RTC/Rtc.h"
-#include "Io.h"
-#include "stdbool.h"
+#include <RTC/Rtc.h>
+#include <Io.h>
+#include <stdbool.h>
 
 #define RTC_CMOS_ADDRESS 0x70
 #define RTC_CMOS_DATA 0x71
diff --git a/drivers/RTC/Rtc.h b/drivers/RTC/Rtc.h
index 5f0925e..14ec012 100644
--- a/drivers/RTC/Rtc.h
+++ b/drivers/RTC/Rtc.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_RTC_H
 #define VOIDFRAME_RTC_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // A structure to hold the date and time.
 typedef struct {
diff --git a/drivers/Random.c b/drivers/Random.c
index d912c84..e4a204c 100644
--- a/drivers/Random.c
+++ b/drivers/Random.c
@@ -1,6 +1,6 @@
-#include "Random.h"
-#include "../crypto/RNG.h"
-#include "../fs/CharDevice.h"
+#include <Random.h>
+#include <../crypto/RNG.h>
+#include <../fs/CharDevice.h>
 
 static int RandomDevRead(struct CharDevice* dev, void* buffer, uint32_t size) {
     uint8_t* buf = (uint8_t*)buffer;
diff --git a/drivers/Random.h b/drivers/Random.h
index 48684e2..60a4af8 100644
--- a/drivers/Random.h
+++ b/drivers/Random.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_RANDOM_H
 #define VOIDFRAME_RANDOM_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 void RandomInit(void);
 
diff --git a/drivers/Serial.c b/drivers/Serial.c
index 60abf7d..3f60e4d 100644
--- a/drivers/Serial.c
+++ b/drivers/Serial.c
@@ -1,7 +1,7 @@
-#include "Serial.h"
-#include "Io.h"
-#include "../fs/CharDevice.h"
-#include "../kernel/etc/Console.h"
+#include <Serial.h>
+#include <Io.h>
+#include <../fs/CharDevice.h>
+#include <../kernel/etc/Console.h>
 
 // Serial port register offsets
 #define SERIAL_DATA_REG     0  // Data register (DLAB=0)
diff --git a/drivers/TSC.c b/drivers/TSC.c
index c0fb351..123b809 100644
--- a/drivers/TSC.c
+++ b/drivers/TSC.c
@@ -1,7 +1,7 @@
-#include "TSC.h"
-#include "x64.h"
-#include "Console.h"
-#include "APIC/APIC.h"
+#include <TSC.h>
+#include <x64.h>
+#include <Console.h>
+#include <APIC/APIC.h>
 
 uint64_t tsc_freq_hz = 0;
 static bool tsc_calibrated = false;
diff --git a/drivers/TSC.h b/drivers/TSC.h
index 0688503..30fca97 100644
--- a/drivers/TSC.h
+++ b/drivers/TSC.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "stdint.h"
+#include <stdint.h>
 
 void TSCInit(void);
 
diff --git a/drivers/Vesa.c b/drivers/Vesa.c
index e42d1b4..af48464 100644
--- a/drivers/Vesa.c
+++ b/drivers/Vesa.c
@@ -1,12 +1,12 @@
-#include "Vesa.h"
-#include "../mm/MemOps.h"
-#include "Font.h"
-#include "Multiboot2.h"
-#include "Serial.h"
-#include "math.h"
-#include "stdint.h"
-#include "stdlib.h"
-#include "x64.h"
+#include <Vesa.h>
+#include <../mm/MemOps.h>
+#include <Font.h>
+#include <Multiboot2.h>
+#include <Serial.h>
+#include <math.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <x64.h>
 
 #ifndef VF_CONFIG_EXCLUDE_EXTRA_OBJECTS
 extern const uint32_t _binary_splash1_32_raw_start[];
diff --git a/drivers/Vesa.h b/drivers/Vesa.h
index b3ced9e..0a1242b 100644
--- a/drivers/Vesa.h
+++ b/drivers/Vesa.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_VESABIOSEXTENSION_H
 #define VOIDFRAME_VESABIOSEXTENSION_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // Common colors (32-bit RGBA format)
 #define VBE_COLOR_BLACK     0x00000000
diff --git a/drivers/ethernet/Network.c b/drivers/ethernet/Network.c
index cdc265e..5241706 100644
--- a/drivers/ethernet/Network.c
+++ b/drivers/ethernet/Network.c
@@ -1,9 +1,9 @@
-#include "Network.h"
-#include "Console.h"
-#include "StringOps.h"
-#include "intel/E1000.h"
-#include "interface/Arp.h"
-#include "realtek/RTL8139.h"
+#include <Network.h>
+#include <Console.h>
+#include <StringOps.h>
+#include <intel/E1000.h>
+#include <interface/Arp.h>
+#include <realtek/RTL8139.h>
 
 static NetworkDevice g_network_devices[MAX_NETWORK_DEVICES];
 static int g_device_count = 0;
diff --git a/drivers/ethernet/intel/E1000.c b/drivers/ethernet/intel/E1000.c
index 5caabc8..116f024 100644
--- a/drivers/ethernet/intel/E1000.c
+++ b/drivers/ethernet/intel/E1000.c
@@ -1,14 +1,14 @@
-#include "E1000.h"
-#include "../interface/Arp.h"
-#include "../interface/Ip.h"
-#include "Console.h"
-#include "TSC.h"
-#include "Io.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "PCI/PCI.h"
-#include "PMem.h"
-#include "ethernet/Packet.h"
+#include <E1000.h>
+#include <../interface/Arp.h>
+#include <../interface/Ip.h>
+#include <Console.h>
+#include <TSC.h>
+#include <Io.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <PCI/PCI.h>
+#include <PMem.h>
+#include <ethernet/Packet.h>
 
 static E1000Device g_e1000_device = {0};
 
diff --git a/drivers/ethernet/intel/E1000.h b/drivers/ethernet/intel/E1000.h
index 1c0a787..78770bd 100644
--- a/drivers/ethernet/intel/E1000.h
+++ b/drivers/ethernet/intel/E1000.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_E1000_H
 #define VOIDFRAME_E1000_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // E1000 PCI IDs
 #define E1000_VENDOR_ID     0x8086
diff --git a/drivers/ethernet/interface/Arp.c b/drivers/ethernet/interface/Arp.c
index 0c586a4..c45baa2 100644
--- a/drivers/ethernet/interface/Arp.c
+++ b/drivers/ethernet/interface/Arp.c
@@ -1,9 +1,9 @@
-#include "Arp.h"
-#include "../Network.h"
-#include "Console.h"
-#include "Ip.h"
-#include "MemOps.h"
-#include "stdbool.h"
+#include <Arp.h>
+#include <../Network.h>
+#include <Console.h>
+#include <Ip.h>
+#include <MemOps.h>
+#include <stdbool.h>
 
 static ArpCacheEntry g_arp_cache[ARP_CACHE_SIZE];
 
diff --git a/drivers/ethernet/interface/Arp.h b/drivers/ethernet/interface/Arp.h
index 96874fc..0730e6e 100644
--- a/drivers/ethernet/interface/Arp.h
+++ b/drivers/ethernet/interface/Arp.h
@@ -2,8 +2,8 @@
 #define ARP_H
 
 #include <stdint.h>
-#include "../Packet.h"
-#include "stdbool.h"
+#include <../Packet.h>
+#include <stdbool.h>
 
 #define ARP_CACHE_SIZE 16
 
diff --git a/drivers/ethernet/interface/Icmp.c b/drivers/ethernet/interface/Icmp.c
index 9e3e303..37dc3d6 100644
--- a/drivers/ethernet/interface/Icmp.c
+++ b/drivers/ethernet/interface/Icmp.c
@@ -1,8 +1,8 @@
-#include "Icmp.h"
-#include "Ip.h"
-#include "Console.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
+#include <Icmp.h>
+#include <Ip.h>
+#include <Console.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
 
 static uint16_t IcmpChecksum(const void* data, size_t length) {
     const uint16_t* buf = data;
diff --git a/drivers/ethernet/interface/Icmp.h b/drivers/ethernet/interface/Icmp.h
index 5bc1534..3525911 100644
--- a/drivers/ethernet/interface/Icmp.h
+++ b/drivers/ethernet/interface/Icmp.h
@@ -2,7 +2,7 @@
 #define ICMP_H
 
 #include <stdint.h>
-#include "Ip.h"
+#include <Ip.h>
 
 #define ICMP_TYPE_ECHO_REPLY   0
 #define ICMP_TYPE_ECHO_REQUEST 8
diff --git a/drivers/ethernet/interface/Ip.c b/drivers/ethernet/interface/Ip.c
index c02f747..71147da 100644
--- a/drivers/ethernet/interface/Ip.c
+++ b/drivers/ethernet/interface/Ip.c
@@ -1,10 +1,10 @@
-#include "Ip.h"
-#include "../Network.h"
-#include "Arp.h"
-#include "Console.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "ethernet/interface/Icmp.h"
+#include <Ip.h>
+#include <../Network.h>
+#include <Arp.h>
+#include <Console.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <ethernet/interface/Icmp.h>
 
 
 static uint16_t IpChecksum(const void* data, size_t length) {
diff --git a/drivers/ethernet/interface/Ip.h b/drivers/ethernet/interface/Ip.h
index 86012dd..ec2b1b2 100644
--- a/drivers/ethernet/interface/Ip.h
+++ b/drivers/ethernet/interface/Ip.h
@@ -2,7 +2,7 @@
 #define IP_H
 
 #include <stdint.h>
-#include "ethernet/Packet.h"
+#include <ethernet/Packet.h>
 
 #define IP_PROTOCOL_ICMP 1
 #define IP_PROTOCOL_TCP  6
diff --git a/drivers/ethernet/realtek/RTL8139.c b/drivers/ethernet/realtek/RTL8139.c
index e04f14b..466ca6b 100644
--- a/drivers/ethernet/realtek/RTL8139.c
+++ b/drivers/ethernet/realtek/RTL8139.c
@@ -1,12 +1,12 @@
-#include "RTL8139.h"
-#include "../../../mm/KernelHeap.h"
-#include "../../../mm/MemOps.h"
-#include "../../../mm/VMem.h"
-#include "../interface/Arp.h"
-#include "../interface/Ip.h"
-#include "Console.h"
-#include "Io.h"
-#include "ethernet/Packet.h"
+#include <RTL8139.h>
+#include <../../../mm/KernelHeap.h>
+#include <../../../mm/MemOps.h>
+#include <../../../mm/VMem.h>
+#include <../interface/Arp.h>
+#include <../interface/Ip.h>
+#include <Console.h>
+#include <Io.h>
+#include <ethernet/Packet.h>
 
 // Global device object
 static Rtl8139Device rtl_device;
diff --git a/drivers/ethernet/realtek/RTL8139.h b/drivers/ethernet/realtek/RTL8139.h
index c6aa2e5..67dc794 100644
--- a/drivers/ethernet/realtek/RTL8139.h
+++ b/drivers/ethernet/realtek/RTL8139.h
@@ -2,7 +2,7 @@
 #define RTL8139_H
 
 #include <stdint.h>
-#include "PCI/PCI.h"
+#include <PCI/PCI.h>
 
 // =============================================================================
 //         RTL8139 Register Offsets (from the I/O base address)
diff --git a/drivers/input/Keyboard.c b/drivers/input/Keyboard.c
index 8e22c67..14fc71e 100644
--- a/drivers/input/Keyboard.c
+++ b/drivers/input/Keyboard.c
@@ -1,6 +1,6 @@
-#include "Keyboard.h"
-#include "../PS2.h"
-#include "../usb/hid/USBKeyboard.h"
+#include <Keyboard.h>
+#include <../PS2.h>
+#include <../usb/hid/USBKeyboard.h>
 
 /**
  * @brief Checks for input, prioritizing USB keyboards over PS/2.
diff --git a/drivers/sound/Generic.c b/drivers/sound/Generic.c
index d22eefb..180d1c9 100644
--- a/drivers/sound/Generic.c
+++ b/drivers/sound/Generic.c
@@ -1,7 +1,7 @@
-#include "Generic.h"
-#include "Console.h"
-#include "TSC.h"
-#include "Io.h"
+#include <Generic.h>
+#include <Console.h>
+#include <TSC.h>
+#include <Io.h>
 
 static int pc_speaker_initialized = 0;
 
diff --git a/drivers/sound/Generic.h b/drivers/sound/Generic.h
index 06f4ca0..543bc85 100644
--- a/drivers/sound/Generic.h
+++ b/drivers/sound/Generic.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_GENERIC_SOUND_H
 #define VOIDFRAME_GENERIC_SOUND_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // PC Speaker ports
 #define PC_SPEAKER_PORT     0x61
diff --git a/drivers/sound/SB16.c b/drivers/sound/SB16.c
index f5114fa..7c2c4d7 100644
--- a/drivers/sound/SB16.c
+++ b/drivers/sound/SB16.c
@@ -1,7 +1,7 @@
-#include "SB16.h"
-#include "Io.h"
-#include "TSC.h"
-#include "stdint.h"
+#include <SB16.h>
+#include <Io.h>
+#include <TSC.h>
+#include <stdint.h>
 
 int SB16_Probe(uint16_t io_base) {
     // 1. Pulse the reset line high.
diff --git a/drivers/sound/SB16.h b/drivers/sound/SB16.h
index 1084082..95ad462 100644
--- a/drivers/sound/SB16.h
+++ b/drivers/sound/SB16.h
@@ -1,8 +1,8 @@
 #ifndef VOIDFRAME_SB16_H
 #define VOIDFRAME_SB16_H
 
-#include "Io.h"
-#include "stdint.h"
+#include <Io.h>
+#include <stdint.h>
 
 #define SB16_DSP_BASE       0x220
 #define SB16_MIXER_BASE     0x224
diff --git a/drivers/storage/AHCI.c b/drivers/storage/AHCI.c
index ac8e08d..a723519 100644
--- a/drivers/storage/AHCI.c
+++ b/drivers/storage/AHCI.c
@@ -1,13 +1,13 @@
-#include "AHCI.h"
-#include "Console.h"
-#include "TSC.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "VMem.h"
-#include "BlockDevice.h"
-#include "DriveNaming.h"
-#include "Format.h"
-#include "PCI/PCI.h"
+#include <AHCI.h>
+#include <Console.h>
+#include <TSC.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <VMem.h>
+#include <BlockDevice.h>
+#include <DriveNaming.h>
+#include <Format.h>
+#include <PCI/PCI.h>
 
 #define FIS_TYPE_REG_H2D    0x27
 #define ATA_CMD_READ_DMA_EX 0x25
diff --git a/drivers/storage/AHCI.h b/drivers/storage/AHCI.h
index 512c37d..589fd39 100644
--- a/drivers/storage/AHCI.h
+++ b/drivers/storage/AHCI.h
@@ -1,8 +1,8 @@
 #ifndef VOIDFRAME_AHCI_H
 #define VOIDFRAME_AHCI_H
 
-#include "stdint.h"
-#include "PCI/PCI.h"
+#include <stdint.h>
+#include <PCI/PCI.h>
 
 // AHCI PCI Class/Subclass
 #define AHCI_CLASS_CODE     0x01
diff --git a/drivers/storage/Ide.c b/drivers/storage/Ide.c
index 3ba44ba..109cf98 100644
--- a/drivers/storage/Ide.c
+++ b/drivers/storage/Ide.c
@@ -1,12 +1,12 @@
-#include "Ide.h"
-#include "../APIC/APIC.h"
-#include "BlockDevice.h"
-#include "Console.h"
-#include "DriveNaming.h"
-#include "Format.h"
-#include "Io.h"
-#include "MemOps.h"
-#include "SpinlockRust.h"
+#include <Ide.h>
+#include <../APIC/APIC.h>
+#include <BlockDevice.h>
+#include <Console.h>
+#include <DriveNaming.h>
+#include <Format.h>
+#include <Io.h>
+#include <MemOps.h>
+#include <SpinlockRust.h>
 
 static IdeChannel channels[2];
 static RustSpinLock* ide_lock = NULL;
diff --git a/drivers/storage/Ide.h b/drivers/storage/Ide.h
index bdd9d0b..981d9a9 100644
--- a/drivers/storage/Ide.h
+++ b/drivers/storage/Ide.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-#include "BlockDevice.h"
+#include <BlockDevice.h>
 
 // IDE Controller Ports
 #define IDE_PRIMARY_BASE    0x1F0
diff --git a/drivers/storage/NVMe.c b/drivers/storage/NVMe.c
index a3e52db..81a0538 100644
--- a/drivers/storage/NVMe.c
+++ b/drivers/storage/NVMe.c
@@ -1,13 +1,13 @@
-#include "NVMe.h"
-#include "Console.h"
-#include "TSC.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "VMem.h"
-#include "BlockDevice.h"
-#include "DriveNaming.h"
-#include "Format.h"
-#include "PCI/PCI.h"
+#include <NVMe.h>
+#include <Console.h>
+#include <TSC.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <VMem.h>
+#include <BlockDevice.h>
+#include <DriveNaming.h>
+#include <Format.h>
+#include <PCI/PCI.h>
 
 static NVMeController g_nvme_controller = {0};
 
diff --git a/drivers/storage/NVMe.h b/drivers/storage/NVMe.h
index 07c6e1a..2c11308 100644
--- a/drivers/storage/NVMe.h
+++ b/drivers/storage/NVMe.h
@@ -1,9 +1,9 @@
 #ifndef VOIDFRAME_NVME_H
 #define VOIDFRAME_NVME_H
 
-#include "stdint.h"
-#include "PCI/PCI.h"
-#include "kernel/atomic/SpinlockRust.h"
+#include <stdint.h>
+#include <PCI/PCI.h>
+#include <kernel/atomic/SpinlockRust.h>
 
 // NVMe PCI Class/Subclass
 #define NVME_CLASS_CODE     0x01
diff --git a/drivers/usb/hid/USBKeyboard.c b/drivers/usb/hid/USBKeyboard.c
index c3944ab..ab38a37 100644
--- a/drivers/usb/hid/USBKeyboard.c
+++ b/drivers/usb/hid/USBKeyboard.c
@@ -1,7 +1,7 @@
-#include "USBKeyboard.h"
+#include <USBKeyboard.h>
 
-#include "Console.h"
-#include "VMem.h"
+#include <Console.h>
+#include <VMem.h>
 
 // Input buffer for the keyboard
 static volatile char input_buffer[256];
diff --git a/drivers/usb/hid/USBKeyboard.h b/drivers/usb/hid/USBKeyboard.h
index bae6cbd..af16bf4 100644
--- a/drivers/usb/hid/USBKeyboard.h
+++ b/drivers/usb/hid/USBKeyboard.h
@@ -1,7 +1,7 @@
 #ifndef USB_KEYBOARD_H
 #define USB_KEYBOARD_H
 
-#include "../../xHCI/xHCI.h"
+#include <../../xHCI/xHCI.h>
 
 // Represents the 8-byte report sent by a standard USB HID keyboard.
 typedef struct {
diff --git a/drivers/virtio/Virtio.h b/drivers/virtio/Virtio.h
index f10e2a8..fa00591 100644
--- a/drivers/virtio/Virtio.h
+++ b/drivers/virtio/Virtio.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_VIRTIO_H
 #define VOIDFRAME_VIRTIO_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // Common VirtIO definitions will go here.
 // For example, PCI configuration registers, feature bits, status fields, etc.
diff --git a/drivers/virtio/VirtioBlk.c b/drivers/virtio/VirtioBlk.c
index e9c7429..546f154 100644
--- a/drivers/virtio/VirtioBlk.c
+++ b/drivers/virtio/VirtioBlk.c
@@ -1,15 +1,15 @@
-#include "VirtioBlk.h"
-#include "Atomics.h"
-#include "BlockDevice.h"
-#include "Console.h"
-#include "DriveNaming.h"
-#include "Format.h"
-#include "PCI/PCI.h"
-#include "Spinlock.h"
-#include "SpinlockRust.h"
-#include "VMem.h"
-#include "Virtio.h"
-#include "stdbool.h"
+#include <VirtioBlk.h>
+#include <Atomics.h>
+#include <BlockDevice.h>
+#include <Console.h>
+#include <DriveNaming.h>
+#include <Format.h>
+#include <PCI/PCI.h>
+#include <Spinlock.h>
+#include <SpinlockRust.h>
+#include <VMem.h>
+#include <Virtio.h>
+#include <stdbool.h>
 // Globals to hold the capability structures we find
 static RustSpinLock* virtio_lock = NULL;
 static struct VirtioPciCap cap_common_cfg;
diff --git a/drivers/virtio/VirtioBlk.h b/drivers/virtio/VirtioBlk.h
index d9f7d7a..cdb7646 100644
--- a/drivers/virtio/VirtioBlk.h
+++ b/drivers/virtio/VirtioBlk.h
@@ -1,8 +1,8 @@
 #ifndef VOIDFRAME_VIRTIOBLK_H
 #define VOIDFRAME_VIRTIOBLK_H
 
-#include "PCI/PCI.h"
-#include "BlockDevice.h"
+#include <PCI/PCI.h>
+#include <BlockDevice.h>
 
 void InitializeVirtioBlk(PciDevice device);
 int VirtioBlkRead(uint64_t sector, void* buffer, uint32_t count);
diff --git a/drivers/vmware/SVGAII.c b/drivers/vmware/SVGAII.c
index d15a406..9a047d2 100644
--- a/drivers/vmware/SVGAII.c
+++ b/drivers/vmware/SVGAII.c
@@ -1,8 +1,8 @@
-#include "SVGAII.h"
-#include "../../drivers/PCI/PCI.h"
-#include "../../include/Io.h"
-#include "../../mm/VMem.h"
-#include "../../kernel/etc/Console.h"
+#include <SVGAII.h>
+#include <../../drivers/PCI/PCI.h>
+#include <../../include/Io.h>
+#include <../../mm/VMem.h>
+#include <../../kernel/etc/Console.h>
 
 // Global device info instance
 SVGAII_DeviceInfo svgaII_device;
diff --git a/drivers/xHCI/xHCI.c b/drivers/xHCI/xHCI.c
index a56d965..2028fa0 100644
--- a/drivers/xHCI/xHCI.c
+++ b/drivers/xHCI/xHCI.c
@@ -1,9 +1,9 @@
-#include "xHCI.h"
-#include "usb/hid/USBKeyboard.h"
-#include "../../mm/MemOps.h"
-#include "../../mm/VMem.h"
-#include "Console.h"
-#include "TSC.h"
+#include <xHCI.h>
+#include <usb/hid/USBKeyboard.h>
+#include <../../mm/MemOps.h>
+#include <../../mm/VMem.h>
+#include <Console.h>
+#include <TSC.h>
 
 // 5.4 - Operational Registers
 #define XHCI_OP_USBCMD  0x00 // USB Command Register
diff --git a/drivers/xHCI/xHCI.h b/drivers/xHCI/xHCI.h
index d46f452..3fbd78f 100644
--- a/drivers/xHCI/xHCI.h
+++ b/drivers/xHCI/xHCI.h
@@ -1,8 +1,8 @@
 #ifndef XHCI_H
 #define XHCI_H
 
-#include "PCI/PCI.h" // Assuming this is your PCI header
-#include "stdint.h"
+#include <PCI/PCI.h> // Assuming this is your PCI header
+#include <stdint.h>
 
 typedef struct {
     uint32_t parameter_lo;
diff --git a/fs/BlockDevice.c b/fs/BlockDevice.c
index 9eabe69..fd12da0 100644
--- a/fs/BlockDevice.c
+++ b/fs/BlockDevice.c
@@ -1,7 +1,7 @@
-#include "BlockDevice.h"
-#include "MBR.h"
-#include "StringOps.h"
-#include "Console.h"
+#include <BlockDevice.h>
+#include <MBR.h>
+#include <StringOps.h>
+#include <Console.h>
 
 static BlockDevice g_block_devices[MAX_BLOCK_DEVICES];
 static int g_next_device_id = 0;
diff --git a/fs/BlockDevice.h b/fs/BlockDevice.h
index a6fa8ac..62a71f7 100644
--- a/fs/BlockDevice.h
+++ b/fs/BlockDevice.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 
 #define MAX_BLOCK_DEVICES 16
 
diff --git a/fs/CharDevice.c b/fs/CharDevice.c
index 36a74f1..4e891f9 100644
--- a/fs/CharDevice.c
+++ b/fs/CharDevice.c
@@ -1,5 +1,5 @@
-#include "CharDevice.h"
-#include "../kernel/etc/StringOps.h"
+#include <CharDevice.h>
+#include <../kernel/etc/StringOps.h>
 
 static CharDevice_t* g_char_devices[MAX_CHAR_DEVICES];
 static int g_num_char_devices = 0;
diff --git a/fs/DriveNaming.c b/fs/DriveNaming.c
index a66da35..1dce910 100644
--- a/fs/DriveNaming.c
+++ b/fs/DriveNaming.c
@@ -1,6 +1,6 @@
-#include "DriveNaming.h"
-#include "Format.h"
-#include "SpinlockRust.h"
+#include <DriveNaming.h>
+#include <Format.h>
+#include <SpinlockRust.h>
 
 static int ide_count = 0;
 static int ahci_count = 0;
diff --git a/fs/DriveNaming.h b/fs/DriveNaming.h
index da0f160..008520d 100644
--- a/fs/DriveNaming.h
+++ b/fs/DriveNaming.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "BlockDevice.h"
+#include <BlockDevice.h>
 
 void GenerateDriveNameInto(BlockDeviceType type, char* out_name);
\ No newline at end of file
diff --git a/fs/EXT/Ext2.c b/fs/EXT/Ext2.c
index bca8c28..101658c 100644
--- a/fs/EXT/Ext2.c
+++ b/fs/EXT/Ext2.c
@@ -1,13 +1,13 @@
-#include "Ext2.h"
-#include "../../kernel/etc/Console.h"
-#include "../../kernel/etc/StringOps.h"
-#include "Scheduler.h"
-#include "../../mm/KernelHeap.h"
-#include "../../mm/MemOps.h"
-#include "../VFS.h"
-#include "FileSystem.h"
-#include "Rtc.h"
-#include "SpinlockRust.h"
+#include <Ext2.h>
+#include <../../kernel/etc/Console.h>
+#include <../../kernel/etc/StringOps.h>
+#include <Scheduler.h>
+#include <../../mm/KernelHeap.h>
+#include <../../mm/MemOps.h>
+#include <../VFS.h>
+#include <FileSystem.h>
+#include <Rtc.h>
+#include <SpinlockRust.h>
 
 #define EXT2_SUPERBLOCK_OFFSET 1024
 #define EXT2_MAGIC 0xEF53
diff --git a/fs/EXT/Ext2.h b/fs/EXT/Ext2.h
index bb48d71..a7627de 100644
--- a/fs/EXT/Ext2.h
+++ b/fs/EXT/Ext2.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "BlockDevice.h"
-#include "stdint.h"
+#include <BlockDevice.h>
+#include <stdint.h>
 
-#include "BlockDevice.h"
+#include <BlockDevice.h>
 
 // Minimal EXT2 data structures
 
diff --git a/fs/FAT/FAT1x.c b/fs/FAT/FAT1x.c
index f625345..e4c0cdb 100644
--- a/fs/FAT/FAT1x.c
+++ b/fs/FAT/FAT1x.c
@@ -1,12 +1,12 @@
-#include "FAT1x.h"
-
-#include "Console.h"
-#include "FileSystem.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "MemPool.h"
-#include "StringOps.h"
-#include "VFS.h"
+#include <FAT1x.h>
+
+#include <Console.h>
+#include <FileSystem.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <MemPool.h>
+#include <StringOps.h>
+#include <VFS.h>
 
 // Per-device volume registry and active context
 static Fat1xVolume* g_fat1x_by_dev[MAX_BLOCK_DEVICES] = {0};
diff --git a/fs/FAT/FAT1x.h b/fs/FAT/FAT1x.h
index 5896fa3..eab3770 100644
--- a/fs/FAT/FAT1x.h
+++ b/fs/FAT/FAT1x.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-#include "BlockDevice.h"
+#include <BlockDevice.h>
 
 // FAT12 Boot Sector Structure
 typedef struct __attribute__((packed)) {
diff --git a/fs/FileSystem.c b/fs/FileSystem.c
index 0d84088..5640029 100644
--- a/fs/FileSystem.c
+++ b/fs/FileSystem.c
@@ -1,8 +1,8 @@
-#include "FileSystem.h"
-#include "BlockDevice.h"
-#include "Console.h"
-#include "Format.h"
-#include "VFS.h"
+#include <FileSystem.h>
+#include <BlockDevice.h>
+#include <Console.h>
+#include <Format.h>
+#include <VFS.h>
 static FileSystemDriver* g_fs_drivers[MAX_FILESYSTEM_DRIVERS];
 static int g_num_fs_drivers = 0;
 
diff --git a/fs/FsUtils.h b/fs/FsUtils.h
index 633a106..e091bda 100644
--- a/fs/FsUtils.h
+++ b/fs/FsUtils.h
@@ -1,8 +1,8 @@
 #ifndef FS_UTILS_H
 #define FS_UTILS_H
 
-#include "../mm/MemOps.h"
-#include "StringOps.h"
+#include <../mm/MemOps.h>
+#include <StringOps.h>
 #define MAX_PATH_COMPONENTS 32
 
 /**
diff --git a/fs/Iso9660.c b/fs/Iso9660.c
index 1e1cc5d..9d37d5b 100644
--- a/fs/Iso9660.c
+++ b/fs/Iso9660.c
@@ -1,12 +1,12 @@
-#include "Iso9660.h"
-
-#include "../drivers/storage/Ide.h"
-#include "../kernel/etc/StringOps.h"
-#include "../mm/KernelHeap.h"
-#include "Console.h"
-#include "Format.h"
-#include "MemOps.h"
-#include "VFS.h"
+#include <Iso9660.h>
+
+#include <../drivers/storage/Ide.h>
+#include <../kernel/etc/StringOps.h>
+#include <../mm/KernelHeap.h>
+#include <Console.h>
+#include <Format.h>
+#include <MemOps.h>
+#include <VFS.h>
 
 #define ISO9660_SECTOR_SIZE 2048
 
diff --git a/fs/Iso9660.h b/fs/Iso9660.h
index c52eab3..ccc0f32 100644
--- a/fs/Iso9660.h
+++ b/fs/Iso9660.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdint.h"
+#include <stdint.h>
 
 // ISO9660 Primary Volume Descriptor
 typedef struct __attribute__((packed)) {
diff --git a/fs/MBR.c b/fs/MBR.c
index bf1c9f7..3de0ccd 100644
--- a/fs/MBR.c
+++ b/fs/MBR.c
@@ -1,8 +1,8 @@
-#include "MBR.h"
-#include "BlockDevice.h"
-#include "Console.h"
-#include "Format.h"
-#include "KernelHeap.h"
+#include <MBR.h>
+#include <BlockDevice.h>
+#include <Console.h>
+#include <Format.h>
+#include <KernelHeap.h>
 
 static int PartitionReadBlocks(BlockDevice* device, uint64_t start_lba, uint32_t count, void* buffer) {
     if (!device || !device->parent) {
diff --git a/fs/MBR.h b/fs/MBR.h
index 9c245fc..82a7456 100644
--- a/fs/MBR.h
+++ b/fs/MBR.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "BlockDevice.h"
-#include "stdint.h"
+#include <BlockDevice.h>
+#include <stdint.h>
 
 #define MBR_PARTITION_COUNT 4
 
diff --git a/fs/NTFS/NTFS.c b/fs/NTFS/NTFS.c
index 76457f9..7e6a891 100644
--- a/fs/NTFS/NTFS.c
+++ b/fs/NTFS/NTFS.c
@@ -1,13 +1,13 @@
-#include "NTFS.h"
-#include "BlockDevice.h"
-#include "Console.h"
-#include "FileSystem.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "VFS.h"
-#include "SpinlockRust.h"
-#include "Scheduler.h"
-#include "Rtc.h"
+#include <NTFS.h>
+#include <BlockDevice.h>
+#include <Console.h>
+#include <FileSystem.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <VFS.h>
+#include <SpinlockRust.h>
+#include <Scheduler.h>
+#include <Rtc.h>
 
 typedef struct {
     struct BlockDevice* device;
diff --git a/fs/NTFS/NTFS.h b/fs/NTFS/NTFS.h
index afd1e1f..f31da92 100644
--- a/fs/NTFS/NTFS.h
+++ b/fs/NTFS/NTFS.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "BlockDevice.h"
-#include "stdint.h"
-#include "KernelHeap.h"
+#include <BlockDevice.h>
+#include <stdint.h>
+#include <KernelHeap.h>
 
 // NTFS Boot Sector
 typedef struct {
diff --git a/fs/VFRFS.c b/fs/VFRFS.c
index 580532b..2678715 100644
--- a/fs/VFRFS.c
+++ b/fs/VFRFS.c
@@ -1,9 +1,9 @@
-#include "Console.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "Scheduler.h"
-#include "StringOps.h"
-#include "VFRFS.h"
+#include <Console.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <Scheduler.h>
+#include <StringOps.h>
+#include <VFRFS.h>
 
 // --- Static Globals ---
 static FsNode* root_node = NULL;
diff --git a/fs/VFRFS.h b/fs/VFRFS.h
index 4dc5c95..b336c0d 100644
--- a/fs/VFRFS.h
+++ b/fs/VFRFS.h
@@ -1,8 +1,8 @@
 #ifndef FS_H
 #define FS_H
 
-#include "stdint.h"
-#include "stddef.h"
+#include <stdint.h>
+#include <stddef.h>
 
 #define MAX_FILENAME 64
 #define MAX_PATH 256
diff --git a/fs/VFS.c b/fs/VFS.c
index 3e76381..8a43381 100644
--- a/fs/VFS.c
+++ b/fs/VFS.c
@@ -1,19 +1,19 @@
-#include "VFS.h"
-#include "../mm/MemOps.h"
-#include "BlockDevice.h"
-#include "CharDevice.h"
-#include "Console.h"
-#include "devfs/DevFS.h"
-#include "procfs/ProcFS.h"
-#include "EXT/Ext2.h"
-#include "FAT/FAT1x.h"
-#include "FileSystem.h"
-#include "KernelHeap.h"
-#include "NTFS.h"
-#include "Serial.h"
-#include "StringOps.h"
-#include "VFRFS.h"
-#include "stdbool.h"
+#include <VFS.h>
+#include <../mm/MemOps.h>
+#include <BlockDevice.h>
+#include <CharDevice.h>
+#include <Console.h>
+#include <devfs/DevFS.h>
+#include <procfs/ProcFS.h>
+#include <EXT/Ext2.h>
+#include <FAT/FAT1x.h>
+#include <FileSystem.h>
+#include <KernelHeap.h>
+#include <NTFS.h>
+#include <Serial.h>
+#include <StringOps.h>
+#include <VFRFS.h>
+#include <stdbool.h>
 
 #define VFS_MAX_PATH_LEN 256
 
diff --git a/fs/VFS.h b/fs/VFS.h
index 863461a..b07fb02 100644
--- a/fs/VFS.h
+++ b/fs/VFS.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "BlockDevice.h"
-#include "FileSystem.h"
-#include "stdbool.h"
-#include "stdint.h"
+#include <BlockDevice.h>
+#include <FileSystem.h>
+#include <stdbool.h>
+#include <stdint.h>
 struct BlockDevice;
 struct FileSystemDriver;
 
diff --git a/fs/devfs/DevFS.c b/fs/devfs/DevFS.c
index de12153..cd688bb 100644
--- a/fs/devfs/DevFS.c
+++ b/fs/devfs/DevFS.c
@@ -1,7 +1,7 @@
-#include "DevFS.h"
-#include "../CharDevice.h"
-#include "../../kernel/etc/Console.h"
-#include "../../kernel/etc/StringOps.h"
+#include <DevFS.h>
+#include <../CharDevice.h>
+#include <../../kernel/etc/Console.h>
+#include <../../kernel/etc/StringOps.h>
 
 int DevfsMount(struct BlockDevice* device, const char* mount_point) {
     // DevFS is a virtual filesystem and doesn't need a device.
diff --git a/fs/devfs/DevFS.h b/fs/devfs/DevFS.h
index cdc8841..fa296e4 100644
--- a/fs/devfs/DevFS.h
+++ b/fs/devfs/DevFS.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_DEVFS_H
 #define VOIDFRAME_DEVFS_H
 
-#include "../BlockDevice.h"
+#include <../BlockDevice.h>
 
 // This is a virtual filesystem, so it doesn't have a block device.
 // The mount function is just a placeholder to satisfy the FileSystemDriver struct.
diff --git a/fs/procfs/ProcFS.c b/fs/procfs/ProcFS.c
index c261968..e8403dd 100644
--- a/fs/procfs/ProcFS.c
+++ b/fs/procfs/ProcFS.c
@@ -1,12 +1,12 @@
-#include "ProcFS.h"
-#include "VFS.h"
-#include "KernelHeap.h"
-#include "StringOps.h"
-#include "Console.h"
-#include "Format.h"
-#include "stdlib.h"
-#include "MemOps.h"
-#include "Scheduler.h"
+#include <fs/procfs/ProcFS.h>
+#include <VFS.h>
+#include <KernelHeap.h>
+#include <StringOps.h>
+#include <Console.h>
+#include <Format.h>
+#include <stdlib.h>
+#include <MemOps.h>
+#include <Scheduler.h>
 
 static ProcFSEntry* proc_list_head = NULL;
 
diff --git a/fs/procfs/ProcFS.h b/fs/procfs/ProcFS.h
index 6063518..72425b1 100644
--- a/fs/procfs/ProcFS.h
+++ b/fs/procfs/ProcFS.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_PROCFS_H
 #define VOIDFRAME_PROCFS_H
 
-#include "../BlockDevice.h"
+#include <../BlockDevice.h>
 #include <stdint.h>
 #include <stdbool.h>
 
diff --git a/include/Io.c b/include/Io.c
index b315eb0..d15498b 100644
--- a/include/Io.c
+++ b/include/Io.c
@@ -1,5 +1,5 @@
-#include "Io.h"
-#include "x64.h"
+#include <Io.h>
+#include <x64.h>
 
 void cli() {
     _full_mem_prot_start();
diff --git a/include/Io.h b/include/Io.h
index 19dfa8a..e4bcde5 100644
--- a/include/Io.h
+++ b/include/Io.h
@@ -1,7 +1,7 @@
 #ifndef IO_H
 #define IO_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 static inline void outb(uint16_t port, uint8_t val) {
     __asm__ volatile ("outb %0, %1" : : "a"(val), "Nd"(port));
diff --git a/include/Scheduler.h b/include/Scheduler.h
index b1f6c95..cbe73ba 100644
--- a/include/Scheduler.h
+++ b/include/Scheduler.h
@@ -2,12 +2,12 @@
 ///@brief Unified wrapper for multiple scheduler implementations
 #ifndef VOIDFRAME_SCHEDULER_H
 #define VOIDFRAME_SCHEDULER_H
-#include "MLFQ.h"
+#include <MLFQ.h>
 
 #if defined(VF_CONFIG_SCHED_MLFQ)
-#include "MLFQ.h"
+#include <MLFQ.h>
 #elif defined(VF_CONFIG_SCHED_EEVDF)
-#include "EEVDF.h"
+#include <EEVDF.h>
 #endif
 
 #if defined(VF_CONFIG_SCHED_MLFQ)
diff --git a/include/Switch.h b/include/Switch.h
index 8ca0a41..3ba4217 100644
--- a/include/Switch.h
+++ b/include/Switch.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "stdint.h"
-#include "Kernel.h"
+#include <stdint.h>
+#include <Kernel.h>
 
 asmlinkage void SwitchToHigherHalf(uint64_t pml4_phys_addr, uint64_t jump_to_addr, uint64_t stack);
\ No newline at end of file
diff --git a/include/Switch/Switch.h b/include/Switch/Switch.h
index d59a1a6..a2263a1 100644
--- a/include/Switch/Switch.h
+++ b/include/Switch/Switch.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <stdbool.h>
-#include "StringOps.h"
-#include "stdarg.h"
-#include "stdint.h"
+#include <StringOps.h>
+#include <stdarg.h>
+#include <stdint.h>
 
 // ============================================================================
 // CORE MACRO MAGIC - Advanced Pattern Matching Switch
diff --git a/include/Vector/Vector.h b/include/Vector/Vector.h
index cdf5add..9694bd8 100644
--- a/include/Vector/Vector.h
+++ b/include/Vector/Vector.h
@@ -1,10 +1,10 @@
 #ifndef VECTOR_H
 #define VECTOR_H
 
-#include "stdbool.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "Panic.h"
+#include <stdbool.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <Panic.h>
 
 /* Generic vector implementation in C with pseudo dot-syntax */
 
diff --git a/include/Window.h b/include/Window.h
index 33180f9..506b369 100644
--- a/include/Window.h
+++ b/include/Window.h
@@ -1,8 +1,8 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "stdbool.h"
-#include "stdint.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 // A simple rectangle structure
 typedef struct {
diff --git a/include/ctype.c b/include/ctype.c
index 5963db0..0c23a7b 100644
--- a/include/ctype.c
+++ b/include/ctype.c
@@ -5,7 +5,7 @@
  *  Copyright (C) 1991, 1992  Linus Torvalds
  */
 
-#include "ctype.h"
+#include <ctype.h>
 
 char _ctmp;
 unsigned char _ctype[] = {0x00,			/* EOF */
diff --git a/include/math.h b/include/math.h
index 80102ef..d5c52a0 100644
--- a/include/math.h
+++ b/include/math.h
@@ -1,7 +1,7 @@
 #ifndef __MATH_H__
 #define __MATH_H__
 
-#include "stdint.h"
+#include <stdint.h>
 
 /* Mathematical constants */
 #define M_E         2.71828182845904523536
diff --git a/kernel/atomic/Atomics.c b/kernel/atomic/Atomics.c
index e3e0a68..f2fa6ea 100644
--- a/kernel/atomic/Atomics.c
+++ b/kernel/atomic/Atomics.c
@@ -2,7 +2,7 @@
 // Created by Atheria on 7/12/25.
 //
 
-#include "Atomics.h"
+#include <Atomics.h>
 
 // Prefer GCC/Clang __atomic builtins for portability in freestanding kernels.
 
diff --git a/kernel/atomic/Atomics.h b/kernel/atomic/Atomics.h
index b3d2588..a1f42bf 100644
--- a/kernel/atomic/Atomics.h
+++ b/kernel/atomic/Atomics.h
@@ -1,8 +1,8 @@
 //
 // Created by Atheria on 7/12/25.
 //
-#include "stdint.h"
-#include "stdbool.h"
+#include <stdint.h>
+#include <stdbool.h>
 #ifndef ATOMICS_H
 #define ATOMICS_H
 
diff --git a/kernel/atomic/Spinlock.h b/kernel/atomic/Spinlock.h
index 905a347..02c4536 100644
--- a/kernel/atomic/Spinlock.h
+++ b/kernel/atomic/Spinlock.h
@@ -1,9 +1,9 @@
 #ifndef SPINLOCK_H
 #define SPINLOCK_H
 
-#include "Io.h"
-#include "stdint.h"
-#include "x64.h"
+#include <Io.h>
+#include <stdint.h>
+#include <x64.h>
 
 #define DEADLOCK_TIMEOUT_CYCLES 100000000ULL
 #define MAX_BACKOFF_CYCLES 1024
diff --git a/kernel/atomic/rust/README.md b/kernel/atomic/rust/README.md
index b881706..bf8df18 100644
--- a/kernel/atomic/rust/README.md
+++ b/kernel/atomic/rust/README.md
@@ -21,7 +21,7 @@ A complete, high-performance spinlock implementation in Rust with deadlock detec
 ## Usage from C
 
 ```c
-#include "SpinlockRust.h"
+#include <SpinlockRust.h>
 
 // Basic spinlock
 RustSpinLock* lock = rust_spinlock_new();
diff --git a/kernel/core/InitRD.c b/kernel/core/InitRD.c
index f42daec..0f72ae7 100644
--- a/kernel/core/InitRD.c
+++ b/kernel/core/InitRD.c
@@ -1,7 +1,7 @@
-#include "InitRD.h"
-#include "Multiboot2.h"
-#include "Console.h"
-#include "VFS.h"
+#include <InitRD.h>
+#include <Multiboot2.h>
+#include <Console.h>
+#include <VFS.h>
 extern uint32_t g_multiboot_info_addr;
 
 void InitRDLoad(void) {
diff --git a/kernel/core/Kernel.c b/kernel/core/Kernel.c
index 7a9f920..d6e4d66 100644
--- a/kernel/core/Kernel.c
+++ b/kernel/core/Kernel.c
@@ -1,49 +1,48 @@
 // VoidFrame Kernel Entry File
-#include "Kernel.h"
-#include "drivers/APIC/APIC.h"
-#include "drivers/storage/Ide.h"
-#include "ACPI.h"
-#include "CharDevice.h"
-#include "Compositor.h"
-#include "Console.h"
-#include "CRC32.h"
-#include "FileSystem.h"
-#include "Gdt.h"
-#include "ISA.h"
-#include "Idt.h"
-#include "InitRD.h"
-#include "Io.h"
-#include "KernelHeap.h"
-#include "LPT/LPT.h"
-#include "MemOps.h"
-#include "MemPool.h"
-#include "Multiboot2.h"
-#include "OPIC/OPIC.h"
-#include "PCI/PCI.h"
-#include "PMem.h"
-#include "PS2.h"
-#include "Random.h"
-#include "Panic.h"
-#include "SVGAII.h"
-#include "Scheduler.h"
-#include "Serial.h"
-#include "Shell.h"
-#include "StackGuard.h"
-#include "Switch.h"
-#include "TSC.h"
-#include "VFRFS.h"
-#include "VFS.h"
-#include "VMem.h"
-#include "Vesa.h"
-#include "ethernet/Network.h"
-#include "sound/Generic.h"
-#include "stdbool.h"
-#include "stdint.h"
-#include "storage/AHCI.h"
-#include "storage/NVMe.h"
-#include "virtio/Virtio.h"
-#include "virtio/VirtioBlk.h"
-#include "xHCI/xHCI.h"
+#include <Kernel.h>
+#include <drivers/APIC/APIC.h>
+#include <drivers/storage/Ide.h>
+#include <ACPI.h>
+#include <CharDevice.h>
+#include <Console.h>
+#include <CRC32.h>
+#include <FileSystem.h>
+#include <Gdt.h>
+#include <ISA.h>
+#include <Idt.h>
+#include <InitRD.h>
+#include <Io.h>
+#include <KernelHeap.h>
+#include <LPT/LPT.h>
+#include <MemOps.h>
+#include <MemPool.h>
+#include <Multiboot2.h>
+#include <OPIC/OPIC.h>
+#include <PCI/PCI.h>
+#include <PMem.h>
+#include <PS2.h>
+#include <Random.h>
+#include <Panic.h>
+#include <SVGAII.h>
+#include <Scheduler.h>
+#include <Serial.h>
+#include <Shell.h>
+#include <StackGuard.h>
+#include <Switch.h>
+#include <TSC.h>
+#include <VFRFS.h>
+#include <VFS.h>
+#include <VMem.h>
+#include <Vesa.h>
+#include <ethernet/Network.h>
+#include <sound/Generic.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <storage/AHCI.h>
+#include <storage/NVMe.h>
+#include <virtio/Virtio.h>
+#include <virtio/VirtioBlk.h>
+#include <xHCI/xHCI.h>
 
 void KernelMainHigherHalf(void);
 #define KERNEL_STACK_SIZE (16 * 1024) // 16KB stack
diff --git a/kernel/core/Kernel.h b/kernel/core/Kernel.h
index fb11f2e..9ae7bc9 100644
--- a/kernel/core/Kernel.h
+++ b/kernel/core/Kernel.h
@@ -11,7 +11,7 @@
 # endif
 #endif
 
-#include "stdint.h"
+#include <stdint.h>
 
 void ParseMultibootInfo(uint32_t info);
 
diff --git a/kernel/core/Multiboot2.h b/kernel/core/Multiboot2.h
index 897239c..b147f18 100644
--- a/kernel/core/Multiboot2.h
+++ b/kernel/core/Multiboot2.h
@@ -1,7 +1,7 @@
 #ifndef MB2_H
 #define MB2_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 #define MULTIBOOT2_MAGIC_HEADER        0xE85250D6
 #define MULTIBOOT2_BOOTLOADER_MAGIC    0x36D76289
diff --git a/kernel/core/Panic.c b/kernel/core/Panic.c
index 6a73011..519e13e 100644
--- a/kernel/core/Panic.c
+++ b/kernel/core/Panic.c
@@ -1,17 +1,17 @@
-#include "Panic.h"
-#include "Io.h"
+#include <Panic.h>
+#include <Io.h>
 // The ONLY necessary includes for display are now Console and Serial
-#include "ACPI.h"
-#include "../../mm/KernelHeap.h"
-#include "../../mm/PMem.h"
-#include "Console.h"
-#include "Serial.h"
-
-#include "../../mm/MemOps.h"
-#include "../../mm/VMem.h"
-#include "MLFQ.h" // For Registers struct in PanicFromInterrupt
-#include "Vesa.h"
-#include "stdint.h"
+#include <ACPI.h>
+#include <../../mm/KernelHeap.h>
+#include <../../mm/PMem.h>
+#include <Console.h>
+#include <Serial.h>
+
+#include <../../mm/MemOps.h>
+#include <../../mm/VMem.h>
+#include <MLFQ.h> // For Registers struct in PanicFromInterrupt
+#include <Vesa.h>
+#include <stdint.h>
 // --- Panic Context Structure (Unchanged) ---
 typedef struct {
     uint64_t rip;
diff --git a/kernel/core/Panic.h b/kernel/core/Panic.h
index 8fdfba1..95fe822 100644
--- a/kernel/core/Panic.h
+++ b/kernel/core/Panic.h
@@ -1,7 +1,7 @@
 #ifndef PANIC_H
 #define PANIC_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // Forward declare the Registers struct to avoid circular header dependencies.
 // The full definition is expected in a file like "Interrupts.h".
diff --git a/kernel/etc/Console.c b/kernel/etc/Console.c
index a64e02a..b7b89bb 100644
--- a/kernel/etc/Console.c
+++ b/kernel/etc/Console.c
@@ -1,14 +1,14 @@
-#include "Console.h"
-#include "Format.h"
-#include "Io.h"
-#include "Compositor.h"
-#include "Serial.h"
-#include "SpinlockRust.h"
-#include "VBEConsole.h"
-#include "Vesa.h"
-#include "stdarg.h"
-#include "stdbool.h"
-#include "stdint.h"
+#include <Console.h>
+#include <Format.h>
+#include <Io.h>
+#include <Compositor.h>
+#include <Serial.h>
+#include <SpinlockRust.h>
+#include <VBEConsole.h>
+#include <Vesa.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 // Forward declarations for VGA backend
 static void VGAClear(void);
diff --git a/kernel/etc/Console.h b/kernel/etc/Console.h
index 1ce2bbe..e20671a 100644
--- a/kernel/etc/Console.h
+++ b/kernel/etc/Console.h
@@ -31,7 +31,7 @@
 #define STATUS_LABEL_ROW 50
 #define STATUS_LABEL_COL 0 // future use
 
-#include "stdint.h"
+#include <stdint.h>
 // Console state
 typedef struct {
   uint32_t line;
diff --git a/kernel/etc/Editor.c b/kernel/etc/Editor.c
index e1cf68f..1af4394 100644
--- a/kernel/etc/Editor.c
+++ b/kernel/etc/Editor.c
@@ -1,12 +1,12 @@
-#include "Editor.h"
-#include "Console.h"
-#include "KernelHeap.h"
-#include "MemOps.h"
-#include "PS2.h"
-#include "input/Keyboard.h"
-#include "Scheduler.h"
-#include "StringOps.h"
-#include "VFS.h"
+#include <Editor.h>
+#include <Console.h>
+#include <KernelHeap.h>
+#include <MemOps.h>
+#include <PS2.h>
+#include <input/Keyboard.h>
+#include <Scheduler.h>
+#include <StringOps.h>
+#include <VFS.h>
 
 #define MAX_BUFFER_SIZE 4096
 
diff --git a/kernel/etc/Format.c b/kernel/etc/Format.c
index d3f4c6c..f92e56a 100644
--- a/kernel/etc/Format.c
+++ b/kernel/etc/Format.c
@@ -14,9 +14,9 @@
  *@date 02/09/25 by assembler-0
  */
 
-#include "StringOps.h"
-#include "ctype.h"
-#include "stdarg.h"
+#include <StringOps.h>
+#include <ctype.h>
+#include <stdarg.h>
 
 unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base)
 {
diff --git a/kernel/etc/Format.h b/kernel/etc/Format.h
index b32d1d6..4ad6825 100644
--- a/kernel/etc/Format.h
+++ b/kernel/etc/Format.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "stdarg.h"
-#include "stddef.h"
+#include <stdarg.h>
+#include <stddef.h>
 
 #define FORMAT_STACK_SIZE 1024
 
diff --git a/kernel/etc/POST.c b/kernel/etc/POST.c
index 5ab1766..ee57442 100644
--- a/kernel/etc/POST.c
+++ b/kernel/etc/POST.c
@@ -1,12 +1,12 @@
-#include "POST.h"
-#include "Console.h"
-#include "KernelHeap.h"
-#include "PMem.h"
-#include "Panic.h"
-#include "Serial.h"
-#include "VMem.h"
-#include "stdbool.h"
-#include "x64.h"
+#include <POST.h>
+#include <Console.h>
+#include <KernelHeap.h>
+#include <PMem.h>
+#include <Panic.h>
+#include <Serial.h>
+#include <VMem.h>
+#include <stdbool.h>
+#include <x64.h>
 
 #define N 512
 void * ptrs[N] = {0};
diff --git a/kernel/etc/Shell.c b/kernel/etc/Shell.c
index 07c1b40..fd66b2f 100644
--- a/kernel/etc/Shell.c
+++ b/kernel/etc/Shell.c
@@ -1,45 +1,45 @@
-#include "Shell.h"
+#include <Shell.h>
 #include <Switch/Switch.h>
 #include <arch/x86_64/features/x64.h>
-#include "../../drivers/APIC/APIC.h"
-#include "../../drivers/ethernet/interface/Icmp.h"
-#include "6502/6502.h"
-#include "ACPI.h"
-#include "Compositor.h"
-#include "Console.h"
-#include "Editor.h"
-#include "ExecLoader.h"
-#include "Ext2.h"
-#include "FAT1x.h"
-#include "Format.h"
-#include "FsUtils.h"
-#include "ISA.h"
-#include "InitRD.h"
-#include "Iso9660.h"
-#include "KernelHeap.h"
-#include "../../mm/dynamic/rust/KernelHeapRust.h"
-#include "LPT/LPT.h"
-#include "MemOps.h"
-#include "NTFS.h"
-#include "PCI/PCI.h"
-#include "PMem.h"
-#include "POST.h"
-#include "input/Keyboard.h"
-#include "Packet.h"
-#include "Panic.h"
-#include "RTC/Rtc.h"
-#include "SB16.h"
-#include "Scheduler.h"
-#include "Serial.h"
-#include "StackTrace.h"
-#include "StringOps.h"
-#include "VFS.h"
-#include "VMem.h"
-#include "intel/E1000.h"
-#include "realtek/RTL8139.h"
-#include "sound/Generic.h"
-#include "stdlib.h"
-#include "xHCI/xHCI.h"
+#include <../../drivers/APIC/APIC.h>
+#include <../../drivers/ethernet/interface/Icmp.h>
+#include <6502/6502.h>
+#include <ACPI.h>
+#include <Compositor.h>
+#include <Console.h>
+#include <Editor.h>
+#include <ExecLoader.h>
+#include <Ext2.h>
+#include <FAT1x.h>
+#include <Format.h>
+#include <FsUtils.h>
+#include <ISA.h>
+#include <InitRD.h>
+#include <Iso9660.h>
+#include <KernelHeap.h>
+#include <../../mm/dynamic/rust/KernelHeapRust.h>
+#include <LPT/LPT.h>
+#include <MemOps.h>
+#include <NTFS.h>
+#include <PCI/PCI.h>
+#include <PMem.h>
+#include <POST.h>
+#include <input/Keyboard.h>
+#include <Packet.h>
+#include <Panic.h>
+#include <RTC/Rtc.h>
+#include <SB16.h>
+#include <Scheduler.h>
+#include <Serial.h>
+#include <StackTrace.h>
+#include <StringOps.h>
+#include <VFS.h>
+#include <VMem.h>
+#include <intel/E1000.h>
+#include <realtek/RTL8139.h>
+#include <sound/Generic.h>
+#include <stdlib.h>
+#include <xHCI/xHCI.h>
 
 #define DATE __DATE__
 #define TIME __TIME__
diff --git a/kernel/etc/StringOps.c b/kernel/etc/StringOps.c
index 885780a..b4051dd 100644
--- a/kernel/etc/StringOps.c
+++ b/kernel/etc/StringOps.c
@@ -1,5 +1,5 @@
-#include "KernelHeap.h"
-#include "StringOps.h"
+#include <KernelHeap.h>
+#include <StringOps.h>
 
 int StringLength(const char* str) { // simpler than FasStrlen,
     if (!str) return 0;
diff --git a/kernel/etc/StringOps.h b/kernel/etc/StringOps.h
index b70456f..e497d62 100644
--- a/kernel/etc/StringOps.h
+++ b/kernel/etc/StringOps.h
@@ -1,6 +1,6 @@
 #ifndef VOIDFRAME_STRINGOPS_H
 #define VOIDFRAME_STRINGOPS_H
-#include "stdint.h"
+#include <stdint.h>
 
 int FastStrCmp(const char* str1, const char* str2);
 size_t FastStrlen(const char* s, size_t max);
diff --git a/kernel/etc/VBEConsole.c b/kernel/etc/VBEConsole.c
index f9de7e5..0a068b2 100644
--- a/kernel/etc/VBEConsole.c
+++ b/kernel/etc/VBEConsole.c
@@ -1,9 +1,9 @@
-#include "VBEConsole.h"
+#include <VBEConsole.h>
 
-#include "../../mm/MemOps.h"
-#include "Console.h"
-#include "Vesa.h"
-#include "stdint.h"
+#include <../../mm/MemOps.h>
+#include <Console.h>
+#include <Vesa.h>
+#include <stdint.h>
 
 // Full screen console using 800x600
 #define SCREEN_WIDTH   800
diff --git a/kernel/etc/VBEConsole.h b/kernel/etc/VBEConsole.h
index 3eea06d..9ce9937 100644
--- a/kernel/etc/VBEConsole.h
+++ b/kernel/etc/VBEConsole.h
@@ -1,7 +1,7 @@
 #ifndef VBE_CONSOLE_H
 #define VBE_CONSOLE_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // NEW: A clean define for the default console color (White on Black)
 #define VBE_CONSOLE_DEFAULT_COLOR 0x07
diff --git a/kernel/execf/ExecLoader.c b/kernel/execf/ExecLoader.c
index ee78757..8b04c74 100644
--- a/kernel/execf/ExecLoader.c
+++ b/kernel/execf/ExecLoader.c
@@ -1,12 +1,12 @@
-#include "ExecLoader.h"
-#include "Console.h"
-#include "MLFQ.h"
-#include "VFS.h"
-#include "aout/AoutLoader.h"
-#include "elf/ELFloader.h"
-#include "macho/Macho.h"
-#include "macho/MachoLoader.h"
-#include "pe/PEloader.h"
+#include <ExecLoader.h>
+#include <Console.h>
+#include <MLFQ.h>
+#include <VFS.h>
+#include <aout/AoutLoader.h>
+#include <elf/ELFloader.h>
+#include <macho/Macho.h>
+#include <macho/MachoLoader.h>
+#include <pe/PEloader.h>
 
 ExecFormat DetectExecutableFormat(const uint8_t* data, uint64_t size) {
     if (!data || size < 4) {
diff --git a/kernel/execf/ExecLoader.h b/kernel/execf/ExecLoader.h
index d761ef5..f5e1c43 100644
--- a/kernel/execf/ExecLoader.h
+++ b/kernel/execf/ExecLoader.h
@@ -2,7 +2,7 @@
 #define VOIDFRAME_EXECLOADER_H
 
 #pragma once
-#include "stdint.h"
+#include <stdint.h>
 
 // Universal executable format detector and loader
 typedef struct {
diff --git a/kernel/execf/aout/AoutLoader.c b/kernel/execf/aout/AoutLoader.c
index 829be4c..6e8b46a 100644
--- a/kernel/execf/aout/AoutLoader.c
+++ b/kernel/execf/aout/AoutLoader.c
@@ -1,9 +1,9 @@
-#include "AoutLoader.h"
-#include "../../mm/VMem.h"
-#include "../../mm/MemOps.h"
-#include "Console.h"
-#include "Scheduler.h"
-#include "VFS.h"
+#include <AoutLoader.h>
+#include <../../mm/VMem.h>
+#include <../../mm/MemOps.h>
+#include <Console.h>
+#include <Scheduler.h>
+#include <VFS.h>
 
 #define MAX_AOUT_FILE_SIZE (2 * 1024 * 1024)
 #define DEFAULT_PROCESS_MEMORY_LIMIT (8 * 1024 * 1024)
diff --git a/kernel/execf/aout/AoutLoader.h b/kernel/execf/aout/AoutLoader.h
index 50a106f..df3c562 100644
--- a/kernel/execf/aout/AoutLoader.h
+++ b/kernel/execf/aout/AoutLoader.h
@@ -2,7 +2,7 @@
 #define VOIDFRAME_AOUTLOADER_H
 
 #pragma once
-#include "stdint.h"
+#include <stdint.h>
 
 // a.out header (32 bytes total - beautifully simple!)
 typedef struct {
diff --git a/kernel/execf/elf/ELFloader.c b/kernel/execf/elf/ELFloader.c
index 4b08087..1163d77 100644
--- a/kernel/execf/elf/ELFloader.c
+++ b/kernel/execf/elf/ELFloader.c
@@ -1,11 +1,11 @@
-#include "ELFloader.h"
-#include "../../mm/KernelHeap.h"
-#include "../../mm/MemOps.h"
-#include "../../mm/VMem.h"
-#include "Console.h"
-#include "Scheduler.h"
-#include "StackGuard.h"
-#include "VFS.h"
+#include <ELFloader.h>
+#include <../../mm/KernelHeap.h>
+#include <../../mm/MemOps.h>
+#include <../../mm/VMem.h>
+#include <Console.h>
+#include <Scheduler.h>
+#include <StackGuard.h>
+#include <VFS.h>
 
 // Default maximum ELF file size (4MB)
 #define MAX_ELF_FILE_SIZE (4 * 1024 * 1024)
diff --git a/kernel/execf/elf/ELFloader.h b/kernel/execf/elf/ELFloader.h
index 89d78ec..127ab82 100644
--- a/kernel/execf/elf/ELFloader.h
+++ b/kernel/execf/elf/ELFloader.h
@@ -2,7 +2,7 @@
 #define VOIDFRAME_ELFLOADER_H
 
 #pragma once
-#include "stdint.h"
+#include <stdint.h>
 
 typedef struct {
     uint8_t  e_ident[16];    // Magic number and class info
diff --git a/kernel/execf/macho/MachoLoader.c b/kernel/execf/macho/MachoLoader.c
index 73d49bf..cf12797 100644
--- a/kernel/execf/macho/MachoLoader.c
+++ b/kernel/execf/macho/MachoLoader.c
@@ -1,10 +1,10 @@
-#include "MachoLoader.h"
-#include "Macho.h"
-#include "../../mm/VMem.h"
-#include "../../mm/MemOps.h"
-#include "VFS.h"
-#include "Console.h"
-#include "Scheduler.h"
+#include <kernel/execf/macho/MachoLoader.h>
+#include <kernel/execf/macho/Macho.h>
+#include <mm/VMem.h>
+#include <mm/MemOps.h>
+#include <VFS.h>
+#include <Console.h>
+#include <Scheduler.h>
 
 #define MAX_MACHO_FILE_SIZE (16 * 1024 * 1024) // 16MB limit for now
 
diff --git a/kernel/execf/macho/MachoLoader.h b/kernel/execf/macho/MachoLoader.h
index c871343..70f34fb 100644
--- a/kernel/execf/macho/MachoLoader.h
+++ b/kernel/execf/macho/MachoLoader.h
@@ -1,7 +1,7 @@
 #ifndef VOIDFRAME_MACHOLOADER_H
 #define VOIDFRAME_MACHOLOADER_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 typedef struct {
     uint8_t privilege_level;
diff --git a/kernel/execf/pe/PEloader.c b/kernel/execf/pe/PEloader.c
index 700864e..c954b5a 100644
--- a/kernel/execf/pe/PEloader.c
+++ b/kernel/execf/pe/PEloader.c
@@ -1,10 +1,10 @@
-#include "PEloader.h"
-#include "../../mm/KernelHeap.h"
-#include "../../mm/MemOps.h"
-#include "../../mm/VMem.h"
-#include "Console.h"
-#include "Scheduler.h"
-#include "VFS.h"
+#include <PEloader.h>
+#include <../../mm/KernelHeap.h>
+#include <../../mm/MemOps.h>
+#include <../../mm/VMem.h>
+#include <Console.h>
+#include <Scheduler.h>
+#include <VFS.h>
 
 #define MAX_PE_FILE_SIZE (4 * 1024 * 1024)
 #define DEFAULT_PROCESS_MEMORY_LIMIT (16 * 1024 * 1024)
diff --git a/kernel/execf/pe/PEloader.h b/kernel/execf/pe/PEloader.h
index 7100d23..ca14105 100644
--- a/kernel/execf/pe/PEloader.h
+++ b/kernel/execf/pe/PEloader.h
@@ -2,7 +2,7 @@
 #define VOIDFRAME_PELOADER_H
 
 #pragma once
-#include "stdint.h"
+#include <stdint.h>
 
 // DOS Header (first 64 bytes of PE file)
 typedef struct __attribute__((packed))  {
diff --git a/kernel/ipc/Ipc.c b/kernel/ipc/Ipc.c
index 12c11ce..3171c9e 100644
--- a/kernel/ipc/Ipc.c
+++ b/kernel/ipc/Ipc.c
@@ -1,6 +1,6 @@
-#include "Ipc.h"
-#include "../../mm/MemOps.h"
-#include "Scheduler.h"
+#include <Ipc.h>
+#include <../../mm/MemOps.h>
+#include <Scheduler.h>
 
 static uint32_t next_sequence_id = 1;
 
diff --git a/kernel/ipc/Ipc.h b/kernel/ipc/Ipc.h
index 35d3227..ab08ce9 100644
--- a/kernel/ipc/Ipc.h
+++ b/kernel/ipc/Ipc.h
@@ -1,10 +1,10 @@
 #ifndef IPC_H
 #define IPC_H
 
-#include "SpinlockRust.h"
-#include "StringOps.h"
-#include "stdbool.h"
-#include "stdint.h"
+#include <SpinlockRust.h>
+#include <StringOps.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 #define MAX_MESSAGES 32 // Increased for better throughput
 #define IPC_MAX_PAYLOAD 512 // Larger payload support
diff --git a/kernel/sched/EEVDF.c b/kernel/sched/EEVDF.c
index 3ef0a74..1522147 100644
--- a/kernel/sched/EEVDF.c
+++ b/kernel/sched/EEVDF.c
@@ -1,20 +1,20 @@
-#include "EEVDF.h"
-#include "Atomics.h"
+#include <EEVDF.h>
+#include <Atomics.h>
 #ifdef VF_CONFIG_USE_CERBERUS
-#include "Cerberus.h"
+#include <Cerberus.h>
 #endif
-#include "Console.h"
-#include "Format.h"
-#include "Gdt.h"
-#include "Ipc.h"
-#include "MemOps.h"
-#include "Panic.h"
-#include "Shell.h"
-#include "SpinlockRust.h"
-#include "VFS.h"
-#include "VMem.h"
-#include "x64.h"
-#include "procfs/ProcFS.h"
+#include <Console.h>
+#include <Format.h>
+#include <Gdt.h>
+#include <Ipc.h>
+#include <MemOps.h>
+#include <Panic.h>
+#include <Shell.h>
+#include <SpinlockRust.h>
+#include <VFS.h>
+#include <VMem.h>
+#include <x64.h>
+#include <procfs/ProcFS.h>
 
 #define offsetof(type, member) ((uint64_t)&(((type*)0)->member))
 
@@ -1289,7 +1289,7 @@ void EEVDFKillProcess(uint32_t pid) {
     EEVDFTerminateProcess(pid, TERM_KILLED, 1);
 }
 
-void EEVDFKillAllProcess(const char* reason) {
+void EEVDFKillAllProcesses(const char* reason) {
     for (int i = 0; i < EEVDF_MAX_PROCESSES; i++) {
         EEVDFProcessControlBlock* proc = &processes[i];
         if (proc->state != PROC_TERMINATED && proc->pid != 0) {
diff --git a/kernel/sched/EEVDF.h b/kernel/sched/EEVDF.h
index add6542..7cdb876 100644
--- a/kernel/sched/EEVDF.h
+++ b/kernel/sched/EEVDF.h
@@ -1,12 +1,12 @@
 #ifndef VF_EEVDF_SCHED_H
 #define VF_EEVDF_SCHED_H
 
-#include "Ipc.h"
-#include "Shared.h"
-#include "stdint.h"
-#include "x64.h"
+#include <Ipc.h>
+#include <Shared.h>
+#include <stdint.h>
+#include <x64.h>
 #ifdef VF_CONFIG_USE_CERBERUS
-#include "Cerberus.h"
+#include <Cerberus.h>
 #endif
 
 // =============================================================================
@@ -201,7 +201,7 @@ void EEVDFYield(void);
 void EEVDFSchedule(Registers* regs);
 void EEVDFKillProcess(uint32_t pid);
 void EEVDFKillCurrentProcess(const char* reason);
-void EEVDFKillAllProcess(const char* reason);
+void EEVDFKillAllProcesses(const char* reason);
 
 // Time management
 uint64_t EEVDFGetSystemTicks(void);
diff --git a/kernel/sched/MLFQ.c b/kernel/sched/MLFQ.c
index a93fe3a..5ad49de 100644
--- a/kernel/sched/MLFQ.c
+++ b/kernel/sched/MLFQ.c
@@ -1,30 +1,28 @@
-#include "MLFQ.h"
-#include "Scheduler.h"
-#include "drivers/APIC/APIC.h"
-#include "Atomics.h"
-#include "Cerberus.h"
-#include "Compositor.h"
-#include "KernelHeap.h"
+#include <MLFQ.h>
+#include <Scheduler.h>
+#include <drivers/APIC/APIC.h>
+#include <Atomics.h>
+#include <Cerberus.h>
 #ifdef VF_CONFIG_USE_CERBERUS
-#include "Cerberus.h"
+#include <Cerberus.h>
 #endif
-#include "Console.h"
-#include "Format.h"
-#include "Gdt.h"
-#include "Io.h"
-#include "Ipc.h"
-#include "MemOps.h"
-#include "Panic.h"
-#include "Serial.h"
-#include "Shell.h"
-#include "SpinlockRust.h"
-#include "StackGuard.h"
-#include "VFS.h"
-#include "VMem.h"
-#include "math.h"
-#include "stdbool.h"
-#include "x64.h"
-#include "procfs/ProcFS.h"
+#include <Console.h>
+#include <Format.h>
+#include <Gdt.h>
+#include <Io.h>
+#include <Ipc.h>
+#include <MemOps.h>
+#include <Panic.h>
+#include <Serial.h>
+#include <Shell.h>
+#include <SpinlockRust.h>
+#include <StackGuard.h>
+#include <VFS.h>
+#include <VMem.h>
+#include <math.h>
+#include <stdbool.h>
+#include <x64.h>
+#include <procfs/ProcFS.h>
 
 #define offsetof(type, member) ((uint64_t)&(((type*)0)->member))
 
@@ -71,7 +69,6 @@ static uint64_t context_switches = 0;
 static uint64_t scheduler_calls = 0;
 
 extern volatile uint32_t APIC_HZ;
-char astra_path[1024];
 
 static int FastFFS(const uint64_t value) {
     return __builtin_ctzll(value);
@@ -1464,9 +1461,6 @@ static void Astra(void) {
     // register
     security_manager_pid = current->pid;
 
-    snprintf(astra_path, sizeof(astra_path), "%s/astra", current->ProcessRuntimePath);
-    if (VfsCreateFile(astra_path) != 0) PANIC("Failed to create Astra process info file");
-
     PrintKernelSuccess("Astra: Astra active.\n");
     uint64_t last_check = 0;
 
@@ -1553,23 +1547,6 @@ static void Astra(void) {
         }
 #endif
 
-        if (current_tick % 250 == 0) {
-            char buff[1] = {0};
-            if (VfsReadFile(astra_path, buff, sizeof(buff)) == -1) PANIC("Failed to read Astra process info file");
-            switch (buff[0]) {
-                case 'p': PANIC("Astra: CRITICAL: Manual panic triggered via ProcINFO\n"); break;
-                case 't': threat_level += 10; break; // for fun
-                case 'k': ASTerminate(current->pid, "ProcINFO"); break;
-                case 'a': MLFQCreateSecureProcess("Astra", Astra, PROC_PRIV_SYSTEM, PROC_FLAG_CORE); break;
-                default: break;
-            }
-            int del_rc = VfsDelete(astra_path, false);
-            int cr_rc  = VfsCreateFile(astra_path);
-            if (del_rc != 0 || (cr_rc != 0 && !VfsIsFile(astra_path))) {
-                PANIC("Astra: ProcINFO reset failed\n");
-            }
-        }
-
         // 1. Token integrity verification
         if (current_tick - last_integrity_scan >= 50) {
             last_integrity_scan = current_tick;
diff --git a/kernel/sched/MLFQ.h b/kernel/sched/MLFQ.h
index d1a1e7a..c90146d 100644
--- a/kernel/sched/MLFQ.h
+++ b/kernel/sched/MLFQ.h
@@ -1,10 +1,10 @@
 #ifndef VF_MLFQ_SCHED_H
 #define VF_MLFQ_SCHED_H
 
-#include "Ipc.h"
-#include "Shared.h"
-#include "stdint.h"
-#include "x64.h"
+#include <Ipc.h>
+#include <Shared.h>
+#include <stdint.h>
+#include <x64.h>
 
 // =============================================================================
 // MLFQ Parameters (last update: 14/08/25)
@@ -220,7 +220,7 @@ uint64_t MLFQGetSystemTicks(void);
 void MLFQListProcesses(void);
 void MLFQGetProcessStats(uint32_t pid, uint32_t* cpu_time, uint32_t* io_ops, uint32_t* preemptions);
 void MLFQKillProcess(uint32_t pid);
-void MLFQKillAllProcess(const char* reason);
+void MLFQKillAllProcesses(const char* reason);
 
 // DEBUG
 void MLFQDumpPerformanceStats(void);
diff --git a/kernel/sched/Scheduler.c b/kernel/sched/Scheduler.c
index e60b513..f2abeef 100644
--- a/kernel/sched/Scheduler.c
+++ b/kernel/sched/Scheduler.c
@@ -1,4 +1,4 @@
-#include "Scheduler.h"
+#include <Scheduler.h>
 
 // Initialize the active scheduler
 int SchedulerInit() {
@@ -87,9 +87,9 @@ void KillProcess(uint32_t pid) {
 
 void KillAllProcess(const char* reason) {
 #if defined(VF_CONFIG_SCHED_MLFQ)
-    return MLFQKillAllProcess(reason);
+    return MLFQKillAllProcesses(reason);
 #elif defined(VF_CONFIG_SCHED_EEVDF)
-    return EEVDFKillAllProcess(reason);
+    return EEVDFKillAllProcesses(reason);
 #elif defined(VF_CONFIG_SCHED_CFS)
     return; // not implemented
 #endif
diff --git a/mm/KernelHeap.h b/mm/KernelHeap.h
index 45f18af..16fe905 100644
--- a/mm/KernelHeap.h
+++ b/mm/KernelHeap.h
@@ -5,12 +5,12 @@
 #define KHEAP_VALIDATION_BASIC 1
 #define KHEAP_VALIDATION_FULL 2
 
-#include "stdint.h"
-#include "stddef.h"
-#include "VMem.h"
-#include "APIC.h"
-#include "Magazine.h"
-#include "KernelHeapRust.h"
+#include <stdint.h>
+#include <stddef.h>
+#include <VMem.h>
+#include <APIC.h>
+#include <Magazine.h>
+#include <KernelHeapRust.h>
 
 // Tier 1: C Magazine Allocator for extreme speed on small allocations
 #define MAGAZINE_MAX_SIZE 1024
diff --git a/mm/MemOps.c b/mm/MemOps.c
index e076422..1ed52fd 100644
--- a/mm/MemOps.c
+++ b/mm/MemOps.c
@@ -1,7 +1,7 @@
-#include "MemOps.h"
-#include "Io.h"
-#include "Panic.h"
-#include "x64.h"
+#include <MemOps.h>
+#include <Io.h>
+#include <Panic.h>
+#include <x64.h>
 
 extern void* memcpy_internal_sse2(void* restrict dest, const void* restrict src, uint64_t size);
 extern void* memcpy_internal_avx2(void* restrict dest, const void* restrict src, uint64_t size);
diff --git a/mm/MemOps.h b/mm/MemOps.h
index 02a530d..5fcc596 100644
--- a/mm/MemOps.h
+++ b/mm/MemOps.h
@@ -1,7 +1,7 @@
 #ifndef MEMOPS_H
 #define MEMOPS_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 void* FastMemset(void* restrict dest, int value, uint64_t size);
 void* FastMemcpy(void* restrict dest, const void* restrict src, uint64_t size);
diff --git a/mm/MemPool.c b/mm/MemPool.c
index 8b0bbc5..2ce50b2 100644
--- a/mm/MemPool.c
+++ b/mm/MemPool.c
@@ -1,5 +1,5 @@
-#include "MemPool.h"
-#include "VMem.h"
+#include <MemPool.h>
+#include <VMem.h>
 
 static MemPool* default_pools[MAX_POOLS];
 static int num_default_pools = 0;
diff --git a/mm/MemPool.h b/mm/MemPool.h
index 3ccea54..501703e 100644
--- a/mm/MemPool.h
+++ b/mm/MemPool.h
@@ -1,7 +1,7 @@
 #ifndef MEMPOOL_H
 #define MEMPOOL_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 #define MAX_POOLS 16
 #define POOL_MAGIC 0xDEADC0DE
diff --git a/mm/PMem.c b/mm/PMem.c
index 4986171..9f001d8 100644
--- a/mm/PMem.c
+++ b/mm/PMem.c
@@ -1,10 +1,10 @@
-#include "PMem.h"
-#include "Console.h"
-#include "MemOps.h"
-#include "Multiboot2.h"
-#include "Panic.h"
-#include "SpinlockRust.h"
-#include "VMem.h"
+#include <PMem.h>
+#include <Console.h>
+#include <MemOps.h>
+#include <Multiboot2.h>
+#include <Panic.h>
+#include <SpinlockRust.h>
+#include <VMem.h>
 
 // Support up to 128GB memory with dynamic bitmap allocation
 #define MAX_PAGE_BUFFER_OVERHEAD (1024 * 1024) // 1MB
diff --git a/mm/PMem.h b/mm/PMem.h
index c51f51c..90fa764 100644
--- a/mm/PMem.h
+++ b/mm/PMem.h
@@ -1,7 +1,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 typedef struct MemoryStats {
     uint64_t total_physical_bytes;
diff --git a/mm/PageFaultHandler.c b/mm/PageFaultHandler.c
index 268f89f..b808268 100644
--- a/mm/PageFaultHandler.c
+++ b/mm/PageFaultHandler.c
@@ -3,12 +3,12 @@
  * @brief Linux-style graceful page fault handling
  */
 
-#include "PageFaultHandler.h"
-#include "Console.h"
-#include "Scheduler.h"
-#include "PMem.h"
-#include "StackTrace.h"
-#include "VMem.h"
+#include <PageFaultHandler.h>
+#include <Console.h>
+#include <Scheduler.h>
+#include <PMem.h>
+#include <StackTrace.h>
+#include <VMem.h>
 
 // Statistics
 static uint64_t total_faults = 0;
diff --git a/mm/PageFaultHandler.h b/mm/PageFaultHandler.h
index ef2fe2c..f5028dc 100644
--- a/mm/PageFaultHandler.h
+++ b/mm/PageFaultHandler.h
@@ -6,8 +6,8 @@
 #ifndef PAGE_FAULT_HANDLER_H
 #define PAGE_FAULT_HANDLER_H
 
-#include "stdint.h"
-#include "x64.h"
+#include <stdint.h>
+#include <x64.h>
 
 // Page fault error code bits
 #define PF_PRESENT    0x01  // Page was present
diff --git a/mm/StackGuard.c b/mm/StackGuard.c
index 302b2b4..d36a342 100644
--- a/mm/StackGuard.c
+++ b/mm/StackGuard.c
@@ -1,5 +1,5 @@
-#include "StackGuard.h"
-#include "Panic.h"
+#include <StackGuard.h>
+#include <Panic.h>
 
 uint64_t __stack_chk_guard = STACK_CANARY_VALUE;
 
diff --git a/mm/StackGuard.h b/mm/StackGuard.h
index 69e3ea7..03e93c0 100644
--- a/mm/StackGuard.h
+++ b/mm/StackGuard.h
@@ -1,9 +1,9 @@
 #ifndef STACK_GUARD_H
 #define STACK_GUARD_H
 
-#include "Console.h"
-#include "PMem.h"
-#include "stdint.h"
+#include <Console.h>
+#include <PMem.h>
+#include <stdint.h>
 
 #define STACK_CANARY_VALUE 0xDEADBEEFCAFEBABE
 
diff --git a/mm/VMem.c b/mm/VMem.c
index a6210b5..2ae4109 100644
--- a/mm/VMem.c
+++ b/mm/VMem.c
@@ -1,10 +1,10 @@
-#include "VMem.h"
-#include "Atomics.h"
-#include "Console.h"
-#include "MemOps.h"
-#include "PMem.h"
-#include "Panic.h"
-#include "Spinlock.h"
+#include <VMem.h>
+#include <Atomics.h>
+#include <Console.h>
+#include <MemOps.h>
+#include <PMem.h>
+#include <Panic.h>
+#include <Spinlock.h>
 
 // Global variable for dynamic identity mapping size
 uint64_t g_identity_map_size = 4ULL * 1024 * 1024 * 1024; // Default to 4GB, will be updated during init
diff --git a/mm/VMem.h b/mm/VMem.h
index af433cc..7f56909 100644
--- a/mm/VMem.h
+++ b/mm/VMem.h
@@ -6,7 +6,7 @@
 #ifndef VMEM_H
 #define VMEM_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 // Page size constants
 #define PAGE_SIZE           4096
diff --git a/mm/dynamic/c/Magazine.c b/mm/dynamic/c/Magazine.c
index 0e93b60..e22dfac 100644
--- a/mm/dynamic/c/Magazine.c
+++ b/mm/dynamic/c/Magazine.c
@@ -1,13 +1,13 @@
-#include "Magazine.h"
-#include "MemOps.h"
-#include "Console.h"
-#include "VMem.h"
-#include "Panic.h"
-#include "SpinlockRust.h"
-#include "drivers/APIC/APIC.h"
-#include "arch/x86_64/features/x64.h"
-#include "include/Io.h"
-#include "mm/KernelHeap.h"
+#include <Magazine.h>
+#include <MemOps.h>
+#include <Console.h>
+#include <VMem.h>
+#include <Panic.h>
+#include <SpinlockRust.h>
+#include <drivers/APIC/APIC.h>
+#include <arch/x86_64/features/x64.h>
+#include <include/Io.h>
+#include <mm/KernelHeap.h>
 #ifndef KHEAP_VALIDATION_NONE
 #define KHEAP_VALIDATION_NONE 0
 #define KHEAP_VALIDATION_BASIC 1
@@ -72,8 +72,8 @@ static Magazine* DepotRefill(int size_class_index);
 static void DepotReturn(Magazine* mag, int size_class_index);
 static Slab* FindSlabForPointer(void* ptr);
 #ifdef VF_CONFIG_HEAP_HYBRID
-#include "mm/dynamic/rust/KernelHeapRust.h"
-#include "drivers/APIC/APIC.h"
+#include <mm/dynamic/rust/KernelHeapRust.h>
+#include <drivers/APIC/APIC.h>
 #endif
 
 // =================================================================================================
diff --git a/mm/dynamic/c/Magazine.h b/mm/dynamic/c/Magazine.h
index 3d7b81c..c7e0dfb 100644
--- a/mm/dynamic/c/Magazine.h
+++ b/mm/dynamic/c/Magazine.h
@@ -1,9 +1,9 @@
 #ifndef MAGAZINE_HEAP_H
 #define MAGAZINE_HEAP_H
 
-#include "stdint.h"
-#include "stddef.h"
-#include "SpinlockRust.h"
+#include <stdint.h>
+#include <stddef.h>
+#include <SpinlockRust.h>
 
 // =================================================================================================
 // Constants and Configuration
diff --git a/mm/security/Cerberus.c b/mm/security/Cerberus.c
index 8c2d023..985f05a 100644
--- a/mm/security/Cerberus.c
+++ b/mm/security/Cerberus.c
@@ -1,13 +1,13 @@
 // mm/security/Cerberus.c
-#include "Cerberus.h"
-#include "Console.h"
-#include "Format.h"
-#include "Ipc.h"
-#include "SpinlockRust.h"
-#include "StackGuard.h"
-#include "StringOps.h"
-#include "VFS.h"
-#include "VMem.h"
+#include <Cerberus.h>
+#include <Console.h>
+#include <Format.h>
+#include <Ipc.h>
+#include <SpinlockRust.h>
+#include <StackGuard.h>
+#include <StringOps.h>
+#include <VFS.h>
+#include <VMem.h>
 static CerberusState g_cerberus_state = {0};
 static RustSpinLock* cerberus_lock = NULL;
 static uint64_t system_ticks = 0;
diff --git a/mm/security/Cerberus.h b/mm/security/Cerberus.h
index 3d8d143..9a496fa 100644
--- a/mm/security/Cerberus.h
+++ b/mm/security/Cerberus.h
@@ -1,9 +1,9 @@
 // mm/security/Cerberus.h
 #pragma once
 
-#include "stdint.h"
-#include "stdbool.h"
-#include "StackTrace.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include <StackTrace.h>
 
 // Configuration
 #define CERBERUS_MAX_WATCH_REGIONS 64
diff --git a/mm/trace/StackTrace.c b/mm/trace/StackTrace.c
index 7056f67..9f0ffa3 100644
--- a/mm/trace/StackTrace.c
+++ b/mm/trace/StackTrace.c
@@ -1,7 +1,7 @@
-#include "StackTrace.h"
-#include "Console.h"
-#include "StringOps.h"
-#include "VMem.h"
+#include <StackTrace.h>
+#include <Console.h>
+#include <StringOps.h>
+#include <VMem.h>
 
 // Check if an address is valid for kernel access
 static bool IsValidKernelAddress(uint64_t addr) {
diff --git a/mm/trace/StackTrace.h b/mm/trace/StackTrace.h
index fa488e9..48ff4ca 100644
--- a/mm/trace/StackTrace.h
+++ b/mm/trace/StackTrace.h
@@ -1,8 +1,8 @@
 #ifndef VOIDFRAME_STACKTRACE_H
 #define VOIDFRAME_STACKTRACE_H
 
-#include "stdint.h"
-#include "x64.h"
+#include <stdint.h>
+#include <x64.h>
 
 #define MAX_STACK_FRAMES 16
 
diff --git a/ports/6502/6502.cpp b/ports/6502/6502.cpp
index d9ec1d7..83d0f9b 100644
--- a/ports/6502/6502.cpp
+++ b/ports/6502/6502.cpp
@@ -1,4 +1,4 @@
-#include "Console.h"
+#include <Console.h>
 
 // Helper types
 using Byte = unsigned char;
diff --git a/vfcompositor/Compositor.c b/vfcompositor/Compositor.c
index 5c6ea40..d8ba6f6 100644
--- a/vfcompositor/Compositor.c
+++ b/vfcompositor/Compositor.c
@@ -1,19 +1,19 @@
-#include "Compositor.h"
-#include "Console.h"
-#include "Font.h"
-#include "KernelHeap.h"
-#include "Keyboard.h"
-#include "MLFQ.h"
-#include "MemOps.h"
-#include "Pallete.h"
-#include "Panic.h"
-#include "PS2.h"
-#include "Scheduler.h"
-#include "Shell.h"
-#include "SpinlockRust.h"
-#include "StringOps.h"
-#include "Vesa.h"
-#include "app/GUIShell.h"
+#include <Compositor.h>
+#include <Console.h>
+#include <Font.h>
+#include <KernelHeap.h>
+#include <Keyboard.h>
+#include <MLFQ.h>
+#include <MemOps.h>
+#include <Pallete.h>
+#include <Panic.h>
+#include <PS2.h>
+#include <Scheduler.h>
+#include <Shell.h>
+#include <SpinlockRust.h>
+#include <StringOps.h>
+#include <Vesa.h>
+#include <app/GUIShell.h>
 
 #ifndef MAX
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
diff --git a/vfcompositor/Compositor.h b/vfcompositor/Compositor.h
index 0a5d4e3..0591e4f 100644
--- a/vfcompositor/Compositor.h
+++ b/vfcompositor/Compositor.h
@@ -1,11 +1,11 @@
 #ifndef WINDOW_MANAGER_H
 #define WINDOW_MANAGER_H
 
-#include "Window.h"
-#include "stdbool.h"
-#include "stdint.h"
-#include "SpinlockRust.h"
-#include "Vesa.h"
+#include <Window.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <SpinlockRust.h>
+#include <Vesa.h>
 
 // Window text management
 #define WINDOW_TEXT_ROWS 30
diff --git a/vfcompositor/app/GUIShell.c b/vfcompositor/app/GUIShell.c
index 4f1b1a5..3857355 100644
--- a/vfcompositor/app/GUIShell.c
+++ b/vfcompositor/app/GUIShell.c
@@ -1,9 +1,9 @@
-#include "Compositor.h"
-#include "Shell.h"
-#include "GUIShell.h"
-#include "Keyboard.h"
-#include "Pallete.h"
-#include "Scheduler.h"
+#include <Compositor.h>
+#include <Shell.h>
+#include <GUIShell.h>
+#include <Keyboard.h>
+#include <Pallete.h>
+#include <Scheduler.h>
 
 static char command_buffer[256];
 static int cmd_pos = 0;