diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index 33b6625a..07fdb3cd 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -279,7 +279,7 @@ class CModPerl : public CModule {
     }
 };
 
-#include "modperl/functions.cpp"
+#include "modperl/perlfunctions.cpp"
 
 VWebSubPages& CPerlModule::GetSubPages() {
     VWebSubPages* result = _GetSubPages();
diff --git a/modules/modperl/Makefile.gen b/modules/modperl/Makefile.gen
index ad926a2a..3c6cb6e8 100644
--- a/modules/modperl/Makefile.gen
+++ b/modules/modperl/Makefile.gen
@@ -17,7 +17,7 @@ endif
 
 .SECONDARY:
 
-all: modperl/ZNC.cpp modperl/ZNC.pm modperl/functions.cpp modperl/swigperlrun.h
+all: modperl/ZNC.cpp modperl/ZNC.pm modperl/perlfunctions.cpp modperl/swigperlrun.h
 
 modperl/swigperlrun.h:
 	@mkdir -p modperl
@@ -26,11 +26,11 @@ modperl/swigperlrun.h:
 modperl/ZNC.cpp: modperl/modperl.i modperl/module.h modperl/CString.i
 	$(E) Generating ZNC API for Perl...
 	@mkdir -p modperl .depend
-	$(Q)$(SWIG) -perl5 -c++ -shadow -outdir modperl -I$(srcdir) -MD -MF .depend/modperl.swig.dep -w362,315,401,402 -o $@ $<
+	$(Q)$(SWIG) -perl5 -c++ -shadow -outdir modperl -I$(srcdir) -I$(srcdir)/../include -I../include -MD -MF .depend/modperl.swig.dep -w362,315,401,402 -o $@ $<
 
 modperl/ZNC.pm: modperl/ZNC.cpp
 
-modperl/functions.cpp: modperl/codegen.pl modperl/functions.in
+modperl/perlfunctions.cpp: modperl/codegen.pl modperl/functions.in
 	@mkdir -p modperl
 	$(Q)$(PERL) $^ $@
 
diff --git a/modules/modperl/Makefile.inc b/modules/modperl/Makefile.inc
index 303ef387..489db924 100644
--- a/modules/modperl/Makefile.inc
+++ b/modules/modperl/Makefile.inc
@@ -27,7 +27,7 @@ PERLHOOK     := modperl_install
 CLEAN    += modperl/ZNC.$(PERLCEXT_EXT) modperl/ZNC.o modperl/gen
 ifneq "$(SWIG)" ""
 # Only delete these files if we can regenerate them
-CLEAN    += modperl/ZNC.pm modperl/swigperlrun.h modperl/ZNC.cpp modperl/functions.cpp
+CLEAN    += modperl/ZNC.pm modperl/swigperlrun.h modperl/ZNC.cpp modperl/perlfunctions.cpp
 endif
 
 all: modperl_all
@@ -40,7 +40,7 @@ endif
 
 install: $(PERLHOOK)
 
-modperl_all: modperl/ZNC.$(PERLCEXT_EXT) modperl/swigperlrun.h modperl/functions.cpp
+modperl_all: modperl/ZNC.$(PERLCEXT_EXT) modperl/swigperlrun.h modperl/perlfunctions.cpp
 
 modperl/ZNC.$(PERLCEXT_EXT): modperl/ZNC.o Makefile modperl.so
 	$(E) Linking ZNC Perl bindings library...
@@ -56,7 +56,7 @@ ifneq "$(SWIG)" ""
 include $(srcdir)/modperl/Makefile.gen
 endif
 
-modperl.o: modperl/functions.cpp modperl/swigperlrun.h
+modperl.o: modperl/perlfunctions.cpp modperl/swigperlrun.h
 
 modperl_install: install_datadir modperl_all
 	for i in $(wildcard $(srcdir)/*.pm); do \
diff --git a/modules/modperl/modperl.i b/modules/modperl/modperl.i
index 960bbcff..2d18c6f4 100644
--- a/modules/modperl/modperl.i
+++ b/modules/modperl/modperl.i
@@ -25,28 +25,28 @@
 # undef seed
 #endif
 #include <utility>
-#include "../include/znc/Utils.h"
-#include "../include/znc/Threads.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 "../include/znc/Buffer.h"
+#include "znc/Utils.h"
+#include "znc/Threads.h"
+#include "znc/Config.h"
+#include "znc/Socket.h"
+#include "znc/Modules.h"
+#include "znc/Nick.h"
+#include "znc/Chan.h"
+#include "znc/User.h"
+#include "znc/IRCNetwork.h"
+#include "znc/Client.h"
+#include "znc/IRCSock.h"
+#include "znc/Listener.h"
+#include "znc/HTTPSock.h"
+#include "znc/Template.h"
+#include "znc/WebModules.h"
+#include "znc/znc.h"
+#include "znc/Server.h"
+#include "znc/ZNCString.h"
+#include "znc/FileUtils.h"
+#include "znc/ZNCDebug.h"
+#include "znc/ExecSock.h"
+#include "znc/Buffer.h"
 #include "modperl/module.h"
 #define stat struct stat
 %}
@@ -122,33 +122,33 @@ class MCString : public std::map<CString, CString> {};
 
 #define u_short unsigned short
 #define u_int unsigned int
-#include "../include/znc/zncconfig.h"
-#include "../include/znc/ZNCString.h"
-%include "../include/znc/defines.h"
-%include "../include/znc/Utils.h"
-%include "../include/znc/Threads.h"
-%include "../include/znc/Config.h"
-%include "../include/znc/Csocket.h"
+#include "znc/zncconfig.h"
+#include "znc/ZNCString.h"
+%include "znc/defines.h"
+%include "znc/Utils.h"
+%include "znc/Threads.h"
+%include "znc/Config.h"
+%include "znc/Csocket.h"
 %template(ZNCSocketManager) TSocketManager<CZNCSock>;
-%include "../include/znc/Socket.h"
-%include "../include/znc/FileUtils.h"
-%include "../include/znc/Message.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 "../include/znc/Buffer.h"
+%include "znc/Socket.h"
+%include "znc/FileUtils.h"
+%include "znc/Message.h"
+%include "znc/Modules.h"
+%include "znc/Nick.h"
+%include "znc/Chan.h"
+%include "znc/User.h"
+%include "znc/IRCNetwork.h"
+%include "znc/Client.h"
+%include "znc/IRCSock.h"
+%include "znc/Listener.h"
+%include "znc/HTTPSock.h"
+%include "znc/Template.h"
+%include "znc/WebModules.h"
+%include "znc/znc.h"
+%include "znc/Server.h"
+%include "znc/ZNCDebug.h"
+%include "znc/ExecSock.h"
+%include "znc/Buffer.h"
 
 %include "modperl/module.h"
 
diff --git a/modules/modpython.cpp b/modules/modpython.cpp
index 8df6ebc6..a63ed181 100644
--- a/modules/modpython.cpp
+++ b/modules/modpython.cpp
@@ -395,7 +395,7 @@ CString CPyModule::GetPyExceptionStr() {
     return m_pModPython->GetPyExceptionStr();
 }
 
-#include "modpython/functions.cpp"
+#include "modpython/pyfunctions.cpp"
 
 VWebSubPages& CPyModule::GetSubPages() {
     VWebSubPages* result = _GetSubPages();
diff --git a/modules/modpython/Makefile.gen b/modules/modpython/Makefile.gen
index 66091253..331ff029 100644
--- a/modules/modpython/Makefile.gen
+++ b/modules/modpython/Makefile.gen
@@ -17,7 +17,7 @@ endif
 
 .SECONDARY:
 
-all: modpython/_znc_core.cpp modpython/znc_core.py modpython/functions.cpp modpython/swigpyrun.h
+all: modpython/_znc_core.cpp modpython/znc_core.py modpython/pyfunctions.cpp modpython/swigpyrun.h
 
 modpython/swigpyrun.h:
 	@mkdir -p modpython
@@ -26,11 +26,11 @@ modpython/swigpyrun.h:
 modpython/_znc_core.cpp: modpython/modpython.i modpython/module.h modpython/cstring.i
 	$(E) Generating ZNC API for python...
 	@mkdir -p modpython .depend
-	$(Q)$(SWIG) -python -py3 -c++ -shadow -outdir modpython -I$(srcdir) -MD -MF .depend/modpython.swig.dep -w362,315,401 -o $@ $<
+	$(Q)$(SWIG) -python -py3 -c++ -shadow -outdir modpython -I$(srcdir) -I$(srcdir)/../include -I../include -MD -MF .depend/modpython.swig.dep -w362,315,401 -o $@ $<
 
 modpython/znc_core.py: modpython/_znc_core.cpp
 
-modpython/functions.cpp: modpython/codegen.pl modpython/functions.in
+modpython/pyfunctions.cpp: modpython/codegen.pl modpython/functions.in
 	@mkdir -p modpython
 	$(Q)$(PERL) $^ $@
 
diff --git a/modules/modpython/Makefile.inc b/modules/modpython/Makefile.inc
index e41758ea..6aa9e79e 100644
--- a/modules/modpython/Makefile.inc
+++ b/modules/modpython/Makefile.inc
@@ -24,7 +24,7 @@ CLEAN    += modpython/_znc_core.o modpython/compiler.o
 ifneq "$(SWIG)" ""
 # Only delete these files if we can regenerate them
 CLEAN    += modpython/_znc_core.cpp modpython/znc_core.py
-CLEAN    += modpython/swigpyrun.h modpython/functions.cpp
+CLEAN    += modpython/swigpyrun.h modpython/pyfunctions.cpp
 endif
 ifneq "$(srcdir)" "."
 # Copied from source for out-of-tree builds
@@ -58,7 +58,7 @@ ifneq "$(SWIG)" ""
 include $(srcdir)/modpython/Makefile.gen
 endif
 
-modpython.o: modpython/functions.cpp modpython/swigpyrun.h
+modpython.o: modpython/pyfunctions.cpp modpython/swigpyrun.h
 
 modpython/compiler.o: modpython/compiler.cpp Makefile
 	@mkdir -p modpython
diff --git a/modules/modpython/modpython.i b/modules/modpython/modpython.i
index 21997099..b93e7f26 100644
--- a/modules/modpython/modpython.i
+++ b/modules/modpython/modpython.i
@@ -18,28 +18,28 @@
 
 %{
 #include <utility>
-#include "../include/znc/Utils.h"
-#include "../include/znc/Threads.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 "../include/znc/Buffer.h"
+#include "znc/Utils.h"
+#include "znc/Threads.h"
+#include "znc/Config.h"
+#include "znc/Socket.h"
+#include "znc/Modules.h"
+#include "znc/Nick.h"
+#include "znc/Chan.h"
+#include "znc/User.h"
+#include "znc/IRCNetwork.h"
+#include "znc/Client.h"
+#include "znc/IRCSock.h"
+#include "znc/Listener.h"
+#include "znc/HTTPSock.h"
+#include "znc/Template.h"
+#include "znc/WebModules.h"
+#include "znc/znc.h"
+#include "znc/Server.h"
+#include "znc/ZNCString.h"
+#include "znc/FileUtils.h"
+#include "znc/ZNCDebug.h"
+#include "znc/ExecSock.h"
+#include "znc/Buffer.h"
 #include "modpython/module.h"
 
 #include "modpython/ret.h"
@@ -146,33 +146,33 @@ class MCString : public std::map<CString, CString> {};
 
 #define u_short unsigned short
 #define u_int unsigned int
-#include "../include/znc/zncconfig.h"
-#include "../include/znc/ZNCString.h"
-%include "../include/znc/defines.h"
-%include "../include/znc/Utils.h"
-%include "../include/znc/Threads.h"
-%include "../include/znc/Config.h"
-%include "../include/znc/Csocket.h"
+#include "znc/zncconfig.h"
+#include "znc/ZNCString.h"
+%include "znc/defines.h"
+%include "znc/Utils.h"
+%include "znc/Threads.h"
+%include "znc/Config.h"
+%include "znc/Csocket.h"
 %template(ZNCSocketManager) TSocketManager<CZNCSock>;
-%include "../include/znc/Socket.h"
-%include "../include/znc/FileUtils.h"
-%include "../include/znc/Message.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 "../include/znc/Buffer.h"
+%include "znc/Socket.h"
+%include "znc/FileUtils.h"
+%include "znc/Message.h"
+%include "znc/Modules.h"
+%include "znc/Nick.h"
+%include "znc/Chan.h"
+%include "znc/User.h"
+%include "znc/IRCNetwork.h"
+%include "znc/Client.h"
+%include "znc/IRCSock.h"
+%include "znc/Listener.h"
+%include "znc/HTTPSock.h"
+%include "znc/Template.h"
+%include "znc/WebModules.h"
+%include "znc/znc.h"
+%include "znc/Server.h"
+%include "znc/ZNCDebug.h"
+%include "znc/ExecSock.h"
+%include "znc/Buffer.h"
 
 %include "modpython/module.h"