Move to new include path

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3898 e03df62e-2008-0410-955e-edbf42e46eb7

38 files changed, 38 insertions, 42 deletions

diff --git a/src/cmd_kline.cpp b/src/cmd_kline.cpp
index d6805c4d5..718ae7620 100644
--- a/src/cmd_kline.cpp
+++ b/src/cmd_kline.cpp
@@ -29,7 +29,7 @@
 #include "commands.h"
 #include "xline.h"
 #include "helperfuncs.h"
-#include "cmd_kline.h"
+#include "commands/cmd_kline.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 388aead67..211c88d1f 100644
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -18,7 +18,7 @@
 #include "ctables.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_list.h"
+#include "commands/cmd_list.h"
 
 extern chan_hash chanlist;
 
diff --git a/src/cmd_loadmodule.cpp b/src/cmd_loadmodule.cpp
index 9ee3ab730..e06817624 100644
--- a/src/cmd_loadmodule.cpp
+++ b/src/cmd_loadmodule.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_loadmodule.h"
+#include "commands/cmd_loadmodule.h"
 
 extern InspIRCd* ServerInstance;
 
diff --git a/src/cmd_lusers.cpp b/src/cmd_lusers.cpp
index 8933efa04..0405145e2 100644
--- a/src/cmd_lusers.cpp
+++ b/src/cmd_lusers.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_lusers.h"
+#include "commands/cmd_lusers.h"
 
 void cmd_lusers::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_map.cpp b/src/cmd_map.cpp
index 07173eb2a..dcf598662 100644
--- a/src/cmd_map.cpp
+++ b/src/cmd_map.cpp
@@ -19,7 +19,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_map.h"
+#include "commands/cmd_map.h"
 
 extern ServerConfig* Config;
 
diff --git a/src/cmd_modules.cpp b/src/cmd_modules.cpp
index e4e208f7d..60ba1fa25 100644
--- a/src/cmd_modules.cpp
+++ b/src/cmd_modules.cpp
@@ -29,7 +29,7 @@
 #include "commands.h"
 #include "helperfuncs.h"
 #include "wildcard.h"
-#include "cmd_modules.h"
+#include "commands/cmd_modules.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_motd.cpp b/src/cmd_motd.cpp
index 7cd8f2c08..2efd8d55b 100644
--- a/src/cmd_motd.cpp
+++ b/src/cmd_motd.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_motd.h"
+#include "commands/cmd_motd.h"
 
 void cmd_motd::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_names.cpp b/src/cmd_names.cpp
index 817c892dc..7857449f2 100644
--- a/src/cmd_names.cpp
+++ b/src/cmd_names.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_names.h"
+#include "commands/cmd_names.h"
 
 extern InspIRCd* ServerInstance;
 
diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 16b3d2b94..432c2e814 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -27,7 +27,7 @@
 #include "dns.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "cmd_nick.h"
+#include "commands/cmd_nick.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_notice.cpp b/src/cmd_notice.cpp
index 6a9af4a40..228284a4a 100644
--- a/src/cmd_notice.cpp
+++ b/src/cmd_notice.cpp
@@ -27,7 +27,7 @@
 #include "commands.h"
 #include "helperfuncs.h"
 #include "hashcomp.h"
-#include "cmd_notice.h"
+#include "commands/cmd_notice.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
diff --git a/src/cmd_oper.cpp b/src/cmd_oper.cpp
index 718465e9f..a209c7e64 100644
--- a/src/cmd_oper.cpp
+++ b/src/cmd_oper.cpp
@@ -36,7 +36,7 @@
 #include "socketengine.h"
 
 #include "command_parse.h"
-#include "cmd_oper.h"
+#include "commands/cmd_oper.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index da38d6df6..70a5511eb 100644
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_part.h"
+#include "commands/cmd_part.h"
 
 extern InspIRCd* ServerInstance;
 
diff --git a/src/cmd_pass.cpp b/src/cmd_pass.cpp
index a11be799a..76d5f08cb 100644
--- a/src/cmd_pass.cpp
+++ b/src/cmd_pass.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_pass.h"
+#include "commands/cmd_pass.h"
 
 void cmd_pass::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_ping.cpp b/src/cmd_ping.cpp
