Merge branch 'headers'

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 \

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 */])

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;

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>

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;

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;

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>

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

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>

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;
 

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;

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;

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;

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;
 

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>
 

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>
 

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

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:

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;
 

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;

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>
 

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>

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;

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;

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>

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

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

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;

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.

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 {

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>
 

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:

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;
 

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:

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;
 

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."
 

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;
 

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:

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:

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:

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:

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:

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
 

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:

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;
 

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:__::"

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:

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:

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:

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

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:

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:

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;
 

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>
 

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;

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:

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:

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;
 

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 {

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:

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:

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 {

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) {

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;

modules/fail2ban.cpp

@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "znc.h"
+#include <znc/znc.h>
 
 class CFailToBanMod : public CModule {
 public:

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;

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;
 

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:

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;

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:

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"

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"
 

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)

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"

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"
 

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>
 

modules/nickserv.cpp

@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
+#include <znc/User.h>
 
 class CNickServ : public CModule
 {

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;

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   "~"

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 {

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

modules/raw.cpp

@@ -6,7 +6,7 @@
  * by the Free Software Foundation.
  */
 
-#include "User.h"
+#include <znc/User.h>
 
 class CRawMod : public CModule {
 public:

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;

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:

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:__::"

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;

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

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
 {

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;

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>
 

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;

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);

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;  \

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) {

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>
 

src/Csocket.cpp

@@ -30,7 +30,7 @@
 *
 */
 
-#include "Csocket.h"
+#include <znc/Csocket.h>
 #ifdef __NetBSD__
 #include <sys/param.h>
 #endif /* __NetBSD__ */

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>

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>

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]+$

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;