diff --git a/Chan.cpp b/Chan.cpp
index 093e6fec..bec60c34 100644
--- a/Chan.cpp
+++ b/Chan.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "Chan.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
 #include "User.h"
 #include "znc.h"
diff --git a/Chan.h b/Chan.h
index 0064210d..e633508f 100644
--- a/Chan.h
+++ b/Chan.h
@@ -10,7 +10,6 @@
 #define _CHAN_H
 
 #include "zncconfig.h"
-#include "FileUtils.h"
 #include "Nick.h"
 #include "ZNCString.h"
 #include <map>
@@ -25,6 +24,7 @@ using std::set;
 class CUser;
 class CClient;
 class CConfig;
+class CFile;
 // !Forward Declarations
 
 class CChan {
diff --git a/Client.cpp b/Client.cpp
index 57092ba9..a778949a 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -9,6 +9,7 @@
 #include "Client.h"
 #include "Chan.h"
 #include "DCCBounce.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
 #include "User.h"
 #include "znc.h"
diff --git a/ClientCommand.cpp b/ClientCommand.cpp
index 3a5935a8..2dbb619a 100644
--- a/ClientCommand.cpp
+++ b/ClientCommand.cpp
@@ -10,11 +10,12 @@
 #include "Chan.h"
 #include "DCCBounce.h"
 #include "DCCSock.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
+#include "Listener.h"
 #include "Server.h"
 #include "User.h"
 #include "znc.h"
-#include "Listener.h"
 
 void CClient::UserCommand(CString& sLine) {
 	if (!m_pUser) {
diff --git a/Config.cpp b/Config.cpp
index 4bc12ce8..4e89d4eb 100644
--- a/Config.cpp
+++ b/Config.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "Config.h"
+#include "FileUtils.h"
 #include <stack>
 #include <sstream>
 
diff --git a/Config.h b/Config.h
index e8853bbe..30f20f99 100644
--- a/Config.h
+++ b/Config.h
@@ -10,7 +10,8 @@
 #define CONFIG_H
 
 #include "ZNCString.h"
-#include "FileUtils.h"
+
+class CFile;
 
 class CConfig {
 public:
diff --git a/DCCSock.cpp b/DCCSock.cpp
index d78fe220..94c60e5b 100644
--- a/DCCSock.cpp
+++ b/DCCSock.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "DCCSock.h"
+#include "FileUtils.h"
 #include "User.h"
 #include "Utils.h"
 
@@ -236,3 +237,13 @@ CFile* CDCCSock::OpenFile(bool bWrite) {
 	return m_pFile;
 }
 
+bool CDCCSock::Seek(unsigned int uPos) {
+	if (m_pFile) {
+		if (m_pFile->Seek(uPos)) {
+			m_uBytesSoFar = uPos;
+			return true;
+		}
+	}
+
+	return false;
+}
diff --git a/DCCSock.h b/DCCSock.h
index 7e5d2f92..0a97ea2a 100644
--- a/DCCSock.h
+++ b/DCCSock.h
@@ -10,11 +10,11 @@
 #define _DCCSOCK_H
 
 #include "zncconfig.h"
-#include "FileUtils.h"
 #include "Socket.h"
 
 // Forward Declarations
 class CUser;
+class CFile;
 // !Forward Declarations
 
 class CDCCSock : public CZNCSock {
@@ -32,16 +32,7 @@ public:
 	void SendPacket();
 	virtual Csock* GetSockObj(const CString& sHost, unsigned short uPort);
 	CFile* OpenFile(bool bWrite = true);
-	bool Seek(unsigned int uPos) {
-		if (m_pFile) {
-			if (m_pFile->Seek(uPos)) {
-				m_uBytesSoFar = uPos;
-				return true;
-			}
-		}
-
-		return false;
-	}
+	bool Seek(unsigned int uPos);
 
 	// Setters
 	void SetRemoteIP(const CString& s) { m_sRemoteIP = s; }
diff --git a/Modules.cpp b/Modules.cpp
index dde5f204..2b29cea1 100644
--- a/Modules.cpp
+++ b/Modules.cpp
@@ -7,11 +7,12 @@
  */
 
 #include "Modules.h"
+#include "FileUtils.h"
+#include "Template.h"
 #include "User.h"
+#include "WebModules.h"
 #include "znc.h"
 #include <dlfcn.h>
-#include "WebModules.h"
-#include "Template.h"
 
 #ifndef RTLD_LOCAL
 # define RTLD_LOCAL 0
diff --git a/User.cpp b/User.cpp
index 9e39e04b..7750be40 100644
--- a/User.cpp
+++ b/User.cpp
@@ -10,6 +10,7 @@
 #include "Chan.h"
 #include "Config.h"
 #include "DCCSock.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
 #include "Server.h"
 #include "znc.h"
@@ -1514,4 +1515,6 @@ unsigned int CUser::GetBufferCount() const { return m_uBufferCount; }
 bool CUser::KeepBuffer() const { return m_bKeepBuffer; }
 //CString CUser::GetSkinName() const { return (!m_sSkinName.empty()) ? m_sSkinName : CZNC::Get().GetSkinName(); }
 CString CUser::GetSkinName() const { return m_sSkinName; }
+const CString& CUser::GetUserPath() const { if (!CFile::Exists(m_sUserPath)) { CDir::MakeDir(m_sUserPath); } return m_sUserPath; }
+const CString& CUser::GetDLPath() const { if (!CFile::Exists(m_sDLPath)) { CDir::MakeDir(m_sDLPath); } return m_sDLPath; }
 // !Getters
diff --git a/User.h b/User.h
index b9b5ae03..2fe3b10d 100644
--- a/User.h
+++ b/User.h
@@ -11,7 +11,6 @@
 
 #include "zncconfig.h"
 #include "Buffer.h"
-#include "FileUtils.h"
 #include "Modules.h"
 #include "Nick.h"
 #include <set>
@@ -23,6 +22,7 @@ using std::vector;
 class CChan;
 class CClient;
 class CConfig;
+class CFile;
 class CIRCSock;
 class CUserTimer;
 class CServer;
@@ -198,8 +198,8 @@ public:
 	const CString& GetChanPrefixes() const { return m_sChanPrefixes; }
 	bool IsChan(const CString& sChan) const;
 
-	const CString& GetUserPath() const { if (!CFile::Exists(m_sUserPath)) { CDir::MakeDir(m_sUserPath); } return m_sUserPath; }
-	const CString& GetDLPath() const { if (!CFile::Exists(m_sDLPath)) { CDir::MakeDir(m_sDLPath); } return m_sDLPath; }
+	const CString& GetUserPath() const;
+	const CString& GetDLPath() const;
 
 	bool UseClientIP() const;
 	bool DenyLoadMod() const;
diff --git a/WebModules.cpp b/WebModules.cpp
index 071b2f9a..34bb0291 100644
--- a/WebModules.cpp
+++ b/WebModules.cpp
@@ -7,6 +7,7 @@
  */
 
 #include "WebModules.h"
+#include "FileUtils.h"
 #include "User.h"
 #include "znc.h"
 #include <sstream>
diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index a0a56d3c..fa21e1ae 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -6,9 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
 #include "Client.h"
+#include "FileUtils.h"
 #include "Server.h"
+#include "User.h"
 
 #include <syslog.h>
 
diff --git a/modules/away.cpp b/modules/away.cpp
index 6152733a..40115265 100644
--- a/modules/away.cpp
+++ b/modules/away.cpp
@@ -12,6 +12,7 @@
 #define REQUIRESSL
 
 #include "User.h"
+#include "FileUtils.h"
 #include <sys/stat.h>
 
 #define CRYPT_VERIFICATION_TOKEN "::__:AWAY:__::"
diff --git a/modules/extra/email.cpp b/modules/extra/email.cpp
index 0750888a..74152174 100644
--- a/modules/extra/email.cpp
+++ b/modules/extra/email.cpp
@@ -9,6 +9,7 @@
  * Author: imaginos <imaginos@imaginos.net>
  */
 
+#include "FileUtils.h"
 #include "MD5.h"
 #include "User.h"
 #include "znc.h"
diff --git a/modules/extra/log.cpp b/modules/extra/log.cpp
index 76d1865f..fac3c3a4 100644
--- a/modules/extra/log.cpp
+++ b/modules/extra/log.cpp
@@ -7,6 +7,7 @@
  * by the Free Software Foundation.
  */
 
+#include "FileUtils.h"
 #include "User.h"
 #include "Chan.h"
 #include "Server.h"
diff --git a/modules/extra/shell.cpp b/modules/extra/shell.cpp
index 6194d4e9..58d704de 100644
--- a/modules/extra/shell.cpp
+++ b/modules/extra/shell.cpp
@@ -6,6 +6,7 @@
  * by the Free Software Foundation.
  */
 
+#include "FileUtils.h"
 #include "User.h"
 #include "znc.h"
 #include "ExecSock.h"
diff --git a/modules/identfile.cpp b/modules/identfile.cpp
index d45f2811..78cef08e 100644
--- a/modules/identfile.cpp
+++ b/modules/identfile.cpp
@@ -6,9 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
 #include "User.h"
+#include "znc.h"
 
 class CIdentFileModule : public CGlobalModule {
 	CString m_sOrigISpoof;
diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index a7bbd579..1dc46d77 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -6,12 +6,13 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "User.h"
 #include "Chan.h"
-#include "Nick.h"
-#include "znc.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
+#include "Modules.h"
+#include "Nick.h"
+#include "User.h"
+#include "znc.h"
 
 #include "modperl/module.h"
 #include "modperl/swigperlrun.h"
diff --git a/modules/modpython.cpp b/modules/modpython.cpp
index 4c8a88b0..2f597c89 100644
--- a/modules/modpython.cpp
+++ b/modules/modpython.cpp
@@ -8,12 +8,13 @@
 
 #include <Python.h>
 
-#include "Modules.h"
-#include "User.h"
 #include "Chan.h"
-#include "Nick.h"
-#include "znc.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
+#include "Modules.h"
+#include "Nick.h"
+#include "User.h"
+#include "znc.h"
 
 #include "modpython/swigpyrun.h"
 #include "modpython/module.h"
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index b70f0476..9490336a 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -16,6 +16,7 @@
 
 #include "Chan.h"
 #include "User.h"
+#include "FileUtils.h"
 #include <sys/stat.h>
 
 #define CRYPT_VERIFICATION_TOKEN "::__:SAVEBUFF:__::"
diff --git a/modules/schat.cpp b/modules/schat.cpp
index a014e9ea..e5f1fb12 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -11,6 +11,7 @@
 
 #define REQUIRESSL
 
+#include "FileUtils.h"
 #include "User.h"
 #include "znc.h"
 #include <sstream>
diff --git a/znc.cpp b/znc.cpp
index 424a84d6..a33b19d8 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -8,6 +8,7 @@
 
 #include "znc.h"
 #include "Chan.h"
+#include "FileUtils.h"
 #include "IRCSock.h"
 #include "Server.h"
 #include "User.h"