diff --git a/kernel/include/paging.hpp b/kernel/include/paging.hpp
index dfddf48f..820c31de 100644
--- a/kernel/include/paging.hpp
+++ b/kernel/include/paging.hpp
@@ -20,14 +20,6 @@ struct process_t;
 
 namespace paging {
 
-//TODO Probably some of it could be moved in the source file
-
-typedef uint64_t* page_entry;
-typedef page_entry* pt_t;
-typedef pt_t* pd_t;
-typedef pd_t* pdpt_t;
-typedef pdpt_t* pml4t_t;
-
 //The size of page in memory
 constexpr const size_t PAGE_SIZE = 4096;
 
diff --git a/kernel/src/paging.cpp b/kernel/src/paging.cpp
index 96cf3e64..d5ca7ae5 100644
--- a/kernel/src/paging.cpp
+++ b/kernel/src/paging.cpp
@@ -21,7 +21,11 @@
 
 namespace {
 
-using namespace paging;
+typedef uint64_t* page_entry;
+typedef page_entry* pt_t;
+typedef pt_t* pd_t;
+typedef pd_t* pdpt_t;
+typedef pdpt_t* pml4t_t;
 
 //The physical offsets of the structures
 size_t physical_pml4t_start;