diff --git a/Makefile.in b/Makefile.in
index c6064159..1171c8f3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ includedir  := @includedir@
 sbindir     := @sbindir@
 localstatedir := @localstatedir@
 CXX      := @CXX@
-CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I.
+CXXFLAGS := @CPPFLAGS@ @CXXFLAGS@ -I$(srcdir)/include -Iinclude
 LDFLAGS  := @LDFLAGS@
 LIBS     := @LIBS@
 LIBZNC   := @LIBZNC@
@@ -32,10 +32,11 @@ LIB_SRCS  := ZNCString.cpp Csocket.cpp znc.cpp IRCNetwork.cpp User.cpp IRCSock.c
 	Client.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp MD5.cpp Buffer.cpp Utils.cpp \
 	FileUtils.cpp HTTPSock.cpp Template.cpp ClientCommand.cpp Socket.cpp SHA256.cpp \
 	WebModules.cpp Listener.cpp Config.cpp ZNCDebug.cpp
-BIN_SRCS  := main.cpp
+LIB_SRCS  := $(addprefix src/,$(LIB_SRCS))
+BIN_SRCS  := src/main.cpp
 LIB_OBJS  := $(patsubst %cpp,%o,$(LIB_SRCS))
 BIN_OBJS  := $(patsubst %cpp,%o,$(BIN_SRCS))
-CLEAN     := znc *.o core core.*
+CLEAN     := znc src/*.o core core.*
 DISTCLEAN := Makefile config.log config.status znc-config znc-buildmod .depend \
 	modules/.depend modules/Makefile man/Makefile znc.pc znc-uninstalled.pc
 
@@ -96,10 +97,10 @@ clean:
 distclean: clean
 	rm -rf $(DISTCLEAN)
 
-%.o: %.cpp Makefile
-	@mkdir -p .depend
-	$(E) Building $@...
-	$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$@.dep
+src/%.o: src/%.cpp Makefile
+	@mkdir -p .depend src
+	$(E) Building core object $*...
+	$(Q)$(CXX) $(CXXFLAGS) -c -o $@ $< -MMD -MF .depend/$*.dep
 
 install: znc $(LIBZNC)
 	mkdir -p $(DESTDIR)$(bindir)
@@ -113,8 +114,8 @@ install: znc $(LIBZNC)
 	$(INSTALL_PROGRAM) znc $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) znc-config $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) znc-buildmod $(DESTDIR)$(bindir)
-	$(INSTALL_DATA) $(srcdir)/*.h $(DESTDIR)$(includedir)/znc
-	$(INSTALL_DATA) zncconfig.h $(DESTDIR)$(includedir)/znc
+	$(INSTALL_DATA) $(srcdir)/include/znc/*.h $(DESTDIR)$(includedir)/znc
+	$(INSTALL_DATA) include/znc/zncconfig.h $(DESTDIR)$(includedir)/znc
 	$(INSTALL_DATA) znc.pc $(DESTDIR)$(PKGCONFIGDIR)
 	@$(MAKE) -C modules install DESTDIR=$(DESTDIR);
 	if test -n "$(LIBZNC)"; then \
diff --git a/configure.ac b/configure.ac
index 7649f0be..d988c917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,9 +9,9 @@ AC_PREREQ([2.62])
 dnl Keep the version number in sync with main.h!
 AC_INIT([znc], [0.203])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([znc.cpp])
+AC_CONFIG_SRCDIR([src/znc.cpp])
 AC_LANG([C++])
-AC_CONFIG_HEADERS([zncconfig.h])
+AC_CONFIG_HEADERS([include/znc/zncconfig.h])
 AH_TOP([#ifndef ZNCCONFIG_H
 #define ZNCCONFIG_H])
 AH_BOTTOM([#endif /* ZNCCONFIG_H */])
diff --git a/Buffer.h b/include/znc/Buffer.h
similarity index 97%
rename from Buffer.h
rename to include/znc/Buffer.h
index a8107259..8c00ed22 100644
--- a/Buffer.h
+++ b/include/znc/Buffer.h
@@ -9,8 +9,8 @@
 #ifndef _BUFFER_H
 #define _BUFFER_H
 
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
 #include <deque>
 
 using std::deque;
diff --git a/Chan.h b/include/znc/Chan.h
similarity index 98%
rename from Chan.h
rename to include/znc/Chan.h
index be8e8333..4dd27de4 100644
--- a/Chan.h
+++ b/include/znc/Chan.h
@@ -9,9 +9,9 @@
 #ifndef _CHAN_H
 #define _CHAN_H
 
-#include "zncconfig.h"
-#include "Nick.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/Nick.h>
+#include <znc/ZNCString.h>
 #include <map>
 #include <set>
 #include <vector>
diff --git a/Client.h b/include/znc/Client.h
similarity index 97%
rename from Client.h
rename to include/znc/Client.h
index ab80e866..22115fee 100644
--- a/Client.h
+++ b/include/znc/Client.h
@@ -9,10 +9,10 @@
 #ifndef _CLIENT_H
 #define _CLIENT_H
 
-#include "zncconfig.h"
-#include "Socket.h"
-#include "Utils.h"
-#include "main.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
+#include <znc/Utils.h>
+#include <znc/main.h>
 
 // Forward Declarations
 class CZNC;
diff --git a/Config.h b/include/znc/Config.h
similarity index 98%
rename from Config.h
rename to include/znc/Config.h
index eee074ed..e98131ca 100644
--- a/Config.h
+++ b/include/znc/Config.h
@@ -9,8 +9,8 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
 
 class CFile;
 class CConfig;
diff --git a/Csocket.h b/include/znc/Csocket.h
similarity index 99%
rename from Csocket.h
rename to include/znc/Csocket.h
index df44d472..06822fd3 100644
--- a/Csocket.h
+++ b/include/znc/Csocket.h
@@ -34,7 +34,7 @@
 
 #ifndef _HAS_CSOCKET_
 #define _HAS_CSOCKET_
-#include "defines.h" // require this as a general rule, most projects have a defines.h or the like
+#include <znc/defines.h> // require this as a general rule, most projects have a defines.h or the like
 
 #include <stdio.h>
 #include <unistd.h>
diff --git a/ExecSock.h b/include/znc/ExecSock.h
similarity index 95%
rename from ExecSock.h
rename to include/znc/ExecSock.h
index 701658ad..93ea916b 100644
--- a/ExecSock.h
+++ b/include/znc/ExecSock.h
@@ -9,8 +9,8 @@
 #ifndef EXEC_SOCK_H
 #define EXEC_SOCK_H
 
-#include "zncconfig.h"
-#include "Socket.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
 #include <signal.h>
 
 //! @author imaginos@imaginos.net
diff --git a/FileUtils.h b/include/znc/FileUtils.h
similarity index 99%
rename from FileUtils.h
rename to include/znc/FileUtils.h
index 47b11241..89cac8cc 100644
--- a/FileUtils.h
+++ b/include/znc/FileUtils.h
@@ -9,8 +9,8 @@
 #ifndef _FILEUTILS_H
 #define _FILEUTILS_H
 
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
 #include <dirent.h>
 #include <map>
 #include <stdlib.h>
diff --git a/HTTPSock.h b/include/znc/HTTPSock.h
similarity index 98%
rename from HTTPSock.h
rename to include/znc/HTTPSock.h
index 9119fe8f..94a008c4 100644
--- a/HTTPSock.h
+++ b/include/znc/HTTPSock.h
@@ -9,8 +9,8 @@
 #ifndef _HTTPSOCK_H
 #define _HTTPSOCK_H
 
-#include "zncconfig.h"
-#include "Socket.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
 
 class CModule;
 
diff --git a/IRCNetwork.h b/include/znc/IRCNetwork.h
similarity index 97%
rename from IRCNetwork.h
rename to include/znc/IRCNetwork.h
index 20537cde..fe654d4d 100644
--- a/IRCNetwork.h
+++ b/include/znc/IRCNetwork.h
@@ -9,11 +9,11 @@
 #ifndef _IRCNETWORK_H
 #define _IRCNETWORK_H
 
-#include "zncconfig.h"
-#include "ZNCString.h"
-#include "Buffer.h"
-#include "Nick.h"
-#include "znc.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
+#include <znc/Buffer.h>
+#include <znc/Nick.h>
+#include <znc/znc.h>
 
 class CModules;
 class CUser;