index 2ac09e6c4..9721c0ca3 100644
--- a/src/cmd_ping.cpp
+++ b/src/cmd_ping.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_ping.h"
+#include "commands/cmd_ping.h"
 
 extern ServerConfig* Config;
 
diff --git a/src/cmd_pong.cpp b/src/cmd_pong.cpp
index f372591e4..cc708ee80 100644
--- a/src/cmd_pong.cpp
+++ b/src/cmd_pong.cpp
@@ -16,7 +16,7 @@
 
 #include "users.h"
 #include "commands.h"
-#include "cmd_pong.h"
+#include "commands/cmd_pong.h"
 
 void cmd_pong::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_privmsg.cpp b/src/cmd_privmsg.cpp
index 0814c08c4..53a9e82dd 100644
--- a/src/cmd_privmsg.cpp
+++ b/src/cmd_privmsg.cpp
@@ -24,7 +24,7 @@
 #include "wildcard.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_privmsg.h"
+#include "commands/cmd_privmsg.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
diff --git a/src/cmd_qline.cpp b/src/cmd_qline.cpp
index e86c23a09..36bd0a136 100644
--- a/src/cmd_qline.cpp
+++ b/src/cmd_qline.cpp
@@ -21,7 +21,7 @@
 #include "commands.h"
 #include "xline.h"
 #include "helperfuncs.h"
-#include "cmd_eline.h"
+#include "commands/cmd_qline.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index e3529278c..ff559ee7e 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -34,7 +34,7 @@
 #include "helperfuncs.h"
 #include "hashcomp.h"
 #include "socketengine.h"
-#include "cmd_quit.h"
+#include "commands/cmd_quit.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
diff --git a/src/cmd_rehash.cpp b/src/cmd_rehash.cpp
index 8c219ad90..5ea852ba8 100644
--- a/src/cmd_rehash.cpp
+++ b/src/cmd_rehash.cpp
@@ -20,7 +20,7 @@
 #include "modules.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_rehash.h"
+#include "commands/cmd_rehash.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_restart.cpp b/src/cmd_restart.cpp
index 01cf650db..80f607890 100644
--- a/src/cmd_restart.cpp
+++ b/src/cmd_restart.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_restart.h"
+#include "commands/cmd_restart.h"
 
 extern ServerConfig* Config;;
 
diff --git a/src/cmd_rules.cpp b/src/cmd_rules.cpp
index df972121d..4cb1e3c0b 100644
--- a/src/cmd_rules.cpp
+++ b/src/cmd_rules.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_rules.h"
+#include "commands/cmd_rules.h"
 
 void cmd_rules::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_server.cpp b/src/cmd_server.cpp
index 2a6058247..4ab00b52e 100644
--- a/src/cmd_server.cpp
+++ b/src/cmd_server.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_server.h"
+#include "commands/cmd_server.h"
 
 void cmd_server::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_squit.cpp b/src/cmd_squit.cpp
