From 08e9ce2f53da793efcc0f9c6aa5a1caa00cb51d8 Mon Sep 17 00:00:00 2001
From: Baptiste Wicht <baptiste.wicht@gmail.com>
Date: Wed, 17 Aug 2016 22:23:28 +0200
Subject: [PATCH] Adapt code for tlib

---
 kernel/include/disks.hpp           |  3 ++-
 kernel/include/ioctl.hpp           |  2 +-
 kernel/include/rtc.hpp             |  2 +-
 kernel/include/vfs/file.hpp        |  3 ++-
 kernel/include/vfs/file_system.hpp |  3 ++-
 kernel/include/vfs/vfs.hpp         |  4 ++--
 kernel/src/ata.cpp                 |  3 ++-
 kernel/src/fs/devfs.cpp            |  3 ++-
 kernel/src/fs/fat32.cpp            |  3 ++-
 kernel/src/fs/procfs.cpp           |  3 ++-
 kernel/src/fs/sysfs.cpp            |  3 ++-
 kernel/src/ioctl.cpp               |  3 ++-
 kernel/src/logging.cpp             |  7 ++++---
 kernel/src/ramdisk.cpp             |  3 ++-
 kernel/src/scheduler.cpp           |  6 ++++--
 kernel/src/vfs/vfs.cpp             | 10 +++++-----
 programs/args/src/main.cpp         |  3 +--
 programs/bench/src/main.cpp        |  5 ++---
 programs/cat/src/main.cpp          |  8 ++++----
 programs/cpuid/src/main.cpp        |  5 +++--
 programs/date/src/main.cpp         |  4 ++--
 programs/df/src/main.cpp           | 12 ++++++------
 programs/divzero/src/main.cpp      |  2 +-
 programs/keyboard/src/main.cpp     |  5 ++---
 programs/long/src/main.cpp         |  5 ++---
 programs/longone/src/main.cpp      |  5 ++---
 programs/longtwo/src/main.cpp      |  5 ++---
 programs/ls/src/main.cpp           | 10 +++++-----
 programs/lse820/src/main.cpp       | 10 +++++-----
 programs/lspci/src/main.cpp        | 10 +++++-----
 programs/mkdir/src/main.cpp        | 12 ++++++------
 programs/mkfs/src/main.cpp         | 13 +++++++------
 programs/mount/src/main.cpp        | 10 +++++-----
 programs/odin/src/main.cpp         |  8 ++++----
 programs/ps/src/main.cpp           | 10 +++++-----
 programs/readelf/src/main.cpp      | 12 ++++++------
 programs/reboot/src/main.cpp       |  4 ++--
 programs/rm/src/main.cpp           | 12 ++++++------
 programs/shutdown/src/main.cpp     |  5 ++---
 programs/stat/src/main.cpp         | 10 +++++-----
 programs/touch/src/main.cpp        | 11 +++++------
 programs/tsh/src/main.cpp          |  9 +++++----
 programs/uptime/src/main.cpp       |  8 ++++----
 programs/which/src/main.cpp        |  8 ++++----
 programs/writer/src/main.cpp       | 12 ++++++------
 tlib/include/tlib/file.hpp         |  5 +++--
 tlib/include/tlib/io.hpp           |  2 +-
 tlib/include/tlib/stat_info.hpp    |  3 ++-
 tlib/include/tlib/system.hpp       |  3 ++-
 tlib/src/file.cpp                  |  2 +-
 tlib/src/graphics.cpp              |  2 +-
 tlib/src/io.cpp                    |  2 +-
 tlib/src/malloc.cpp                |  2 +-
 tlib/src/print.cpp                 |  2 +-
 tlib/src/ssp.cpp                   |  4 ++--
 tlib/src/start.cpp                 |  2 +-
 tlib/src/system.cpp                |  2 +-
 57 files changed, 168 insertions(+), 157 deletions(-)

diff --git a/kernel/include/disks.hpp b/kernel/include/disks.hpp
index 5b1b6b8a..2ce383fa 100644
--- a/kernel/include/disks.hpp
+++ b/kernel/include/disks.hpp
@@ -8,12 +8,13 @@
 #ifndef DISKS_H
 #define DISKS_H
 
-#include <datetime.hpp>
 #include <types.hpp>
 #include <array.hpp>
 #include <vector.hpp>
 #include <string.hpp>
 
+#include <tlib/datetime.hpp>
+
 #include "vfs/vfs.hpp"
 #include "vfs/file.hpp"
 