diff --git a/IRCSock.h b/include/znc/IRCSock.h
similarity index 98%
rename from IRCSock.h
rename to include/znc/IRCSock.h
index a7d3acec..843dbe2d 100644
--- a/IRCSock.h
+++ b/include/znc/IRCSock.h
@@ -9,9 +9,9 @@
 #ifndef _IRCSOCK_H
 #define _IRCSOCK_H
 
-#include "zncconfig.h"
-#include "Socket.h"
-#include "Nick.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
+#include <znc/Nick.h>
 
 // Forward Declarations
 class CChan;
diff --git a/Listener.h b/include/znc/Listener.h
similarity index 97%
rename from Listener.h
rename to include/znc/Listener.h
index ea303d7a..09088cc0 100644
--- a/Listener.h
+++ b/include/znc/Listener.h
@@ -9,8 +9,8 @@
 #ifndef _LISTENER_H
 #define _LISTENER_H
 
-#include "zncconfig.h"
-#include "Socket.h"
+#include <znc/zncconfig.h>
+#include <znc/Socket.h>
 
 // Forward Declarations
 class CRealListener;
diff --git a/MD5.h b/include/znc/MD5.h
similarity index 97%
rename from MD5.h
rename to include/znc/MD5.h
index dcdb5b83..f2cde0ee 100644
--- a/MD5.h
+++ b/include/znc/MD5.h
@@ -3,7 +3,7 @@
 #ifndef _MD5_H
 #define _MD5_H
 
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
 #include <string>
 using std::string;
 
diff --git a/Modules.h b/include/znc/Modules.h
similarity index 99%
rename from Modules.h
rename to include/znc/Modules.h
index ede88ff2..66fd6b6b 100644
--- a/Modules.h
+++ b/include/znc/Modules.h
@@ -9,9 +9,9 @@
 #ifndef _MODULES_H
 #define _MODULES_H
 
-#include "zncconfig.h"
-#include "WebModules.h"
-#include "main.h"
+#include <znc/zncconfig.h>
+#include <znc/WebModules.h>
+#include <znc/main.h>
 #include <set>
 #include <queue>
 
diff --git a/Nick.h b/include/znc/Nick.h
similarity index 96%
rename from Nick.h
rename to include/znc/Nick.h
index ddb33bc4..5ad892ec 100644
--- a/Nick.h
+++ b/include/znc/Nick.h
@@ -9,8 +9,8 @@
 #ifndef _NICK_H
 #define _NICK_H
 
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
 #include <set>
 #include <vector>
 
diff --git a/SHA256.h b/include/znc/SHA256.h
similarity index 98%
rename from SHA256.h
rename to include/znc/SHA256.h
index 673fb6b7..28d2fdbe 100644
--- a/SHA256.h
+++ b/include/znc/SHA256.h
@@ -37,7 +37,7 @@
 #define SHA256_DIGEST_SIZE ( 256 / 8)
 #define SHA256_BLOCK_SIZE  ( 512 / 8)
 
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
 
 // C99 defines stdint.h which defines a uint32_t and uint8_t type.
 // But the other kids didn't want to play with poor little Solaris 9 and so he
