2 files changed, 4 insertions, 9 deletions
diff --git a/src/Core/RequestHandler/CoreStatusRequestHandler.h b/src/Core/RequestHandler/CoreStatusRequestHandler.h
index c895dd5..acf941e 100644
--- a/src/Core/RequestHandler/CoreStatusRequestHandler.h
+++ b/src/Core/RequestHandler/CoreStatusRequestHandler.h
@@ -20,20 +20,15 @@
 #ifndef MAD_CORE_REQUESTHANDLER_CORESTATUSREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLER_CORESTATUSREQUESTHANDLER_H_
 
-#include <Common/RequestHandler.h>
+#include <Common/RequestHandler/RequestHandler.h>
 #include <Common/SystemBackend.h>
 #include <Net/Packets/HostStatusPacket.h>
 
-#include <cstring>
-#include <gssapi/gssapi.h>
-
-#include <iostream>
-
 namespace Mad {
 namespace Core {
 namespace RequestHandler {
 
-class CoreStatusRequestHandler : public Common::RequestHandler {
+class CoreStatusRequestHandler : public Common::RequestHandler::RequestHandler {
   public:
     CoreStatusRequestHandler() {}
 
diff --git a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h b/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h
index 8713db7..c04857b 100644
--- a/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h
+++ b/src/Core/RequestHandler/GSSAPIAuthRequestHandler.h
@@ -20,7 +20,7 @@
 #ifndef MAD_CORE_REQUESTHANDLER_GSSAPIAUTHREQUESTHANDLER_H_
 #define MAD_CORE_REQUESTHANDLER_GSSAPIAUTHREQUESTHANDLER_H_
 
-#include <Common/RequestHandler.h>
+#include <Common/RequestHandler/RequestHandler.h>
 #include <Net/Packet.h>
 #include <cstring>
 #include <gssapi/gssapi.h>
@@ -33,7 +33,7 @@ namespace RequestHandler {
 
 // TODO Error handling
 
-class GSSAPIAuthRequestHandler : public Common::RequestHandler {
+class GSSAPIAuthRequestHandler : public Common::RequestHandler::RequestHandler {
   private:
     gss_ctx_id_t gssContext;