1 files changed, 6 insertions, 11 deletions
diff --git a/Source/Core/Common/SettingsHandler.cpp b/Source/Core/Common/SettingsHandler.cpp
index 6ce08f6579..e7292438ef 100644
--- a/Source/Core/Common/SettingsHandler.cpp
+++ b/Source/Core/Common/SettingsHandler.cpp
@@ -4,24 +4,18 @@
 
 // Thanks to Treeki for writing the original class - 29/01/2012
 
+#include "Common/SettingsHandler.h"
+
 #include <cstddef>
-#include <cstdio>
-#include <cstring>
 #include <ctime>
 #include <iomanip>
 #include <sstream>
 #include <string>
 
-#ifdef _WIN32
-#include <windows.h>
-#include <mmsystem.h>
-#include <sys/timeb.h>
-#endif
-
 #include "Common/CommonTypes.h"
-#include "Common/SettingsHandler.h"
-#include "Common/Timer.h"
 
+namespace Common
+{
 SettingsHandler::SettingsHandler()
 {
   Reset();
@@ -37,7 +31,7 @@ const SettingsHandler::Buffer& SettingsHandler::GetBytes() const
   return m_buffer;
 }
 
-void SettingsHandler::SetBytes(SettingsHandler::Buffer&& buffer)
+void SettingsHandler::SetBytes(Buffer&& buffer)
 {
   Reset();
   m_buffer = std::move(buffer);
@@ -134,3 +128,4 @@ std::string SettingsHandler::GenerateSerialNumber()
   stream << std::put_time(std::localtime(&t), "%j%H%M%S");
   return stream.str();
 }
+}  // namespace Common