summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/extra/m_mysql.cpp3
-rw-r--r--src/modules/extra/m_pgsql.cpp4
-rw-r--r--src/modules/extra/m_sqlauth.cpp3
-rw-r--r--src/modules/extra/m_sqlite3.cpp3
-rw-r--r--src/modules/extra/m_sqllog.cpp4
-rw-r--r--src/modules/extra/m_sqloper.cpp5
-rw-r--r--src/modules/extra/m_sqlutils.cpp4
-rw-r--r--src/modules/extra/m_ssl_oper_cert.cpp4
-rw-r--r--src/modules/extra/m_sslinfo.cpp4
-rw-r--r--src/modules/extra/m_testclient.cpp4
-rw-r--r--src/modules/extra/m_ziplink.cpp6
-rw-r--r--src/modules/m_callerid.cpp19
-rw-r--r--src/modules/m_deaf.cpp3
-rw-r--r--src/modules/m_filter.cpp3
-rw-r--r--src/modules/m_ident.cpp3
-rw-r--r--src/modules/m_operflood.cpp3
-rw-r--r--src/modules/m_rpc_json.cpp3
-rw-r--r--src/modules/m_rpctest.cpp3
-rw-r--r--src/modules/m_servprotect.cpp6
19 files changed, 13 insertions, 74 deletions
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 0d579a382..a16180ca1 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -16,9 +16,6 @@
#include "inspircd.h"
#include <mysql.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "m_sqlv2.h"
#ifdef WINDOWS
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 2b8c218e8..4127ff249 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -15,10 +15,6 @@
#include <cstdlib>
#include <sstream>
#include <libpq-fe.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
#include "m_sqlv2.h"
/* $ModDesc: PostgreSQL Service Provider module for all other m_sql* modules, uses v2 of the SQL API */
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index ffaf6e605..efbc39825 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -12,9 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "m_sqlv2.h"
#include "m_sqlutils.h"
#include "m_hash.h"
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index d76bc97fe..d51bc1695 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -13,9 +13,6 @@
#include "inspircd.h"
#include <sqlite3.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "m_sqlv2.h"
/* $ModDesc: sqlite3 provider */
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 71a83e371..e57e40354 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -12,10 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
#include "m_sqlv2.h"
static Module* SQLModule;
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index a273e15c1..d937c4336 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -12,11 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
-
#include "m_sqlv2.h"
#include "m_sqlutils.h"
#include "m_hash.h"
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 30ac64cc7..b76b89366 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -14,10 +14,6 @@
#include "inspircd.h"
#include <sstream>
#include <list>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
#include "m_sqlutils.h"
/* $ModDesc: Provides some utilities to SQL client modules, such as mapping queries to users and channels */
diff --git a/src/modules/extra/m_ssl_oper_cert.cpp b/src/modules/extra/m_ssl_oper_cert.cpp
index 6746a4afa..967869d31 100644
--- a/src/modules/extra/m_ssl_oper_cert.cpp
+++ b/src/modules/extra/m_ssl_oper_cert.cpp
@@ -15,10 +15,6 @@
/* $ModDep: transport.h */
#include "inspircd.h"
-#include "inspircd_config.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "transport.h"
/** Handle /FINGERPRINT
diff --git a/src/modules/extra/m_sslinfo.cpp b/src/modules/extra/m_sslinfo.cpp
index 11912297d..42e6afed6 100644
--- a/src/modules/extra/m_sslinfo.cpp
+++ b/src/modules/extra/m_sslinfo.cpp
@@ -12,11 +12,7 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "transport.h"
-#include "dns.h"
/* $ModDesc: Provides /sslinfo command used to test who a mask matches */
/* $ModDep: transport.h */
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index 8a6cf876f..c5c07efc0 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -12,10 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
#include "m_sqlv2.h"
class ModuleTestClient : public Module
diff --git a/src/modules/extra/m_ziplink.cpp b/src/modules/extra/m_ziplink.cpp
index bbc792874..7e1ce8419 100644
--- a/src/modules/extra/m_ziplink.cpp
+++ b/src/modules/extra/m_ziplink.cpp
@@ -13,13 +13,7 @@
#include "inspircd.h"
#include <zlib.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "socket.h"
-#include "hashcomp.h"
#include "transport.h"
-
#include <iostream>
/* $ModDesc: Provides zlib link support for servers */
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 9eb7ff37d..623f838e3 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -1,12 +1,19 @@
-#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+#include "inspircd.h"
#include <set>
-
#include <sstream>
-
#include <algorithm>
/* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */
diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 32cfac50a..a28a75e59 100644
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -12,9 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides support for ircu style usermode +d (deaf to channel messages and channel notices) */
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 1c9231738..3521f6687 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -12,9 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "xline.h"
#include "m_regex.h"
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index ba766319e..b715f437c 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -12,9 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides support for RFC1413 ident lookups */
diff --git a/src/modules/m_operflood.cpp b/src/modules/m_operflood.cpp
index 4b5d5a673..d7c651c06 100644
--- a/src/modules/m_operflood.cpp
+++ b/src/modules/m_operflood.cpp
@@ -12,9 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Removes flood limits from users upon opering up. */
class ModuleOperFlood : public Module
diff --git a/src/modules/m_rpc_json.cpp b/src/modules/m_rpc_json.cpp
index ede3a34c2..32f7c2ead 100644
--- a/src/modules/m_rpc_json.cpp
+++ b/src/modules/m_rpc_json.cpp
@@ -12,9 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "httpd.h"
#include "rpc.h"
#include <exception>
diff --git a/src/modules/m_rpctest.cpp b/src/modules/m_rpctest.cpp
index 283325a6b..3c76d4751 100644
--- a/src/modules/m_rpctest.cpp
+++ b/src/modules/m_rpctest.cpp
@@ -12,9 +12,6 @@
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "rpc.h"
/* $ModDesc: A test of the RPC API */
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index b35573bf3..76df67563 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -12,12 +12,6 @@
*/
#include "inspircd.h"
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "configreader.h"
/* $ModDesc: Provides support for Austhex style +k / UnrealIRCD +S services mode */