diff --git a/Server.h b/include/znc/Server.h
similarity index 93%
rename from Server.h
rename to include/znc/Server.h
index 82e38abd..cb18d67e 100644
--- a/Server.h
+++ b/include/znc/Server.h
@@ -9,8 +9,8 @@
 #ifndef _SERVER_H
 #define _SERVER_H
 
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
 
 class CServer {
 public:
diff --git a/Socket.h b/include/znc/Socket.h
similarity index 98%
rename from Socket.h
rename to include/znc/Socket.h
index 31725d55..af552993 100644
--- a/Socket.h
+++ b/include/znc/Socket.h
@@ -9,8 +9,8 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
-#include "zncconfig.h"
-#include "Csocket.h"
+#include <znc/zncconfig.h>
+#include <znc/Csocket.h>
 
 class CModule;
 
diff --git a/Template.h b/include/znc/Template.h
similarity index 99%
rename from Template.h
rename to include/znc/Template.h
index ea53e402..6f69ce6c 100644
--- a/Template.h
+++ b/include/znc/Template.h
@@ -9,8 +9,8 @@
 #ifndef _TEMPLATE_H
 #define _TEMPLATE_H
 
-#include "zncconfig.h"
-#include "Utils.h"
+#include <znc/zncconfig.h>
+#include <znc/Utils.h>
 #include <iostream>
 
 using std::ostream;
diff --git a/User.h b/include/znc/User.h
similarity index 98%
rename from User.h
rename to include/znc/User.h
index 8cc15f7d..1fb9075a 100644
--- a/User.h
+++ b/include/znc/User.h
@@ -9,10 +9,10 @@
 #ifndef _USER_H
 #define _USER_H
 
-#include "zncconfig.h"
-#include "Buffer.h"
-#include "Modules.h"
-#include "Nick.h"
+#include <znc/zncconfig.h>
+#include <znc/Buffer.h>
+#include <znc/Modules.h>
+#include <znc/Nick.h>
 #include <set>
 #include <vector>
 
diff --git a/Utils.h b/include/znc/Utils.h
similarity index 99%
rename from Utils.h
rename to include/znc/Utils.h
index 5dc337a5..88a88ab6 100644
--- a/Utils.h
+++ b/include/znc/Utils.h
@@ -9,8 +9,8 @@
 #ifndef _UTILS_H
 #define _UTILS_H
 
-#include "zncconfig.h"
-#include "ZNCString.h"
+#include <znc/zncconfig.h>
+#include <znc/ZNCString.h>
 #include <assert.h>
 #include <cstdio>
 #include <fcntl.h>
diff --git a/WebModules.h b/include/znc/WebModules.h
similarity index 98%
rename from WebModules.h
rename to include/znc/WebModules.h
index 40fe3079..a436c7d4 100644
--- a/WebModules.h
+++ b/include/znc/WebModules.h
@@ -9,9 +9,9 @@
 #ifndef _WEBMODULES_H
 #define _WEBMODULES_H
 
-#include "zncconfig.h"
-#include "Template.h"
-#include "HTTPSock.h"
+#include <znc/zncconfig.h>
+#include <znc/Template.h>
+#include <znc/HTTPSock.h>
 
 class CAuthBase;
 class CUser;
diff --git a/ZNCDebug.h b/include/znc/ZNCDebug.h
similarity index 97%
rename from ZNCDebug.h
rename to include/znc/ZNCDebug.h
index 4a9682ca..ceb200f4 100644
--- a/ZNCDebug.h
+++ b/include/znc/ZNCDebug.h
@@ -9,7 +9,7 @@
 #ifndef ZNCDEBUG_H
 #define ZNCDEBUG_H
 
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
 #include <iostream>
 
 using std::cout;
diff --git a/ZNCString.h b/include/znc/ZNCString.h
similarity index 99%
rename from ZNCString.h
rename to include/znc/ZNCString.h
index 936022b1..ce3b1f39 100644
--- a/ZNCString.h
+++ b/include/znc/ZNCString.h
@@ -9,7 +9,7 @@
 #ifndef ZNCSTRING_H
 #define ZNCSTRING_H
 
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
 #include <map>
 #include <set>
 #include <string>
diff --git a/defines.h b/include/znc/defines.h
similarity index 89%
rename from defines.h
rename to include/znc/defines.h
index a8470eac..628b014e 100644
--- a/defines.h
+++ b/include/znc/defines.h
@@ -9,12 +9,12 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
 
 // This header file is just for Csocket
 
-#include "ZNCDebug.h"
-#include "ZNCString.h"
+#include <znc/ZNCDebug.h>
+#include <znc/ZNCString.h>
 
 #define CS_STRING CString
 #define _NO_CSOCKET_NS
diff --git a/main.h b/include/znc/main.h
similarity index 99%
rename from main.h
rename to include/znc/main.h
index 2027ad33..d04e07c9 100644
--- a/main.h
+++ b/include/znc/main.h
@@ -9,7 +9,7 @@
 #ifndef _MAIN_H
 #define _MAIN_H
 
-#include "zncconfig.h"
+#include <znc/zncconfig.h>
 
 // The following defines are for #if comparison (preprocessor only likes ints)
 #define VERSION_MAJOR  0
diff --git a/znc.h b/include/znc/znc.h
similarity index 98%
rename from znc.h
rename to include/znc/znc.h
index 5a98300a..25dc85d0 100644
--- a/znc.h
+++ b/include/znc/znc.h
@@ -9,11 +9,11 @@
 #ifndef _ZNC_H
 #define _ZNC_H
 
-#include "zncconfig.h"
-#include "Client.h"
-#include "Modules.h"
-#include "Socket.h"
-#include "Listener.h"
+#include <znc/zncconfig.h>
+#include <znc/Client.h>
+#include <znc/Modules.h>
+#include <znc/Socket.h>
+#include <znc/Listener.h>
 #include <map>
 
 using std::map;
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 87868b05..58587b34 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -17,7 +17,7 @@ sbindir     := @sbindir@
 localstatedir := @localstatedir@
 CXX      := @CXX@
 # CXXFLAGS are for the main binary, so don't use them here, use MODFLAGS instead
-MODFLAGS := @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/.. -I..
+MODFLAGS := @CPPFLAGS@ @MODFLAGS@ -I$(srcdir)/../include -I../include
 MODLINK  := @MODLINK@
 LDFLAGS  := @LDFLAGS@
 # LIBS are not and should not be used in here.
diff --git a/modules/admin.cpp b/modules/admin.cpp
index 94d2b43e..9623e964 100644
--- a/modules/admin.cpp
+++ b/modules/admin.cpp
@@ -9,12 +9,12 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "Modules.h"
-#include "Chan.h"
-#include "IRCSock.h"
+#include <znc/znc.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/Modules.h>
+#include <znc/Chan.h>
+#include <znc/IRCSock.h>
 
 template<std::size_t N>
 struct array_size_helper {
diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index d8451f92..904369c0 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -6,11 +6,11 @@
  * by the Free Software Foundation.
  */
 
-#include "Client.h"
-#include "FileUtils.h"
-#include "Server.h"
-#include "IRCNetwork.h"
-#include "User.h"
+#include <znc/Client.h>
+#include <znc/FileUtils.h>
+#include <znc/Server.h>
+#include <znc/IRCNetwork.h>
+#include <znc/User.h>
 
 #include <syslog.h>
 
diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp
index 3dfd136a..7ca2588c 100644
--- a/modules/autoattach.cpp
+++ b/modules/autoattach.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "Modules.h"
+#include <znc/Chan.h>
+#include <znc/Modules.h>
 
 class CAttachMatch {
 public:
diff --git a/modules/autoop.cpp b/modules/autoop.cpp
index 93702662..505550e2 100644
--- a/modules/autoop.cpp
+++ b/modules/autoop.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "IRCNetwork.h"
-#include "Chan.h"
+#include <znc/IRCNetwork.h>
+#include <znc/Chan.h>
 
 class CAutoOpMod;
 
diff --git a/modules/autoreply.cpp b/modules/autoreply.cpp
index 75f56965..0ce19643 100644
--- a/modules/autoreply.cpp
+++ b/modules/autoreply.cpp
@@ -7,10 +7,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "IRCNetwork.h"
-#include "IRCSock.h"
-#include "User.h"
+#include <znc/Modules.h>
+#include <znc/IRCNetwork.h>
+#include <znc/IRCSock.h>
+#include <znc/User.h>
 
 class CAutoReplyMod : public CModule {
 public:
diff --git a/modules/awaynick.cpp b/modules/awaynick.cpp
index 3c22f9b9..3ecf9498 100644
--- a/modules/awaynick.cpp
+++ b/modules/awaynick.cpp
@@ -7,9 +7,9 @@
  */
 
 // @todo handle raw 433 (nick in use)
-#include "IRCSock.h"
-#include "User.h"
-#include "IRCNetwork.h"
+#include <znc/IRCSock.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
 
 class CAwayNickMod;
 
diff --git a/modules/blockuser.cpp b/modules/blockuser.cpp
index 108b8b30..2e366588 100644
--- a/modules/blockuser.cpp
+++ b/modules/blockuser.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
-#include "IRCNetwork.h"
-#include "IRCSock.h"
-#include "znc.h"
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/IRCSock.h>
+#include <znc/znc.h>
 
 #define MESSAGE "Your account has been disabled. Contact your administrator."
 
diff --git a/modules/bouncedcc.cpp b/modules/bouncedcc.cpp
index c91ca37b..1943d9be 100644
--- a/modules/bouncedcc.cpp
+++ b/modules/bouncedcc.cpp
@@ -6,12 +6,12 @@
  * by the Free Software Foundation.
  */
 
-#include "zncconfig.h"
-#include "znc.h"
-#include "User.h"
-#include "Modules.h"
-#include "Socket.h"
-#include "FileUtils.h"
+#include <znc/zncconfig.h>
+#include <znc/znc.h>
+#include <znc/User.h>
+#include <znc/Modules.h>
+#include <znc/Socket.h>
+#include <znc/FileUtils.h>
 
 class CBounceDCCMod;
 
diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp
index 02655f9f..75b113c5 100644
--- a/modules/buffextras.cpp
+++ b/modules/buffextras.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "User.h"
-#include "Modules.h"
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/Modules.h>
 
 class CBuffExtras : public CModule {
 public:
diff --git a/modules/cert.cpp b/modules/cert.cpp
index a3538e7c..d05a0e81 100644
--- a/modules/cert.cpp
+++ b/modules/cert.cpp
@@ -8,10 +8,10 @@
 
 #define REQUIRESSL
 
-#include "FileUtils.h"
-#include "User.h"
-#include "Modules.h"
-#include "IRCSock.h"
+#include <znc/FileUtils.h>
+#include <znc/User.h>
+#include <znc/Modules.h>
+#include <znc/IRCSock.h>
 
 class CCertMod : public CModule {
 public:
diff --git a/modules/certauth.cpp b/modules/certauth.cpp
index 547dd140..aa789540 100644
--- a/modules/certauth.cpp
+++ b/modules/certauth.cpp
@@ -8,10 +8,10 @@
 
 #define REQUIRESSL
 
-#include "Modules.h"
-#include "User.h"
-#include "Listener.h"
-#include "znc.h"
+#include <znc/Modules.h>
+#include <znc/User.h>
+#include <znc/Listener.h>
+#include <znc/znc.h>
 
 class CSSLClientCertMod : public CModule {
 public:
diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp
index 8443a31c..a19047bc 100644
--- a/modules/chansaver.cpp
+++ b/modules/chansaver.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
 
 class CChanSaverMod : public CModule {
 public:
diff --git a/modules/clientnotify.cpp b/modules/clientnotify.cpp
index c97c99ac..1b9dd02a 100644
--- a/modules/clientnotify.cpp
+++ b/modules/clientnotify.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "User.h"
+#include <znc/znc.h>
+#include <znc/User.h>
 
 class CClientNotifyMod : public CModule {
 protected:
diff --git a/modules/crypt.cpp b/modules/crypt.cpp
index 9382f0b2..fdaac9b1 100644
--- a/modules/crypt.cpp
+++ b/modules/crypt.cpp
@@ -22,9 +22,9 @@
 //       It is strongly suggested that you enable SSL between znc and your client otherwise the encryption stops at znc and gets sent to your client in plain text.
 //
 
-#include "Chan.h"
-#include "User.h"
-#include "IRCNetwork.h"
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
 
 #define REQUIRESSL	1
 
diff --git a/modules/disconkick.cpp b/modules/disconkick.cpp
index 3c62e5bc..010cab8c 100644
--- a/modules/disconkick.cpp
+++ b/modules/disconkick.cpp
@@ -7,9 +7,9 @@
  */
 
 
-#include "Modules.h"
-#include "IRCNetwork.h"
-#include "Chan.h"
+#include <znc/Modules.h>
+#include <znc/IRCNetwork.h>
+#include <znc/Chan.h>
 
 class CKickClientOnIRCDisconnect: public CModule {
 public:
diff --git a/modules/extra/antiidle.cpp b/modules/extra/antiidle.cpp
index 7a37bb6d..9bdc8c65 100644
--- a/modules/extra/antiidle.cpp
+++ b/modules/extra/antiidle.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Nick.h"
-#include "IRCNetwork.h"
+#include <znc/Nick.h>
+#include <znc/IRCNetwork.h>
 
 class CAntiIdle;
 
diff --git a/modules/extra/autoaway.cpp b/modules/extra/autoaway.cpp
index 4c03e994..57a647a6 100644
--- a/modules/extra/autoaway.cpp
+++ b/modules/extra/autoaway.cpp
@@ -16,10 +16,10 @@
 
 #define REQUIRESSL
 
-#include "Client.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "FileUtils.h"
+#include <znc/Client.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/FileUtils.h>
 #include <sys/stat.h>
 
 #define CRYPT_VERIFICATION_TOKEN "::__:AWAY:__::"
diff --git a/modules/extra/autocycle.cpp b/modules/extra/autocycle.cpp
index a1a83811..d69a2e99 100644
--- a/modules/extra/autocycle.cpp
+++ b/modules/extra/autocycle.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "User.h"
-#include "IRCNetwork.h"
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
 
 class CAutoCycleMod : public CModule {
 public:
diff --git a/modules/extra/autovoice.cpp b/modules/extra/autovoice.cpp
index 06bf0d1b..9412263f 100644
--- a/modules/extra/autovoice.cpp
+++ b/modules/extra/autovoice.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "User.h"
+#include <znc/Chan.h>
+#include <znc/User.h>
 
 class CAutoVoiceUser {
 public:
diff --git a/modules/extra/block_motd.cpp b/modules/extra/block_motd.cpp
index 75e6f9ab..2960f8a2 100644
--- a/modules/extra/block_motd.cpp
+++ b/modules/extra/block_motd.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
+#include <znc/Modules.h>
 
 class CBlockMotd : public CModule {
 public:
diff --git a/modules/extra/charset.cpp b/modules/extra/charset.cpp
index 2599818c..60bdfc45 100644
--- a/modules/extra/charset.cpp
+++ b/modules/extra/charset.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
+#include <znc/Modules.h>
 #include <iconv.h>
 
 #ifndef ICONV_CONST
diff --git a/modules/extra/clearbufferonmsg.cpp b/modules/extra/clearbufferonmsg.cpp
index 84f74bd6..733ca767 100644
--- a/modules/extra/clearbufferonmsg.cpp
+++ b/modules/extra/clearbufferonmsg.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "IRCNetwork.h"
-#include "Chan.h"
-#include "Modules.h"
+#include <znc/IRCNetwork.h>
+#include <znc/Chan.h>
+#include <znc/Modules.h>
 
 class CClearBufferOnMsgMod : public CModule {
 public:
diff --git a/modules/extra/ctcpflood.cpp b/modules/extra/ctcpflood.cpp
index e0a0e5f9..48b04577 100644
--- a/modules/extra/ctcpflood.cpp
+++ b/modules/extra/ctcpflood.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "Chan.h"
+#include <znc/Modules.h>
+#include <znc/Chan.h>
 
 class CCtcpFloodMod : public CModule {
 public:
diff --git a/modules/extra/dcc.cpp b/modules/extra/dcc.cpp
index 4b8d7f3f..f3b30b35 100644
--- a/modules/extra/dcc.cpp
+++ b/modules/extra/dcc.cpp
@@ -6,11 +6,11 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "Chan.h"
-#include "User.h"
-#include "Modules.h"
-#include "FileUtils.h"
+#include <znc/znc.h>
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/Modules.h>
+#include <znc/FileUtils.h>
 
 class CDCCMod;
 
diff --git a/modules/extra/droproot.cpp b/modules/extra/droproot.cpp
index 7cbbf8d0..f6e17b97 100644
--- a/modules/extra/droproot.cpp
+++ b/modules/extra/droproot.cpp
@@ -13,8 +13,8 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "User.h"
+#include <znc/znc.h>
+#include <znc/User.h>
 #include <pwd.h>
 #include <grp.h>
 
diff --git a/modules/extra/email.cpp b/modules/extra/email.cpp
index 74152174..18269311 100644
--- a/modules/extra/email.cpp
+++ b/modules/extra/email.cpp
@@ -9,10 +9,10 @@
  * Author: imaginos <imaginos@imaginos.net>
  */
 
-#include "FileUtils.h"
-#include "MD5.h"
-#include "User.h"
-#include "znc.h"
+#include <znc/FileUtils.h>
+#include <znc/MD5.h>
+#include <znc/User.h>
+#include <znc/znc.h>
 #include <sstream>
 
 using std::stringstream;
diff --git a/modules/extra/fakeonline.cpp b/modules/extra/fakeonline.cpp
index 9d63c879..ec348dd3 100644
--- a/modules/extra/fakeonline.cpp
+++ b/modules/extra/fakeonline.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
 
 class CFOModule : public CModule {
 public:
diff --git a/modules/extra/flooddetach.cpp b/modules/extra/flooddetach.cpp
index 35f24f5c..72da6e0a 100644
--- a/modules/extra/flooddetach.cpp
+++ b/modules/extra/flooddetach.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "Modules.h"
-#include "User.h"
-#include "IRCNetwork.h"
+#include <znc/Chan.h>
+#include <znc/Modules.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
 
 class CFloodDetachMod : public CModule {
 public:
diff --git a/modules/extra/imapauth.cpp b/modules/extra/imapauth.cpp
index 4572e3c5..8d994d2e 100644
--- a/modules/extra/imapauth.cpp
+++ b/modules/extra/imapauth.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "znc.h"
+#include <znc/Modules.h>
+#include <znc/znc.h>
 
 using std::map;
 
diff --git a/modules/extra/listsockets.cpp b/modules/extra/listsockets.cpp
index 8d9bb49f..c45c8255 100644
--- a/modules/extra/listsockets.cpp
+++ b/modules/extra/listsockets.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "User.h"
-#include "znc.h"
+#include <znc/Modules.h>
+#include <znc/User.h>
+#include <znc/znc.h>
 #include <queue>
 
 class CSocketSorter {
diff --git a/modules/extra/motdfile.cpp b/modules/extra/motdfile.cpp
index 92b76444..985a02f6 100644
--- a/modules/extra/motdfile.cpp
+++ b/modules/extra/motdfile.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "Client.h"
-#include "FileUtils.h"
+#include <znc/Modules.h>
+#include <znc/Client.h>
+#include <znc/FileUtils.h>
 
 class CMotdFileMod : public CModule {
 public:
diff --git a/modules/extra/notify_connect.cpp b/modules/extra/notify_connect.cpp
index 87180faa..2143cdad 100644
--- a/modules/extra/notify_connect.cpp
+++ b/modules/extra/notify_connect.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "User.h"
+#include <znc/znc.h>
+#include <znc/User.h>
 
 class CNotifyConnectMod : public CModule {
 public:
diff --git a/modules/extra/saslauth.cpp b/modules/extra/saslauth.cpp
index 0b610a3c..7fedfc82 100644
--- a/modules/extra/saslauth.cpp
+++ b/modules/extra/saslauth.cpp
@@ -11,8 +11,8 @@
  * @brief SASL authentication module for znc.
  */
 
-#include "Modules.h"
-#include "znc.h"
+#include <znc/Modules.h>
+#include <znc/znc.h>
 #include <sasl/sasl.h>
 
 class CSASLAuthMod : public CModule {
diff --git a/modules/extra/send_raw.cpp b/modules/extra/send_raw.cpp
index e15f9ca8..921032a6 100644
--- a/modules/extra/send_raw.cpp
+++ b/modules/extra/send_raw.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
 
 class CSendRaw_Mod: public CModule {
 	void SendClient(const CString& sLine) {
diff --git a/modules/extra/shell.cpp b/modules/extra/shell.cpp
index 860b073e..5067ff12 100644
--- a/modules/extra/shell.cpp
+++ b/modules/extra/shell.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "FileUtils.h"
-#include "User.h"
-#include "znc.h"
-#include "ExecSock.h"
+#include <znc/FileUtils.h>
+#include <znc/User.h>
+#include <znc/znc.h>
+#include <znc/ExecSock.h>
 
 // Forward Declaration
 class CShellMod;
diff --git a/modules/fail2ban.cpp b/modules/fail2ban.cpp
index 80c579f9..4704a91f 100644
--- a/modules/fail2ban.cpp
+++ b/modules/fail2ban.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
+#include <znc/znc.h>
 
 class CFailToBanMod : public CModule {
 public:
diff --git a/modules/identfile.cpp b/modules/identfile.cpp
index 96091d73..ef47d9e6 100644
--- a/modules/identfile.cpp
+++ b/modules/identfile.cpp
@@ -6,11 +6,11 @@
  * by the Free Software Foundation.
  */
 
-#include "FileUtils.h"
-#include "IRCSock.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
+#include <znc/FileUtils.h>
+#include <znc/IRCSock.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
 
 class CIdentFileModule : public CModule {
 	CString m_sOrigISpoof;
diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp
index 6894f4a0..8c141491 100644
--- a/modules/keepnick.cpp
+++ b/modules/keepnick.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "IRCSock.h"
+#include <znc/Modules.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/IRCSock.h>
 
 class CKeepNickMod;
 
diff --git a/modules/kickrejoin.cpp b/modules/kickrejoin.cpp
index 20e980e1..467bb147 100644
--- a/modules/kickrejoin.cpp
+++ b/modules/kickrejoin.cpp
@@ -13,8 +13,8 @@
  *
  */
 
-#include "Chan.h"
-#include "IRCNetwork.h"
+#include <znc/Chan.h>
+#include <znc/IRCNetwork.h>
 
 class CRejoinJob: public CTimer {
 public:
diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp
index b88ccc96..1bc37c01 100644
--- a/modules/lastseen.cpp
+++ b/modules/lastseen.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
-#include "Chan.h"
-#include "znc.h"
+#include <znc/User.h>
+#include <znc/Chan.h>
+#include <znc/znc.h>
 
 using std::map;
 using std::pair;
diff --git a/modules/log.cpp b/modules/log.cpp
index af58d344..20065dde 100644
--- a/modules/log.cpp
+++ b/modules/log.cpp
@@ -7,11 +7,11 @@
  * by the Free Software Foundation.
  */
 
-#include "FileUtils.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "Chan.h"
-#include "Server.h"
+#include <znc/FileUtils.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/Chan.h>
+#include <znc/Server.h>
 
 class CLogMod: public CModule {
 public:
diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index 1e3122d9..e1a66fc3 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -6,13 +6,13 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "FileUtils.h"
-#include "IRCSock.h"
-#include "Modules.h"
-#include "Nick.h"
-#include "User.h"
-#include "znc.h"
+#include <znc/Chan.h>
+#include <znc/FileUtils.h>
+#include <znc/IRCSock.h>
+#include <znc/Modules.h>
+#include <znc/Nick.h>
+#include <znc/User.h>
+#include <znc/znc.h>
 
 #include "modperl/module.h"
 #include "modperl/swigperlrun.h"
diff --git a/modules/modperl/modperl.i b/modules/modperl/modperl.i
index a6604a10..6a7a30e4 100644
--- a/modules/modperl/modperl.i
+++ b/modules/modperl/modperl.i
@@ -14,31 +14,31 @@
 # undef Pause
 #endif
 #include <utility>
-#include "../Utils.h"
-#include "../Config.h"
-#include "../Socket.h"
-#include "../Modules.h"
-#include "../Nick.h"
-#include "../Chan.h"
-#include "../User.h"
-#include "../Client.h"
-#include "../IRCSock.h"
-#include "../Listener.h"
-#include "../HTTPSock.h"
-#include "../Template.h"
-#include "../WebModules.h"
-#include "../znc.h"
-#include "../Server.h"
-#include "../ZNCString.h"
-#include "../FileUtils.h"
-#include "../ZNCDebug.h"
-#include "../ExecSock.h"
+#include "../include/znc/Utils.h"
+#include "../include/znc/Config.h"
+#include "../include/znc/Socket.h"
+#include "../include/znc/Modules.h"
+#include "../include/znc/Nick.h"
+#include "../include/znc/Chan.h"
+#include "../include/znc/User.h"
+#include "../include/znc/Client.h"
+#include "../include/znc/IRCSock.h"
+#include "../include/znc/Listener.h"
+#include "../include/znc/HTTPSock.h"
+#include "../include/znc/Template.h"
+#include "../include/znc/WebModules.h"
+#include "../include/znc/znc.h"
+#include "../include/znc/Server.h"
+#include "../include/znc/ZNCString.h"
+#include "../include/znc/FileUtils.h"
+#include "../include/znc/ZNCDebug.h"
+#include "../include/znc/ExecSock.h"
 #include "modperl/module.h"
 #define stat struct stat
 %}
 
 %begin %{
-#include "zncconfig.h"
+#include "znc/zncconfig.h"
 %}
 
 %include <typemaps.i>
@@ -72,28 +72,28 @@ namespace std {
 
 #define u_short unsigned short
 #define u_int unsigned int
-#include "../ZNCString.h"
-%include "../defines.h"
-%include "../Utils.h"
-%include "../Config.h"
-%include "../Csocket.h"
+#include "../include/znc/ZNCString.h"
+%include "../include/znc/defines.h"
+%include "../include/znc/Utils.h"
+%include "../include/znc/Config.h"
+%include "../include/znc/Csocket.h"
 %template(ZNCSocketManager) TSocketManager<CZNCSock>;
-%include "../Socket.h"
-%include "../FileUtils.h"
-%include "../Modules.h"
-%include "../Nick.h"
-%include "../Chan.h"
-%include "../User.h"
-%include "../Client.h"
-%include "../IRCSock.h"
-%include "../Listener.h"
-%include "../HTTPSock.h"
-%include "../Template.h"
-%include "../WebModules.h"
-%include "../znc.h"
-%include "../Server.h"
-%include "../ZNCDebug.h"
-%include "../ExecSock.h"
+%include "../include/znc/Socket.h"
+%include "../include/znc/FileUtils.h"
+%include "../include/znc/Modules.h"
+%include "../include/znc/Nick.h"
+%include "../include/znc/Chan.h"
+%include "../include/znc/User.h"
+%include "../include/znc/Client.h"
+%include "../include/znc/IRCSock.h"
+%include "../include/znc/Listener.h"
+%include "../include/znc/HTTPSock.h"
+%include "../include/znc/Template.h"
+%include "../include/znc/WebModules.h"
+%include "../include/znc/znc.h"
+%include "../include/znc/Server.h"
+%include "../include/znc/ZNCDebug.h"
+%include "../include/znc/ExecSock.h"
 
 %include "modperl/module.h"
 
diff --git a/modules/modperl/module.h b/modules/modperl/module.h
index 027e533a..22c0ec37 100644
--- a/modules/modperl/module.h
+++ b/modules/modperl/module.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "Modules.h"
+#include <znc/Modules.h>
 
 #if HAVE_VISIBILITY
 #pragma GCC visibility push(default)
diff --git a/modules/modpython.cpp b/modules/modpython.cpp
index c19e9cd3..e86a966a 100644
--- a/modules/modpython.cpp
+++ b/modules/modpython.cpp
@@ -8,13 +8,13 @@
 
 #include <Python.h>
 
-#include "Chan.h"
-#include "FileUtils.h"
-#include "IRCSock.h"
-#include "Modules.h"
-#include "Nick.h"
-#include "User.h"
-#include "znc.h"
+#include <znc/Chan.h>
+#include <znc/FileUtils.h>
+#include <znc/IRCSock.h>
+#include <znc/Modules.h>
+#include <znc/Nick.h>
+#include <znc/User.h>
+#include <znc/znc.h>
 
 #include "modpython/swigpyrun.h"
 #include "modpython/module.h"
diff --git a/modules/modpython/modpython.i b/modules/modpython/modpython.i
index 80800fc8..2c4a8a12 100644
--- a/modules/modpython/modpython.i
+++ b/modules/modpython/modpython.i
@@ -8,26 +8,26 @@
 
 %module znc_core %{
 #include <utility>
-#include "../Utils.h"
-#include "../Config.h"
-#include "../Socket.h"
-#include "../Modules.h"
-#include "../Nick.h"
-#include "../Chan.h"
-#include "../User.h"
-#include "../IRCNetwork.h"
-#include "../Client.h"
-#include "../IRCSock.h"
-#include "../Listener.h"
-#include "../HTTPSock.h"
-#include "../Template.h"
-#include "../WebModules.h"
-#include "../znc.h"
-#include "../Server.h"
-#include "../ZNCString.h"
-#include "../FileUtils.h"
-#include "../ZNCDebug.h"
-#include "../ExecSock.h"
+#include "../include/znc/Utils.h"
+#include "../include/znc/Config.h"
+#include "../include/znc/Socket.h"
+#include "../include/znc/Modules.h"
+#include "../include/znc/Nick.h"
+#include "../include/znc/Chan.h"
+#include "../include/znc/User.h"
+#include "../include/znc/IRCNetwork.h"
+#include "../include/znc/Client.h"
+#include "../include/znc/IRCSock.h"
+#include "../include/znc/Listener.h"
+#include "../include/znc/HTTPSock.h"
+#include "../include/znc/Template.h"
+#include "../include/znc/WebModules.h"
+#include "../include/znc/znc.h"
+#include "../include/znc/Server.h"
+#include "../include/znc/ZNCString.h"
+#include "../include/znc/FileUtils.h"
+#include "../include/znc/ZNCDebug.h"
+#include "../include/znc/ExecSock.h"
 #include "modpython/module.h"
 
 #include "modpython/retstring.h"
@@ -37,7 +37,7 @@ using std::allocator;
 %}
 
 %begin %{
-#include "zncconfig.h"
+#include "znc/zncconfig.h"
 %}
 
 %include <pyabc.i>
@@ -86,29 +86,29 @@ namespace std {
 
 #define u_short unsigned short
 #define u_int unsigned int
-#include "../ZNCString.h"
-%include "../defines.h"
-%include "../Utils.h"
-%include "../Config.h"
-%include "../Csocket.h"
+#include "../include/znc/ZNCString.h"
+%include "../include/znc/defines.h"
+%include "../include/znc/Utils.h"
+%include "../include/znc/Config.h"
+%include "../include/znc/Csocket.h"
 %template(ZNCSocketManager) TSocketManager<CZNCSock>;
-%include "../Socket.h"
-%include "../FileUtils.h"
-%include "../Modules.h"
-%include "../Nick.h"
-%include "../Chan.h"
-%include "../User.h"
-%include "../IRCNetwork.h"
-%include "../Client.h"
-%include "../IRCSock.h"
-%include "../Listener.h"
-%include "../HTTPSock.h"
-%include "../Template.h"
-%include "../WebModules.h"
-%include "../znc.h"
-%include "../Server.h"
-%include "../ZNCDebug.h"
-%include "../ExecSock.h"
+%include "../include/znc/Socket.h"
+%include "../include/znc/FileUtils.h"
+%include "../include/znc/Modules.h"
+%include "../include/znc/Nick.h"
+%include "../include/znc/Chan.h"
+%include "../include/znc/User.h"
+%include "../include/znc/IRCNetwork.h"
+%include "../include/znc/Client.h"
+%include "../include/znc/IRCSock.h"
+%include "../include/znc/Listener.h"
+%include "../include/znc/HTTPSock.h"
+%include "../include/znc/Template.h"
+%include "../include/znc/WebModules.h"
+%include "../include/znc/znc.h"
+%include "../include/znc/Server.h"
+%include "../include/znc/ZNCDebug.h"
+%include "../include/znc/ExecSock.h"
 
 %include "modpython/module.h"
 
diff --git a/modules/modtcl.cpp b/modules/modtcl.cpp
index b33d8013..8c05eead 100644
--- a/modules/modtcl.cpp
+++ b/modules/modtcl.cpp
@@ -6,13 +6,13 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "IRCSock.h"
-#include "Modules.h"
-#include "Server.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
+#include <znc/Chan.h>
+#include <znc/IRCSock.h>
+#include <znc/Modules.h>
+#include <znc/Server.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
 
 #include <tcl.h>
 
diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp
index f2fc65bd..675aaeca 100644
--- a/modules/nickserv.cpp
+++ b/modules/nickserv.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
+#include <znc/User.h>
 
 class CNickServ : public CModule
 {
diff --git a/modules/notes.cpp b/modules/notes.cpp
index 37dd7983..85e41ca8 100644
--- a/modules/notes.cpp
+++ b/modules/notes.cpp
@@ -6,13 +6,13 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "HTTPSock.h"
-#include "Server.h"
-#include "Template.h"
-#include "User.h"
-#include "znc.h"
-#include "WebModules.h"
+#include <znc/Chan.h>
+#include <znc/HTTPSock.h>
+#include <znc/Server.h>
+#include <znc/Template.h>
+#include <znc/User.h>
+#include <znc/znc.h>
+#include <znc/WebModules.h>
 #include <sstream>
 
 using std::stringstream;
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index 56b1d472..c77fb94b 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
-#include "znc.h"
-#include "IRCNetwork.h"
+#include <znc/User.h>
+#include <znc/znc.h>
+#include <znc/IRCNetwork.h>
 
 // If you change these and it breaks, you get to keep the pieces
 #define CHAN_PREFIX_1   "~"
diff --git a/modules/perform.cpp b/modules/perform.cpp
index b928f6a7..6315d36f 100644
--- a/modules/perform.cpp
+++ b/modules/perform.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
-#include "IRCNetwork.h"
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
 #include <algorithm>
 
 class CPerform : public CModule {
diff --git a/modules/q.cpp b/modules/q.cpp
index fff68640..66c4e36d 100644
--- a/modules/q.cpp
+++ b/modules/q.cpp
@@ -6,12 +6,12 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "IRCSock.h"
-#include "Nick.h"
-#include "Chan.h"
+#include <znc/Modules.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/IRCSock.h>
+#include <znc/Nick.h>
+#include <znc/Chan.h>
 
 #ifndef Q_DEBUG_COMMUNICATION
 	#define Q_DEBUG_COMMUNICATION 0
diff --git a/modules/raw.cpp b/modules/raw.cpp
index 237c99ad..4772683f 100644
--- a/modules/raw.cpp
+++ b/modules/raw.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
+#include <znc/User.h>
 
 class CRawMod : public CModule {
 public:
diff --git a/modules/route_replies.cpp b/modules/route_replies.cpp
index 0f76e367..0b3fd40f 100644
--- a/modules/route_replies.cpp
+++ b/modules/route_replies.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "IRCNetwork.h"
-#include "IRCSock.h"
+#include <znc/znc.h>
+#include <znc/IRCNetwork.h>
+#include <znc/IRCSock.h>
 
 struct reply {
 	const char *szReply;
diff --git a/modules/sample.cpp b/modules/sample.cpp
index d213c276..48fa515b 100644
--- a/modules/sample.cpp
+++ b/modules/sample.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Client.h"
-#include "Chan.h"
-#include "User.h"
-#include "Modules.h"
+#include <znc/Client.h>
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/Modules.h>
 
 class CSampleTimer : public CTimer {
 public:
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index 9a5d5d2a..122949c2 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -14,10 +14,10 @@
 
 #define REQUIRESSL
 
-#include "Chan.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "FileUtils.h"
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/FileUtils.h>
 #include <sys/stat.h>
 
 #define CRYPT_VERIFICATION_TOKEN "::__:SAVEBUFF:__::"
diff --git a/modules/schat.cpp b/modules/schat.cpp
index c983abd3..61743ffc 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -11,10 +11,10 @@
 
 #define REQUIRESSL
 
-#include "FileUtils.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
+#include <znc/FileUtils.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
 #include <sstream>
 
 using std::pair;
diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp
index bf0ded7f..bb695c8f 100644
--- a/modules/simple_away.cpp
+++ b/modules/simple_away.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
+#include <znc/User.h>
 
 #define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %s"
 #define SIMPLE_AWAY_DEFAULT_TIME   60
diff --git a/modules/stickychan.cpp b/modules/stickychan.cpp
index 4b4c36d8..1c2a2645 100644
--- a/modules/stickychan.cpp
+++ b/modules/stickychan.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "IRCNetwork.h"
+#include <znc/Chan.h>
+#include <znc/IRCNetwork.h>
 
 class CStickyChan : public CModule
 {
diff --git a/modules/watch.cpp b/modules/watch.cpp
index 3a169b4c..f515ea92 100644
--- a/modules/watch.cpp
+++ b/modules/watch.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "User.h"
-#include "IRCNetwork.h"
+#include <znc/Chan.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
 #include <list>
 
 using std::list;
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 939b475d..c4cce0eb 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -6,16 +6,16 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "HTTPSock.h"
-#include "Server.h"
-#include "Template.h"
-#include "User.h"
-#include "znc.h"
-#include "WebModules.h"
-#include "ZNCString.h"
-#include "Listener.h"
-#include "IRCNetwork.h"
+#include <znc/Chan.h>
+#include <znc/HTTPSock.h>
+#include <znc/Server.h>
+#include <znc/Template.h>
+#include <znc/User.h>
+#include <znc/znc.h>
+#include <znc/WebModules.h>
+#include <znc/ZNCString.h>
+#include <znc/Listener.h>
+#include <znc/IRCNetwork.h>
 #include <sstream>
 #include <utility>
 
diff --git a/Buffer.cpp b/src/Buffer.cpp
similarity index 98%
rename from Buffer.cpp
rename to src/Buffer.cpp
index 0b55eb96..f50afe26 100644
--- a/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "Buffer.h"
+#include <znc/Buffer.h>
 
 CBufLine::CBufLine(const CString& sPre, const CString& sPost, bool bIncNick=true) {
 	m_sPre = sPre;
diff --git a/Chan.cpp b/src/Chan.cpp
similarity index 98%
rename from Chan.cpp
rename to src/Chan.cpp
index 550b467c..383e0f99 100644
--- a/Chan.cpp
+++ b/src/Chan.cpp
@@ -6,13 +6,13 @@
  * by the Free Software Foundation.
  */
 
-#include "Chan.h"
-#include "FileUtils.h"
-#include "IRCSock.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
-#include "Config.h"
+#include <znc/Chan.h>
+#include <znc/FileUtils.h>
+#include <znc/IRCSock.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
+#include <znc/Config.h>
 
 CChan::CChan(const CString& sName, CIRCNetwork* pNetwork, bool bInConfig, CConfig *pConfig) {
 	m_sName = sName.Token(0);
diff --git a/Client.cpp b/src/Client.cpp
similarity index 99%
rename from Client.cpp
rename to src/Client.cpp
index 1dcf4622..763e6805 100644
--- a/Client.cpp
+++ b/src/Client.cpp
@@ -6,14 +6,14 @@
  * by the Free Software Foundation.
  */
 
-#include "Client.h"
-#include "Chan.h"
-#include "FileUtils.h"
-#include "IRCSock.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
-#include "WebModules.h"
+#include <znc/Client.h>
+#include <znc/Chan.h>
+#include <znc/FileUtils.h>
+#include <znc/IRCSock.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
+#include <znc/WebModules.h>
 
 #define CALLMOD(MOD, CLIENT, USER, NETWORK, FUNC) {  \
 	CModule *pModule = NULL;  \
diff --git a/ClientCommand.cpp b/src/ClientCommand.cpp
similarity index 99%
rename from ClientCommand.cpp
rename to src/ClientCommand.cpp
index 41a9f917..3d7f8cb7 100644
--- a/ClientCommand.cpp
+++ b/src/ClientCommand.cpp
@@ -6,15 +6,15 @@
  * by the Free Software Foundation.
  */
 
-#include "Client.h"
-#include "Chan.h"
-#include "FileUtils.h"
-#include "IRCNetwork.h"
-#include "IRCSock.h"
-#include "Listener.h"
-#include "Server.h"
-#include "User.h"
-#include "znc.h"
+#include <znc/Client.h>
+#include <znc/Chan.h>
+#include <znc/FileUtils.h>
+#include <znc/IRCNetwork.h>
+#include <znc/IRCSock.h>
+#include <znc/Listener.h>
+#include <znc/Server.h>
+#include <znc/User.h>
+#include <znc/znc.h>
 
 void CClient::UserCommand(CString& sLine) {
 	if (!m_pUser) {
diff --git a/Config.cpp b/src/Config.cpp
similarity index 98%
rename from Config.cpp
rename to src/Config.cpp
index dfbc4520..7538b72b 100644
--- a/Config.cpp
+++ b/src/Config.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Config.h"
-#include "FileUtils.h"
+#include <znc/Config.h>
+#include <znc/FileUtils.h>
 #include <stack>
 #include <sstream>
 
diff --git a/Csocket.cpp b/src/Csocket.cpp
similarity index 99%
rename from Csocket.cpp
rename to src/Csocket.cpp
index 011c9796..901b05d1 100644
--- a/Csocket.cpp
+++ b/src/Csocket.cpp
@@ -30,7 +30,7 @@
 *
 */
 
-#include "Csocket.h"
+#include <znc/Csocket.h>
 #ifdef __NetBSD__
 #include <sys/param.h>
 #endif /* __NetBSD__ */
diff --git a/FileUtils.cpp b/src/FileUtils.cpp
similarity index 99%
rename from FileUtils.cpp
rename to src/FileUtils.cpp
index f4eaf735..02f56f8d 100644
--- a/FileUtils.cpp
+++ b/src/FileUtils.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "FileUtils.h"
-#include "ExecSock.h"
-#include "Utils.h"
-#include "ZNCDebug.h"
+#include <znc/FileUtils.h>
+#include <znc/ExecSock.h>
+#include <znc/Utils.h>
+#include <znc/ZNCDebug.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
diff --git a/HTTPSock.cpp b/src/HTTPSock.cpp
similarity index 99%
rename from HTTPSock.cpp
rename to src/HTTPSock.cpp
index 6cc7d2b5..79e017d6 100644
--- a/HTTPSock.cpp
+++ b/src/HTTPSock.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "HTTPSock.h"
-#include "FileUtils.h"
-#include "Modules.h"
-#include "znc.h"
+#include <znc/HTTPSock.h>
+#include <znc/FileUtils.h>
+#include <znc/Modules.h>
+#include <znc/znc.h>
 
 #include <sstream>
 #include <iomanip>
diff --git a/IRCNetwork.cpp b/src/IRCNetwork.cpp
similarity index 98%
rename from IRCNetwork.cpp
rename to src/IRCNetwork.cpp
index 66a000e9..0458feff 100644
--- a/IRCNetwork.cpp
+++ b/src/IRCNetwork.cpp
@@ -6,16 +6,16 @@
  * by the Free Software Foundation.
  */
 
-#include "IRCNetwork.h"
-#include "Modules.h"
-#include "User.h"
-#include "FileUtils.h"
-#include "Config.h"
-#include "Client.h"
-#include "IRCSock.h"
-#include "Server.h"
-#include "Chan.h"
-#include "znc.h"
+#include <znc/IRCNetwork.h>
+#include <znc/Modules.h>
+#include <znc/User.h>
+#include <znc/FileUtils.h>
+#include <znc/Config.h>
+#include <znc/Client.h>
+#include <znc/IRCSock.h>
+#include <znc/Server.h>
+#include <znc/Chan.h>
+#include <znc/znc.h>
 
 bool CIRCNetwork::IsValidNetwork(const CString& sNetwork) {
 	// ^[-\w]+$
diff --git a/IRCSock.cpp b/src/IRCSock.cpp
similarity index 99%
rename from IRCSock.cpp
rename to src/IRCSock.cpp
index 7867f6d6..ae09a973 100644
--- a/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -6,13 +6,13 @@
  * by the Free Software Foundation.
  */
 
-#include "IRCSock.h"
-#include "Chan.h"
-#include "Client.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "znc.h"
-#include "Server.h"
+#include <znc/IRCSock.h>
+#include <znc/Chan.h>
+#include <znc/Client.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/znc.h>
+#include <znc/Server.h>
 
 // These are used in OnGeneralCTCP()
 const time_t CIRCSock::m_uCTCPFloodTime = 5;
diff --git a/Listener.cpp b/src/Listener.cpp
similarity index 98%
rename from Listener.cpp
rename to src/Listener.cpp
index f1eed17d..287cf637 100644
--- a/Listener.cpp
+++ b/src/Listener.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "Listener.h"
-#include "znc.h"
+#include <znc/Listener.h>
+#include <znc/znc.h>
 
 CListener::~CListener() {
 	if (m_pListener)
diff --git a/MD5.cpp b/src/MD5.cpp
similarity index 99%
rename from MD5.cpp
rename to src/MD5.cpp
index 614963bf..a3e1c414 100644
--- a/MD5.cpp
+++ b/src/MD5.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "MD5.h"
+#include <znc/MD5.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/Modules.cpp b/src/Modules.cpp
similarity index 99%
rename from Modules.cpp
rename to src/Modules.cpp
index 33600418..cc545884 100644
--- a/Modules.cpp
+++ b/src/Modules.cpp
@@ -6,13 +6,13 @@
  * by the Free Software Foundation.
  */
 
-#include "Modules.h"
-#include "FileUtils.h"
-#include "Template.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "WebModules.h"
-#include "znc.h"
+#include <znc/Modules.h>
+#include <znc/FileUtils.h>
+#include <znc/Template.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/WebModules.h>
+#include <znc/znc.h>
 #include <dlfcn.h>
 
 #ifndef RTLD_LOCAL
diff --git a/Nick.cpp b/src/Nick.cpp
similarity index 97%
rename from Nick.cpp
rename to src/Nick.cpp
index fb69293d..edd3667b 100644
--- a/Nick.cpp
+++ b/src/Nick.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Nick.h"
-#include "Chan.h"
-#include "IRCSock.h"
-#include "IRCNetwork.h"
+#include <znc/Nick.h>
+#include <znc/Chan.h>
+#include <znc/IRCSock.h>
+#include <znc/IRCNetwork.h>
 
 CNick::CNick() {
 	Reset();
diff --git a/SHA256.cpp b/src/SHA256.cpp
similarity index 99%
rename from SHA256.cpp
rename to src/SHA256.cpp
index 3acd6164..925e819b 100644
--- a/SHA256.cpp
+++ b/src/SHA256.cpp
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#include "SHA256.h"
+#include <znc/SHA256.h>
 
 #include <string.h>
 
diff --git a/Server.cpp b/src/Server.cpp
similarity index 97%
rename from Server.cpp
rename to src/Server.cpp
index 7b15eec1..6df60a9a 100644
--- a/Server.cpp
+++ b/src/Server.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "Server.h"
+#include <znc/Server.h>
 
 CServer::CServer(const CString& sName, unsigned short uPort, const CString& sPass, bool bSSL) {
 	m_sName = sName;
diff --git a/Socket.cpp b/src/Socket.cpp
similarity index 97%
rename from Socket.cpp
rename to src/Socket.cpp
index 4c110b6b..bb7f161c 100644
--- a/Socket.cpp
+++ b/src/Socket.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Socket.h"
-#include "Modules.h"
-#include "User.h"
-#include "znc.h"
+#include <znc/Socket.h>
+#include <znc/Modules.h>
+#include <znc/User.h>
+#include <znc/znc.h>
 
 unsigned int CSockManager::GetAnonConnectionCount(const CString &sIP) const {
 	const_iterator it;
diff --git a/Template.cpp b/src/Template.cpp
similarity index 99%
rename from Template.cpp
rename to src/Template.cpp
index 17521f17..d38948bb 100644
--- a/Template.cpp
+++ b/src/Template.cpp
@@ -6,9 +6,9 @@
  * by the Free Software Foundation.
  */
 
-#include "Template.h"
-#include "FileUtils.h"
-#include "ZNCDebug.h"
+#include <znc/Template.h>
+#include <znc/FileUtils.h>
+#include <znc/ZNCDebug.h>
 #include <sstream>
 #include <algorithm>
 
diff --git a/User.cpp b/src/User.cpp
similarity index 99%
rename from User.cpp
rename to src/User.cpp
index 17a91706..92927909 100644
--- a/User.cpp
+++ b/src/User.cpp
@@ -6,14 +6,14 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
-#include "Chan.h"
-#include "Config.h"
-#include "FileUtils.h"
-#include "IRCNetwork.h"
-#include "IRCSock.h"
-#include "Server.h"
-#include "znc.h"
+#include <znc/User.h>
+#include <znc/Chan.h>
+#include <znc/Config.h>
+#include <znc/FileUtils.h>
+#include <znc/IRCNetwork.h>
+#include <znc/IRCSock.h>
+#include <znc/Server.h>
+#include <znc/znc.h>
 
 class CUserTimer : public CCron {
 public:
diff --git a/Utils.cpp b/src/Utils.cpp
similarity index 99%
rename from Utils.cpp
rename to src/Utils.cpp
index b0071fa5..70610c9c 100644
--- a/Utils.cpp
+++ b/src/Utils.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "Utils.h"
-#include "MD5.h"
-#include "main.h"
-#include "ZNCDebug.h"
+#include <znc/Utils.h>
+#include <znc/MD5.h>
+#include <znc/main.h>
+#include <znc/ZNCDebug.h>
 #include <errno.h>
 #ifdef HAVE_LIBSSL
 #include <openssl/ssl.h>
diff --git a/WebModules.cpp b/src/WebModules.cpp
similarity index 99%
rename from WebModules.cpp
rename to src/WebModules.cpp
index 60eb9aa1..b4670dfa 100644
--- a/WebModules.cpp
+++ b/src/WebModules.cpp
@@ -6,10 +6,10 @@
  * by the Free Software Foundation.
  */
 
-#include "WebModules.h"
-#include "FileUtils.h"
-#include "User.h"
-#include "znc.h"
+#include <znc/WebModules.h>
+#include <znc/FileUtils.h>
+#include <znc/User.h>
+#include <znc/znc.h>
 #include <sstream>
 
 /// @todo Do we want to make this a configure option?
diff --git a/ZNCDebug.cpp b/src/ZNCDebug.cpp
similarity index 93%
rename from ZNCDebug.cpp
rename to src/ZNCDebug.cpp
index 4586aec2..b609ec76 100644
--- a/ZNCDebug.cpp
+++ b/src/ZNCDebug.cpp
@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "ZNCDebug.h"
+#include <znc/ZNCDebug.h>
 
 bool CDebug::stdoutIsTTY = true;
 bool CDebug::debug =
diff --git a/ZNCString.cpp b/src/ZNCString.cpp
similarity index 99%
rename from ZNCString.cpp
rename to src/ZNCString.cpp
index a9d9eb24..c81ae180 100644
--- a/ZNCString.cpp
+++ b/src/ZNCString.cpp
@@ -6,11 +6,11 @@
  * by the Free Software Foundation.
  */
 
-#include "ZNCString.h"
-#include "FileUtils.h"
-#include "Utils.h"
-#include "MD5.h"
-#include "SHA256.h"
+#include <znc/ZNCString.h>
+#include <znc/FileUtils.h>
+#include <znc/Utils.h>
+#include <znc/MD5.h>
+#include <znc/SHA256.h>
 #include <sstream>
 
 using std::stringstream;
diff --git a/main.cpp b/src/main.cpp
similarity index 99%
rename from main.cpp
rename to src/main.cpp
index 17bbbd2f..ec9c04b8 100644
--- a/main.cpp
+++ b/src/main.cpp
@@ -6,8 +6,8 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "FileUtils.h"
+#include <znc/znc.h>
+#include <znc/FileUtils.h>
 #include <sys/wait.h>
 #include <signal.h>
 
diff --git a/znc.cpp b/src/znc.cpp
similarity index 99%
rename from znc.cpp
rename to src/znc.cpp
index 1e05c851..ff1a77a4 100644
--- a/znc.cpp
+++ b/src/znc.cpp
@@ -6,15 +6,15 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
-#include "Chan.h"
-#include "FileUtils.h"
-#include "IRCSock.h"
-#include "Server.h"
-#include "User.h"
-#include "IRCNetwork.h"
-#include "Listener.h"
-#include "Config.h"
+#include <znc/znc.h>
+#include <znc/Chan.h>
+#include <znc/FileUtils.h>
+#include <znc/IRCSock.h>
+#include <znc/Server.h>
+#include <znc/User.h>
+#include <znc/IRCNetwork.h>
+#include <znc/Listener.h>
+#include <znc/Config.h>
 #include <list>
 
 static inline CString FormatBindError() {
diff --git a/znc-config.in b/znc-config.in
index 9454e18d..bafd561e 100755
--- a/znc-config.in
+++ b/znc-config.in
@@ -7,7 +7,7 @@ bindir="@bindir@"
 datadir="@datadir@"
 
 CXX="@CXX@"
-CXXFLAGS="@CPPFLAGS@ @MODFLAGS@ -I@prefix@/include/znc"
+CXXFLAGS="@CPPFLAGS@ @MODFLAGS@ -I@prefix@/include"
 MODLINK="@MODLINK@"
 # LIBS="@LIBS@"
 # No libs needed, ZNC links against $LIBS and thus modules don't need to.