diff --git a/kernel/include/ioctl.hpp b/kernel/include/ioctl.hpp
index a93aa0ae..1d3525a1 100644
--- a/kernel/include/ioctl.hpp
+++ b/kernel/include/ioctl.hpp
@@ -10,7 +10,7 @@
 
 #include <types.hpp>
 
-#include "ioctl_codes.hpp"
+#include <tlib/ioctl_codes.hpp>
 
 int64_t ioctl(size_t device_fd, ioctl_request request, void* data);
 
diff --git a/kernel/include/rtc.hpp b/kernel/include/rtc.hpp
index db87a111..deda0d2d 100644
--- a/kernel/include/rtc.hpp
+++ b/kernel/include/rtc.hpp
@@ -8,7 +8,7 @@
 #ifndef RTC_H
 #define RTC_H
 
-#include <datetime.hpp>
+#include <tlib/datetime.hpp>
 
 namespace rtc {
 
diff --git a/kernel/include/vfs/file.hpp b/kernel/include/vfs/file.hpp
index 5854bed3..438cb417 100644
--- a/kernel/include/vfs/file.hpp
+++ b/kernel/include/vfs/file.hpp
@@ -8,10 +8,11 @@
 #ifndef VFS_FILE_H
 #define VFS_FILE_H
 
-#include <datetime.hpp>
 #include <types.hpp>
 #include <string.hpp>
 
+#include <tlib/datetime.hpp>
+
 namespace vfs {
 
 struct file {
diff --git a/kernel/include/vfs/file_system.hpp b/kernel/include/vfs/file_system.hpp
index 174704ce..01fa4e01 100644
--- a/kernel/include/vfs/file_system.hpp
+++ b/kernel/include/vfs/file_system.hpp
@@ -8,10 +8,11 @@
 #ifndef VFS_FILE_SYSTEM_H
 #define VFS_FILE_SYSTEM_H
 
-#include <statfs_info.hpp>
 #include <vector.hpp>
 #include <string.hpp>
 
+#include <tlib/statfs_info.hpp>
+
 #include "file.hpp"
 #include "path.hpp"
 
diff --git a/kernel/include/vfs/vfs.hpp b/kernel/include/vfs/vfs.hpp
index 48ae28f3..090c24ea 100644
--- a/kernel/include/vfs/vfs.hpp
+++ b/kernel/include/vfs/vfs.hpp
@@ -8,8 +8,8 @@
 #ifndef VFS_H
 #define VFS_H
 
-#include <stat_info.hpp>
-#include <statfs_info.hpp>
+#include <tlib/stat_info.hpp>
+#include <tlib/statfs_info.hpp>
 
 #include "vfs/path.hpp"
 
diff --git a/kernel/src/ata.cpp b/kernel/src/ata.cpp
index f2ac14b3..726fefbb 100644
--- a/kernel/src/ata.cpp
+++ b/kernel/src/ata.cpp
@@ -7,6 +7,8 @@
 
 #include <lock_guard.hpp>
 
+#include <tlib/errors.hpp>
+
 #include "ata.hpp"
 #include "ata_constants.hpp"
 #include "kernel_utils.hpp"
@@ -14,7 +16,6 @@
 #include "thor.hpp"
 #include "interrupts.hpp"
 #include "console.hpp"
-#include "errors.hpp"
 #include "disks.hpp"
 #include "mutex.hpp"
 #include "block_cache.hpp"
diff --git a/kernel/src/fs/devfs.cpp b/kernel/src/fs/devfs.cpp
index f7c13d10..04eaccf2 100644
--- a/kernel/src/fs/devfs.cpp
+++ b/kernel/src/fs/devfs.cpp
@@ -8,7 +8,8 @@
 #include <types.hpp>
 #include <unique_ptr.hpp>
 #include <algorithms.hpp>
-#include <errors.hpp>
+
+#include <tlib/errors.hpp>
 
 #include "fs/devfs.hpp"
 
diff --git a/kernel/src/fs/fat32.cpp b/kernel/src/fs/fat32.cpp
index 05831a68..46d6f422 100644
--- a/kernel/src/fs/fat32.cpp
+++ b/kernel/src/fs/fat32.cpp
@@ -8,7 +8,8 @@
 #include <types.hpp>
 #include <unique_ptr.hpp>
 #include <algorithms.hpp>
-#include <errors.hpp>
+
+#include <tlib/errors.hpp>
 
 #include "fs/fat32.hpp"
 
diff --git a/kernel/src/fs/procfs.cpp b/kernel/src/fs/procfs.cpp
index 11433637..15deeaff 100644
--- a/kernel/src/fs/procfs.cpp
+++ b/kernel/src/fs/procfs.cpp
@@ -8,9 +8,10 @@
 #include <types.hpp>
 #include <unique_ptr.hpp>
 #include <algorithms.hpp>
-#include <errors.hpp>
 #include <string.hpp>
 
+#include <tlib/errors.hpp>
+
 #include "fs/procfs.hpp"
 
 #include "scheduler.hpp"
diff --git a/kernel/src/fs/sysfs.cpp b/kernel/src/fs/sysfs.cpp
index 6bb19945..8dfe5a11 100644
--- a/kernel/src/fs/sysfs.cpp
+++ b/kernel/src/fs/sysfs.cpp
@@ -8,7 +8,8 @@
 #include <types.hpp>
 #include <unique_ptr.hpp>
 #include <algorithms.hpp>
-#include <errors.hpp>
+
+#include <tlib/errors.hpp>
 
 #include "fs/sysfs.hpp"
 
diff --git a/kernel/src/ioctl.cpp b/kernel/src/ioctl.cpp
index ae79ae6b..6fc2eb71 100644
--- a/kernel/src/ioctl.cpp
+++ b/kernel/src/ioctl.cpp
@@ -5,8 +5,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
+#include <tlib/errors.hpp>
+
 #include "ioctl.hpp"
-#include "errors.hpp"
 #include "scheduler.hpp"
 #include "logging.hpp"
 #include "fs/devfs.hpp"
diff --git a/kernel/src/logging.cpp b/kernel/src/logging.cpp
index ec9e1002..2e9e2e35 100644
--- a/kernel/src/logging.cpp
+++ b/kernel/src/logging.cpp
@@ -5,6 +5,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
+#include <string.hpp>
+
+#include <tlib/flags.hpp>
+
 #include "logging.hpp"
 #include "assert.hpp"
 #include "console.hpp"
@@ -12,9 +16,6 @@
 #include "early_memory.hpp"
 #include "vfs/vfs.hpp"
 
-#include <flags.hpp>
-#include <string.hpp>
-
 namespace {
 
 bool early_mode = true;
diff --git a/kernel/src/ramdisk.cpp b/kernel/src/ramdisk.cpp
index c83453ff..e78ec790 100644
--- a/kernel/src/ramdisk.cpp
+++ b/kernel/src/ramdisk.cpp
@@ -5,8 +5,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
+#include <tlib/errors.hpp>
+
 #include "ramdisk.hpp"
-#include "errors.hpp"
 #include "disks.hpp"
 #include "paging.hpp"
 #include "logging.hpp"
diff --git a/kernel/src/scheduler.cpp b/kernel/src/scheduler.cpp
index bd987a15..3c516223 100644
--- a/kernel/src/scheduler.cpp
+++ b/kernel/src/scheduler.cpp
@@ -10,7 +10,9 @@
 #include <optional.hpp>
 #include <string.hpp>
 #include <lock_guard.hpp>
-#include <errors.hpp>
+
+#include <tlib/errors.hpp>
+#include <tlib/elf.hpp>
 
 #include "scheduler.hpp"
 #include "paging.hpp"
@@ -18,7 +20,6 @@
 #include "gdt.hpp"
 #include "terminal.hpp"
 #include "disks.hpp"
-#include "elf.hpp"
 #include "console.hpp"
 #include "physical_allocator.hpp"
 #include "virtual_allocator.hpp"
@@ -28,6 +29,7 @@
 #include "logging.hpp"
 #include "int_lock.hpp"
 #include "timer.hpp"
+
 #include "fs/procfs.hpp"
 
 //Provided by task_switch.s
diff --git a/kernel/src/vfs/vfs.cpp b/kernel/src/vfs/vfs.cpp
index ed3ac3c6..3ce946f6 100644
--- a/kernel/src/vfs/vfs.cpp
+++ b/kernel/src/vfs/vfs.cpp
@@ -5,12 +5,13 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <errors.hpp>
 #include <string.hpp>
 #include <algorithms.hpp>
 
-#include <directory_entry.hpp>
-#include <mount_point.hpp>
+#include <tlib/directory_entry.hpp>
+#include <tlib/mount_point.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/flags.hpp>
 
 #include "vfs/vfs.hpp"
 #include "vfs/file_system.hpp"
@@ -21,12 +22,11 @@
 #include "fs/procfs.hpp"
 
 #include "scheduler.hpp"
-#include "flags.hpp"
-
 #include "console.hpp"
 #include "logging.hpp"
 #include "assert.hpp"
 
+
 namespace {
 
 struct mounted_fs {
diff --git a/programs/args/src/main.cpp b/programs/args/src/main.cpp
index d3edebd9..c1b01437 100644
--- a/programs/args/src/main.cpp
+++ b/programs/args/src/main.cpp
@@ -5,8 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
+#include <tlib/print.hpp>
 
 int main(int argc, char* argv[]){
     for(size_t i = 0; i < size_t(argc); ++i){
diff --git a/programs/bench/src/main.cpp b/programs/bench/src/main.cpp
index 1a39e6b1..b0c7eff2 100644
--- a/programs/bench/src/main.cpp
+++ b/programs/bench/src/main.cpp
@@ -5,9 +5,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
-#include <datetime.hpp>
+#include <tlib/print.hpp>
+#include <tlib/system.hpp>
 
 constexpr const size_t PAGES = 512;
 
diff --git a/programs/cat/src/main.cpp b/programs/cat/src/main.cpp
index 62d4021f..d1753b77 100644
--- a/programs/cat/src/main.cpp
+++ b/programs/cat/src/main.cpp
@@ -5,10 +5,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
 
 int main(int argc, char* argv[]){
     if(argc == 1){
diff --git a/programs/cpuid/src/main.cpp b/programs/cpuid/src/main.cpp
index 263eafd7..5990328b 100644
--- a/programs/cpuid/src/main.cpp
+++ b/programs/cpuid/src/main.cpp
@@ -6,8 +6,9 @@
 //=======================================================================
 
 #include <string.hpp>
-#include <print.hpp>
-#include <system.hpp>
+
+#include <tlib/print.hpp>
+#include <tlib/system.hpp>
 
 namespace {
 
diff --git a/programs/date/src/main.cpp b/programs/date/src/main.cpp
index 768b7873..e409c0b5 100644
--- a/programs/date/src/main.cpp
+++ b/programs/date/src/main.cpp
@@ -5,8 +5,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <system.hpp>
-#include <print.hpp>
+#include <tlib/print.hpp>
+#include <tlib/system.hpp>
 
 int main(int, char*[]){
     auto date = local_date();
diff --git a/programs/df/src/main.cpp b/programs/df/src/main.cpp
index 84a8adc0..7cdfc568 100644
--- a/programs/df/src/main.cpp
+++ b/programs/df/src/main.cpp
@@ -5,12 +5,12 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <mount_point.hpp>
-#include <statfs_info.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/mount_point.hpp>
+#include <tlib/statfs_info.hpp>
 
 static constexpr const size_t BUFFER_SIZE = 4096;
 
diff --git a/programs/divzero/src/main.cpp b/programs/divzero/src/main.cpp
index 9eab06b8..f6242a4e 100644
--- a/programs/divzero/src/main.cpp
+++ b/programs/divzero/src/main.cpp
@@ -5,7 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <system.hpp>
+#include <tlib/system.hpp>
 
 volatile int a = 0;
 
diff --git a/programs/keyboard/src/main.cpp b/programs/keyboard/src/main.cpp
index 7e607024..79c14c6f 100644
--- a/programs/keyboard/src/main.cpp
+++ b/programs/keyboard/src/main.cpp
@@ -5,8 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
+#include <tlib/print.hpp>
 
 const char* source = "Hello world";
 
@@ -20,4 +19,4 @@ int main(){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/long/src/main.cpp b/programs/long/src/main.cpp
index 4b4b52c5..7ae88197 100644
--- a/programs/long/src/main.cpp
+++ b/programs/long/src/main.cpp
@@ -5,8 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
+#include <tlib/print.hpp>
 
 volatile uint64_t current = 45;
 
@@ -31,4 +30,4 @@ int main(){
     print_line("END");
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/longone/src/main.cpp b/programs/longone/src/main.cpp
index 4cc667af..4c44406e 100644
--- a/programs/longone/src/main.cpp
+++ b/programs/longone/src/main.cpp
@@ -5,8 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
+#include <tlib/print.hpp>
 
 volatile uint64_t current = 45;
 
@@ -27,4 +26,4 @@ int main(){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/longtwo/src/main.cpp b/programs/longtwo/src/main.cpp
index 16116296..68d3cd11 100644
--- a/programs/longtwo/src/main.cpp
+++ b/programs/longtwo/src/main.cpp
@@ -5,8 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
+#include <tlib/print.hpp>
 
 volatile uint64_t current = 45;
 
@@ -27,4 +26,4 @@ int main(){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/ls/src/main.cpp b/programs/ls/src/main.cpp
index 572a2828..f8f4dcf2 100644
--- a/programs/ls/src/main.cpp
+++ b/programs/ls/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <directory_entry.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/directory_entry.hpp>
 
 static constexpr const size_t BUFFER_SIZE = 4096;
 
diff --git a/programs/lse820/src/main.cpp b/programs/lse820/src/main.cpp
index a8605e27..c4d70cea 100644
--- a/programs/lse820/src/main.cpp
+++ b/programs/lse820/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <directory_entry.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/directory_entry.hpp>
 
 static constexpr const size_t BUFFER_SIZE = 4096;
 
diff --git a/programs/lspci/src/main.cpp b/programs/lspci/src/main.cpp
index 63f96dc5..c5eeba05 100644
--- a/programs/lspci/src/main.cpp
+++ b/programs/lspci/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <directory_entry.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/directory_entry.hpp>
 
 static constexpr const size_t BUFFER_SIZE = 4096;
 
diff --git a/programs/mkdir/src/main.cpp b/programs/mkdir/src/main.cpp
index 2c84653f..a570d531 100644
--- a/programs/mkdir/src/main.cpp
+++ b/programs/mkdir/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <flags.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/flags.hpp>
 
 int main(int argc, char* argv[]){
     if(argc == 1){
@@ -24,4 +24,4 @@ int main(int argc, char* argv[]){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/mkfs/src/main.cpp b/programs/mkfs/src/main.cpp
index 8f195364..a1f1d662 100644
--- a/programs/mkfs/src/main.cpp
+++ b/programs/mkfs/src/main.cpp
@@ -5,14 +5,15 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <io.hpp>
-#include <print.hpp>
+#include <unique_ptr.hpp>
 #include <math.hpp>
 #include <array.hpp>
-#include <unique_ptr.hpp>
+
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/io.hpp>
+#include <tlib/print.hpp>
 
 #include "fat32_specs.hpp"
 
diff --git a/programs/mount/src/main.cpp b/programs/mount/src/main.cpp
index dbf436cd..6b1637fd 100644
--- a/programs/mount/src/main.cpp
+++ b/programs/mount/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <mount_point.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/mount_point.hpp>
 
 static constexpr const size_t BUFFER_SIZE = 4096;
 
diff --git a/programs/odin/src/main.cpp b/programs/odin/src/main.cpp
index 656981f7..7d751757 100644
--- a/programs/odin/src/main.cpp
+++ b/programs/odin/src/main.cpp
@@ -5,10 +5,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <system.hpp>
-#include <graphics.hpp>
-#include <print.hpp>
-#include <malloc.hpp>
+#include <tlib/system.hpp>
+#include <tlib/graphics.hpp>
+#include <tlib/print.hpp>
+#include <tlib/malloc.hpp>
 
 namespace {
 
diff --git a/programs/ps/src/main.cpp b/programs/ps/src/main.cpp
index 053f66d6..4d15eb3a 100644
--- a/programs/ps/src/main.cpp
+++ b/programs/ps/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <directory_entry.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/directory_entry.hpp>
 
 namespace {
 
diff --git a/programs/readelf/src/main.cpp b/programs/readelf/src/main.cpp
index 3c93e5a8..d47e3ecc 100644
--- a/programs/readelf/src/main.cpp
+++ b/programs/readelf/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <elf.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/elf.hpp>
 
 namespace {
 
@@ -120,4 +120,4 @@ int main(int argc, char* argv[]){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/reboot/src/main.cpp b/programs/reboot/src/main.cpp
index 0d8ef335..9b836aa3 100644
--- a/programs/reboot/src/main.cpp
+++ b/programs/reboot/src/main.cpp
@@ -5,9 +5,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <system.hpp>
+#include <tlib/system.hpp>
 
 int main(){
     reboot();
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/rm/src/main.cpp b/programs/rm/src/main.cpp
index eb06e14f..b4e46db6 100644
--- a/programs/rm/src/main.cpp
+++ b/programs/rm/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <flags.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/flags.hpp>
 
 int main(int argc, char* argv[]){
     if(argc == 1){
@@ -32,4 +32,4 @@ int main(int argc, char* argv[]){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/shutdown/src/main.cpp b/programs/shutdown/src/main.cpp
index 5a93f315..9d79628c 100644
--- a/programs/shutdown/src/main.cpp
+++ b/programs/shutdown/src/main.cpp
@@ -5,10 +5,9 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
+#include <tlib/system.hpp>
 
 int main(){
     shutdown();
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/stat/src/main.cpp b/programs/stat/src/main.cpp
index 89d349dc..a39b93cc 100644
--- a/programs/stat/src/main.cpp
+++ b/programs/stat/src/main.cpp
@@ -5,10 +5,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
 
 int main(int argc, char* argv[]){
     if(argc == 1){
@@ -94,4 +94,4 @@ int main(int argc, char* argv[]){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/touch/src/main.cpp b/programs/touch/src/main.cpp
index 5a6f13ed..627d7fe9 100644
--- a/programs/touch/src/main.cpp
+++ b/programs/touch/src/main.cpp
@@ -5,11 +5,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <flags.hpp>
+#include <tlib/file.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/flags.hpp>
 
 int main(int argc, char* argv[]){
     if(argc == 1){
@@ -26,4 +25,4 @@ int main(int argc, char* argv[]){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/programs/tsh/src/main.cpp b/programs/tsh/src/main.cpp
index cd24b7c1..0a195168 100644
--- a/programs/tsh/src/main.cpp
+++ b/programs/tsh/src/main.cpp
@@ -5,12 +5,13 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <file.hpp>
-#include <system.hpp>
 #include <string.hpp>
 #include <algorithms.hpp>
-#include <errors.hpp>
+
+#include <tlib/print.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
 
 namespace {
 
diff --git a/programs/uptime/src/main.cpp b/programs/uptime/src/main.cpp
index 8bd2e81b..1a93cfc9 100644
--- a/programs/uptime/src/main.cpp
+++ b/programs/uptime/src/main.cpp
@@ -5,10 +5,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
 
 int main(int, char*[]){
     auto fd = open("/sys/uptime");
diff --git a/programs/which/src/main.cpp b/programs/which/src/main.cpp
index 05e16fad..1b91ee2d 100644
--- a/programs/which/src/main.cpp
+++ b/programs/which/src/main.cpp
@@ -5,10 +5,10 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
 
 int main(int argc, char* argv[]){
     if(argc == 1){
diff --git a/programs/writer/src/main.cpp b/programs/writer/src/main.cpp
index f9928976..3bb276e9 100644
--- a/programs/writer/src/main.cpp
+++ b/programs/writer/src/main.cpp
@@ -5,11 +5,11 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
-#include <system.hpp>
-#include <errors.hpp>
-#include <print.hpp>
-#include <flags.hpp>
+#include <tlib/file.hpp>
+#include <tlib/system.hpp>
+#include <tlib/errors.hpp>
+#include <tlib/print.hpp>
+#include <tlib/flags.hpp>
 
 int main(int argc, char* argv[]){
     if(argc == 1){
@@ -42,4 +42,4 @@ int main(int argc, char* argv[]){
     }
 
     return 0;
-}
\ No newline at end of file
+}
diff --git a/tlib/include/tlib/file.hpp b/tlib/include/tlib/file.hpp
index 035e393f..a47bf4a8 100644
--- a/tlib/include/tlib/file.hpp
+++ b/tlib/include/tlib/file.hpp
@@ -11,8 +11,9 @@
 #include <types.hpp>
 #include <expected.hpp>
 #include <string.hpp>
-#include <stat_info.hpp>
-#include <statfs_info.hpp>
+
+#include "tlib/stat_info.hpp"
+#include "tlib/statfs_info.hpp"
 
 std::expected<size_t> open(const char* file, size_t flags = 0);
 int64_t mkdir(const char* file);
diff --git a/tlib/include/tlib/io.hpp b/tlib/include/tlib/io.hpp
index d7d8e75d..33cf8dde 100644
--- a/tlib/include/tlib/io.hpp
+++ b/tlib/include/tlib/io.hpp
@@ -11,7 +11,7 @@
 #include <types.hpp>
 #include <expected.hpp>
 
-#include "ioctl_codes.hpp"
+#include "tlib/ioctl_codes.hpp"
 
 int64_t ioctl(size_t device, ioctl_request request, void* data);
 
diff --git a/tlib/include/tlib/stat_info.hpp b/tlib/include/tlib/stat_info.hpp
index 0dc0c488..10607ba6 100644
--- a/tlib/include/tlib/stat_info.hpp
+++ b/tlib/include/tlib/stat_info.hpp
@@ -9,7 +9,8 @@
 #define USER_STAT_INFO_HPP
 
 #include <types.hpp>
-#include <datetime.hpp>
+
+#include "tlib/datetime.hpp"
 
 constexpr const size_t STAT_FLAG_DIRECTORY = 0x1;
 constexpr const size_t STAT_FLAG_HIDDEN = 0x2;
diff --git a/tlib/include/tlib/system.hpp b/tlib/include/tlib/system.hpp
index 35a68105..7cbf2269 100644
--- a/tlib/include/tlib/system.hpp
+++ b/tlib/include/tlib/system.hpp
@@ -12,7 +12,8 @@
 #include <expected.hpp>
 #include <vector.hpp>
 #include <string.hpp>
-#include <datetime.hpp>
+
+#include "tlib/datetime.hpp"
 
 void exit(size_t return_code) __attribute__((noreturn));
 
diff --git a/tlib/src/file.cpp b/tlib/src/file.cpp
index da801999..66d834c6 100644
--- a/tlib/src/file.cpp
+++ b/tlib/src/file.cpp
@@ -5,7 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <file.hpp>
+#include "tlib/file.hpp"
 
 std::expected<size_t> open(const char* file, size_t flags){
     int64_t fd;
diff --git a/tlib/src/graphics.cpp b/tlib/src/graphics.cpp
index 69366abb..1789ed69 100644
--- a/tlib/src/graphics.cpp
+++ b/tlib/src/graphics.cpp
@@ -5,7 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include "graphics.hpp"
+#include "tlib/graphics.hpp"
 
 namespace {
 
diff --git a/tlib/src/io.cpp b/tlib/src/io.cpp
index 04ab1ece..8c9ff36a 100644
--- a/tlib/src/io.cpp
+++ b/tlib/src/io.cpp
@@ -5,7 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <io.hpp>
+#include "tlib/io.hpp"
 
 int64_t ioctl(size_t device, ioctl_request request, void* data){
     int64_t code;
diff --git a/tlib/src/malloc.cpp b/tlib/src/malloc.cpp
index a70c39a8..01dc5389 100644
--- a/tlib/src/malloc.cpp
+++ b/tlib/src/malloc.cpp
@@ -5,7 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include "malloc.hpp"
+#include "tlib/malloc.hpp"
 
 #define likely(x)    __builtin_expect (!!(x), 1)
 #define unlikely(x)  __builtin_expect (!!(x), 0)
diff --git a/tlib/src/print.cpp b/tlib/src/print.cpp
index 89f7cd58..0915203f 100644
--- a/tlib/src/print.cpp
+++ b/tlib/src/print.cpp
@@ -7,7 +7,7 @@
 
 #include <stdarg.h>
 
-#include "print.hpp"
+#include "tlib/print.hpp"
 
 void print(char c){
     asm volatile("mov rax, 0; mov rbx, %[c]; int 50"
diff --git a/tlib/src/ssp.cpp b/tlib/src/ssp.cpp
index db1a8d63..0d06af6c 100644
--- a/tlib/src/ssp.cpp
+++ b/tlib/src/ssp.cpp
@@ -5,8 +5,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <print.hpp>
-#include <system.hpp>
+#include "tlib/print.hpp"
+#include "tlib/system.hpp"
 
 extern "C" {
 
diff --git a/tlib/src/start.cpp b/tlib/src/start.cpp
index 9f6d2125..3f3f4ee0 100644
--- a/tlib/src/start.cpp
+++ b/tlib/src/start.cpp
@@ -5,7 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <system.hpp>
+#include "tlib/system.hpp"
 
 int main(int argc, char* argv[]);
 
diff --git a/tlib/src/system.cpp b/tlib/src/system.cpp
index 5e0c8268..aa3ebbf8 100644
--- a/tlib/src/system.cpp
+++ b/tlib/src/system.cpp
@@ -5,7 +5,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //=======================================================================
 
-#include <system.hpp>
+#include "tlib/system.hpp"
 
 namespace {