diff --git a/Base b/Base
index 6ff3229..0c52431 160000
--- a/Base
+++ b/Base
@@ -1 +1 @@
-Subproject commit 6ff32298e858b35309eb1c6ae3b858f104b37b56
+Subproject commit 0c524315d1f0afc3850385b1150a40501c9c6363
diff --git a/scroll/ConsoleLogger/ConsoleLogger.hpp b/scroll/ConsoleLogger/ConsoleLogger.hpp
index 2b6a356..bc97852 100644
--- a/scroll/ConsoleLogger/ConsoleLogger.hpp
+++ b/scroll/ConsoleLogger/ConsoleLogger.hpp
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "base.hpp"
 #include "ConsoleEscapeCode.hpp"
 #include "Logger/Logger.hpp"
 #include "LogLevel.hpp"
diff --git a/scroll/FileLogger/FileLogger.hpp b/scroll/FileLogger/FileLogger.hpp
index 1aebbec..2236dfa 100644
--- a/scroll/FileLogger/FileLogger.hpp
+++ b/scroll/FileLogger/FileLogger.hpp
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "base.hpp"
 #include "Logger/Logger.hpp"
 #include "LogLevel.hpp"
 
diff --git a/scroll/LogLevel.hpp b/scroll/LogLevel.hpp
index 7e15717..976f84c 100644
--- a/scroll/LogLevel.hpp
+++ b/scroll/LogLevel.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#if OPERATING_SYSTEM == OPERATING_SYSTEM_WINDOWS
+#ifdef ERROR
 	// NOTE: Avoid confict with macro defined in Windows.h.
 	#undef ERROR
 #endif
diff --git a/scroll/Logger/Logger.hpp b/scroll/Logger/Logger.hpp
index a9a97b2..854a2b9 100644
--- a/scroll/Logger/Logger.hpp
+++ b/scroll/Logger/Logger.hpp
@@ -3,7 +3,6 @@
 
 #pragma once
 
-#include "base.hpp"
 #include "LogLevel.hpp"
 
 namespace USER_NAMESPACE {
diff --git a/scroll/base.hpp b/scroll/base.hpp
index 7112a60..51d6080 100644
--- a/scroll/base.hpp
+++ b/scroll/base.hpp
@@ -6,15 +6,11 @@
 #include <chrono>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 
 #ifndef USER_NAMESPACE
 	#define USER_NAMESPACE scroll
 #endif
 
-#include "Base/Base/Base.hpp"
-
-#if OPERATING_SYSTEM == OPERATING_SYSTEM_LINUX
-	#include <sys/ioctl.h>
-	#include <unistd.h>
-#endif
\ No newline at end of file
+#include "Base/Base/Base.hpp"
\ No newline at end of file
diff --git a/scroll/scroll.hpp b/scroll/scroll.hpp
index 12d0693..0b0f32a 100644
--- a/scroll/scroll.hpp
+++ b/scroll/scroll.hpp
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include "base.hpp"
+
 #include "Conversions.hpp"
 
 #include "ConsoleLogger/ConsoleLogger.hpp"