index cdfe23159..7b080a0ec 100644
--- a/src/cmd_squit.cpp
+++ b/src/cmd_squit.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_squit.h"
+#include "commands/cmd_squit.h"
 
 /*
  * This is handled by the server linking module, if necessary. Do not remove this stub.
diff --git a/src/cmd_stats.cpp b/src/cmd_stats.cpp
index c83974ec4..20c573f87 100644
--- a/src/cmd_stats.cpp
+++ b/src/cmd_stats.cpp
@@ -21,14 +21,10 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
 #ifndef RUSAGE_SELF
 #define   RUSAGE_SELF     0
 #define   RUSAGE_CHILDREN     -1
 #endif
-
 #include "users.h"
 #include "ctables.h"
 #include "globals.h"
@@ -45,7 +41,7 @@
 #include "hashcomp.h"
 #include "socketengine.h"
 #include "command_parse.h"
-#include "cmd_stats.h"
+#include "commands/cmd_stats.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
diff --git a/src/cmd_summon.cpp b/src/cmd_summon.cpp
index 004176b90..ff1659263 100644
--- a/src/cmd_summon.cpp
+++ b/src/cmd_summon.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_summon.h"
+#include "commands/cmd_summon.h"
 
 void cmd_summon::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_time.cpp b/src/cmd_time.cpp
index cabb260c6..3eaa99ec7 100644
--- a/src/cmd_time.cpp
+++ b/src/cmd_time.cpp
@@ -19,7 +19,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_time.h"
+#include "commands/cmd_time.h"
 
 extern ServerConfig* Config;
 extern time_t TIME;
diff --git a/src/cmd_topic.cpp b/src/cmd_topic.cpp
index b9051ea6f..8cad4e329 100644
--- a/src/cmd_topic.cpp
+++ b/src/cmd_topic.cpp
@@ -20,7 +20,7 @@
 #include "modules.h"
 #include "message.h"
 #include "commands.h"
-#include "cmd_topic.h"
+#include "commands/cmd_topic.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_trace.cpp b/src/cmd_trace.cpp
index 7d1aaedb5..1af42c2e6 100644
--- a/src/cmd_trace.cpp
+++ b/src/cmd_trace.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_trace.h"
+#include "commands/cmd_trace.h"
 
 extern user_hash clientlist;
 
diff --git a/src/cmd_unloadmodule.cpp b/src/cmd_unloadmodule.cpp
index f20aa81fb..35db537d0 100644
--- a/src/cmd_unloadmodule.cpp
+++ b/src/cmd_unloadmodule.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_unloadmodule.h"
+#include "commands/cmd_unloadmodule.h"
 
 extern InspIRCd* ServerInstance;
 
diff --git a/src/cmd_user.cpp b/src/cmd_user.cpp
index f606751d7..97466bce4 100644
--- a/src/cmd_user.cpp
+++ b/src/cmd_user.cpp
@@ -20,7 +20,7 @@
 #include "message.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_user.h"
+#include "commands/cmd_user.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;
diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index e365e6405..266d5369c 100644
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_userhost.h"
+#include "commands/cmd_userhost.h"
 
 void cmd_userhost::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_users.cpp b/src/cmd_users.cpp
index 2b2030491..8286a675f 100644
--- a/src/cmd_users.cpp
+++ b/src/cmd_users.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_users.h"
+#include "commands/cmd_users.h"
 
 void cmd_users::Handle (char **parameters, int pcnt, userrec *user)
 {
diff --git a/src/cmd_version.cpp b/src/cmd_version.cpp
index bdb8a8b23..5718f8e8a 100644
--- a/src/cmd_version.cpp
+++ b/src/cmd_version.cpp
@@ -19,7 +19,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_version.h"
+#include "commands/cmd_version.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
diff --git a/src/cmd_wallops.cpp b/src/cmd_wallops.cpp
index bad638815..f7d385341 100644
--- a/src/cmd_wallops.cpp
+++ b/src/cmd_wallops.cpp
@@ -18,7 +18,7 @@
 #include "modules.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_wallops.h"
+#include "commands/cmd_wallops.h"
 
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index 49c44765c..4697add4e 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -20,7 +20,7 @@
 #include "modules.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_who.h"
+#include "commands/cmd_who.h"
 
 extern ServerConfig* Config;
 extern user_hash clientlist;
diff --git a/src/cmd_whois.cpp b/src/cmd_whois.cpp
index 75e469f92..bb36f3d6d 100644
--- a/src/cmd_whois.cpp
+++ b/src/cmd_whois.cpp
@@ -21,7 +21,7 @@
 #include "modules.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_whois.h"
+#include "commands/cmd_whois.h"
 
 extern ServerConfig* Config;
 extern InspIRCd* ServerInstance;
diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index bb8866239..d584d51cb 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -19,7 +19,7 @@
 #include "users.h"
 #include "commands.h"
 #include "helperfuncs.h"
-#include "cmd_whowas.h"
+#include "commands/cmd_whowas.h"
 
 extern ServerConfig* Config;
 extern whowas_users whowas;
diff --git a/src/cmd_zline.cpp b/src/cmd_zline.cpp
index a040787ba..4932e5cad 100644
--- a/src/cmd_zline.cpp
+++ b/src/cmd_zline.cpp
@@ -22,7 +22,7 @@
 #include "commands.h"
 #include "xline.h"
 #include "helperfuncs.h"
-#include "cmd_eline.h"
+#include "commands/cmd_zline.h"
 
 extern ServerConfig* Config;
 extern int MODCOUNT;