diff --git a/Client.cpp b/Client.cpp
index 588c4937..daeb84d0 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -14,6 +14,7 @@
 #include "Server.h"
 #include "Timers.h"
 #include "User.h"
+#include "znc.h"
 
 CClient::~CClient() {
 	if (!m_spAuth.IsNull()) {
diff --git a/DCCBounce.cpp b/DCCBounce.cpp
index e6a54ac8..fbed94ba 100644
--- a/DCCBounce.cpp
+++ b/DCCBounce.cpp
@@ -8,6 +8,7 @@
 
 #include "DCCBounce.h"
 #include "User.h"
+#include "znc.h"
 
 // If we buffer more than this in memory, we will throttle the receiving side
 const unsigned int CDCCBounce::m_uiMaxDCCBuffer = 10 * 1024;
diff --git a/DCCBounce.h b/DCCBounce.h
index d9237b9a..b2645cd3 100644
--- a/DCCBounce.h
+++ b/DCCBounce.h
@@ -9,7 +9,10 @@
 #ifndef _DCCBOUNCE_H
 #define _DCCBOUNCE_H
 
-#include "znc.h"
+#include "Csocket.h"
+#include "Utils.h"
+
+class CUser;
 
 class CDCCBounce : public Csock {
 public:
diff --git a/IRCSock.cpp b/IRCSock.cpp
index 6cd8d085..3bfffa93 100644
--- a/IRCSock.cpp
+++ b/IRCSock.cpp
@@ -11,6 +11,7 @@
 #include "Client.h"
 #include "DCCBounce.h"
 #include "User.h"
+#include "znc.h"
 
 CIRCSock::CIRCSock(CUser* pUser) : Csock() {
 	m_pUser = pUser;