diff --git a/User.cpp b/User.cpp
index 420cfbf7..93dc230f 100644
--- a/User.cpp
+++ b/User.cpp
@@ -59,7 +59,10 @@ CUser::~CUser() {
 	}
 
 	DelClients();
+
+#ifdef _MODULES
 	DelModules();
+#endif
 
 	CZNC::Get().GetManager().DelCronByAddr(m_pBackNickTimer);
 	CZNC::Get().GetManager().DelCronByAddr(m_pAwayNickTimer);
diff --git a/znc.cpp b/znc.cpp
index df80269b..c403e290 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -42,7 +42,10 @@ CZNC::~CZNC() {
 
 	m_Manager.Cleanup();
 	DeleteUsers();
+
+#ifdef _MODULES
 	delete m_pModules;
+#endif
 }
 
 CString CZNC::GetTag(bool bIncludeVersion) {
diff --git a/znc.h b/znc.h
index 457ea5ee..f2617727 100644
--- a/znc.h
+++ b/znc.h
@@ -5,6 +5,7 @@
 
 #include "main.h"
 #include "FileUtils.h"
+#include "Client.h"
 #ifdef _MODULES
 #include "Modules.h"
 #endif