diff --git a/Listener.cpp b/Listener.cpp
index 61ffc391..be95abd6 100644
--- a/Listener.cpp
+++ b/Listener.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "Listener.h"
+#include "znc.h"
 
 CListener::~CListener() {
 	if (m_pListener)
diff --git a/Listener.h b/Listener.h
index 076a51a6..ea303d7a 100644
--- a/Listener.h
+++ b/Listener.h
@@ -10,7 +10,7 @@
 #define _LISTENER_H
 
 #include "zncconfig.h"
-#include "znc.h"
+#include "Socket.h"
 
 // Forward Declarations
 class CRealListener;
diff --git a/modules/certauth.cpp b/modules/certauth.cpp
index 6e6beb96..337a51a1 100644
--- a/modules/certauth.cpp
+++ b/modules/certauth.cpp
@@ -11,6 +11,7 @@
 #include "Modules.h"
 #include "User.h"
 #include "Listener.h"
+#include "znc.h"
 
 class CSSLClientCertMod : public CGlobalModule {
 public: