diff --git a/include/znc/User.h b/include/znc/User.h
index 1fb9075a..d4eb4b83 100644
--- a/include/znc/User.h
+++ b/include/znc/User.h
@@ -10,8 +10,8 @@
 #define _USER_H
 
 #include <znc/zncconfig.h>
+#include <znc/Utils.h>
 #include <znc/Buffer.h>
-#include <znc/Modules.h>
 #include <znc/Nick.h>
 #include <set>
 #include <vector>
@@ -19,6 +19,7 @@
 using std::set;
 using std::vector;
 
+class CModules;
 class CChan;
 class CClient;
 class CConfig;
diff --git a/modules/extra/autovoice.cpp b/modules/extra/autovoice.cpp
index 9412263f..79ab72de 100644
--- a/modules/extra/autovoice.cpp
+++ b/modules/extra/autovoice.cpp
@@ -6,8 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include <znc/Chan.h>
+#include <znc/Modules.h>
 #include <znc/User.h>
+#include <znc/Chan.h>
 
 class CAutoVoiceUser {
 public:
diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp
index 675aaeca..29759100 100644
--- a/modules/nickserv.cpp
+++ b/modules/nickserv.cpp
@@ -6,6 +6,7 @@
  * by the Free Software Foundation.
  */
 
+#include <znc/Modules.h>
 #include <znc/User.h>
 
 class CNickServ : public CModule
diff --git a/modules/raw.cpp b/modules/raw.cpp
index 4772683f..7b845bbf 100644
--- a/modules/raw.cpp
+++ b/modules/raw.cpp
@@ -6,6 +6,7 @@
  * by the Free Software Foundation.
  */
 
+#include <znc/Modules.h>
 #include <znc/User.h>
 
 class CRawMod : public CModule {
diff --git a/src/User.cpp b/src/User.cpp
index 92927909..635db777 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -14,6 +14,7 @@
 #include <znc/IRCSock.h>
 #include <znc/Server.h>
 #include <znc/znc.h>
+#include <znc/Modules.h>
 
 class CUserTimer : public CCron {
 public: