Merge

6 files changed, 3 insertions, 24 deletions

diff --git a/src/Client/Requests/CoreStatusRequest.cpp b/src/Client/Requests/CoreStatusRequest.cpp
index 35a63e2..69e3ecf 100644
--- a/src/Client/Requests/CoreStatusRequest.cpp
+++ b/src/Client/Requests/CoreStatusRequest.cpp
@@ -19,7 +19,6 @@
 
 #include "CoreStatusRequest.h"
 #include <Net/Connection.h>
-#include <Net/Packets/HostStatusPacket.h>
 
 namespace Mad {
 namespace Client {
diff --git a/src/Client/Requests/CoreStatusRequest.h b/src/Client/Requests/CoreStatusRequest.h
index 94aff9c..f57f4bf 100644
--- a/src/Client/Requests/CoreStatusRequest.h
+++ b/src/Client/Requests/CoreStatusRequest.h
@@ -21,15 +21,9 @@
 #define MAD_CLIENT_REQUESTS_CORESTATUSREQUEST_H_
 
 #include <Common/Request.h>
+#include <Net/Packets/HostStatusPacket.h>
 
 namespace Mad {
-
-namespace Net {
-namespace Packets {
-class HostStatusPacket;
-}
-}
-
 namespace Client {
 namespace Requests {
 
diff --git a/src/Client/Requests/DaemonListRequest.cpp b/src/Client/Requests/DaemonListRequest.cpp
index 279d19c..690aaea 100644
--- a/src/Client/Requests/DaemonListRequest.cpp
+++ b/src/Client/Requests/DaemonListRequest.cpp
@@ -19,7 +19,6 @@
 
 #include "DaemonListRequest.h"
 #include <Net/Connection.h>
-#include <Net/Packets/HostListPacket.h>
 
 namespace Mad {
 namespace Client {
diff --git a/src/Client/Requests/DaemonListRequest.h b/src/Client/Requests/DaemonListRequest.h
index 625e430..fbf0e70 100644
--- a/src/Client/Requests/DaemonListRequest.h
+++ b/src/Client/Requests/DaemonListRequest.h
@@ -21,15 +21,9 @@
 #define MAD_CLIENT_REQUEST_DAEMONLISTREQUEST_H_
 
 #include <Common/Request.h>
+#include <Net/Packets/HostListPacket.h>
 
 namespace Mad {
-
-namespace Net {
-namespace Packets {
-class HostListPacket;
-}
-}
-
 namespace Client {
 namespace Requests {
 
diff --git a/src/Client/Requests/DaemonStatusRequest.cpp b/src/Client/Requests/DaemonStatusRequest.cpp
index 9238ed6..94407b4 100644
--- a/src/Client/Requests/DaemonStatusRequest.cpp
+++ b/src/Client/Requests/DaemonStatusRequest.cpp
@@ -20,7 +20,6 @@
 #include "DaemonStatusRequest.h"
 #include <Net/Connection.h>
 #include <Net/Packets/ErrorPacket.h>
-#include <Net/Packets/HostStatusPacket.h>
 
 namespace Mad {
 namespace Client {
diff --git a/src/Client/Requests/DaemonStatusRequest.h b/src/Client/Requests/DaemonStatusRequest.h
index cd71dfb..3190ca1 100644
--- a/src/Client/Requests/DaemonStatusRequest.h
+++ b/src/Client/Requests/DaemonStatusRequest.h
@@ -21,17 +21,11 @@
 #define MAD_CLIENT_REQUESTS_DAEMONSTATUSREQUEST_H_
 
 #include <Common/Request.h>
+#include <Net/Packets/HostStatusPacket.h>
 
 #include <string>
 
 namespace Mad {
-
-namespace Net {
-namespace Packets {
-class HostStatusPacket;
-}
-}
-
 namespace Client {
 namespace Requests {