Fix extras build

modules/extra/m_chanstats.cpp

@@ -1,5 +1,5 @@
 #include "module.h"
-#include "sql.h"
+#include "modules/sql.h"
 
 class MySQLInterface : public SQL::Interface
 {

modules/extra/m_httpd.cpp

@@ -6,8 +6,8 @@
  */
 
 #include "module.h"
-#include "httpd.h"
-#include "ssl.h"
+#include "modules/httpd.h"
+#include "modules/ssl.h"
 
 static Anope::string BuildDate()
 {

modules/extra/m_ldap.cpp

@@ -1,7 +1,7 @@
 /* RequiredLibraries: ldap,lber */
 
 #include "module.h"
-#include "ldapapi.h"
+#include "modules/ldap.h"
 #include <ldap.h>
 
 static Pipe *me;

modules/extra/m_ldap_authentication.cpp

@@ -1,6 +1,5 @@
 #include "module.h"
-#include "nickserv.h"
-#include "ldapapi.h"
+#include "modules/ldap.h"
 
 static Module *me;
 

modules/extra/m_ldap_oper.cpp

@@ -1,5 +1,5 @@
 #include "module.h"
-#include "ldapapi.h"
+#include "modules/ldap.h"
 
 static std::set<Oper *> my_opers;
 static Anope::string opertype_attribute;

modules/extra/m_mysql.cpp

@@ -1,9 +1,9 @@
 /* RequiredLibraries: mysqlclient */
 
 #include "module.h"
+#include "modules/sql.h"
 #define NO_CLIENT_LONG_LONG
 #include <mysql/mysql.h>
-#include "sql.h"
 
 using namespace SQL;
 

modules/extra/m_sql_authentication.cpp

@@ -1,8 +1,7 @@
 #include "module.h"
-#include "sql.h"
+#include "modules/sql.h"
 
 static Module *me;
-static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
 
 class SQLAuthenticationResult : public SQL::Interface
 {
@@ -43,7 +42,7 @@ class SQLAuthenticationResult : public SQL::Interface
 		{
 			na = new NickAlias(req->GetAccount(), new NickCore(req->GetAccount()));
 			FOREACH_MOD(I_OnNickRegister, OnNickRegister(user, na));
-			if (user && nickserv)
+			if (user && NickServ)
 				user->SendMessage(NickServ, _("Your account \002%s\002 has been successfully created."), na->nick.c_str());
 		}
 

modules/extra/m_sql_oper.cpp

@@ -1,5 +1,5 @@
 #include "module.h"
-#include "sql.h"
+#include "modules/sql.h"
 
 class SQLOperResult : public SQL::Interface
 {

modules/extra/m_sqlite.cpp

@@ -1,8 +1,8 @@
 /* RequiredLibraries: sqlite3 */
 
 #include "module.h"
+#include "modules/sql.h"
 #include <sqlite3.h>
-#include "sql.h"
 
 using namespace SQL;
 

modules/extra/m_ssl.cpp

@@ -1,7 +1,7 @@
 /* RequiredLibraries: ssl,crypto */
 
 #include "module.h"
-#include "ssl.h"
+#include "modules/ssl.h"
 
 #define OPENSSL_NO_SHA512
 #include <openssl/bio.h>

modules/extra/m_xmlrpc.cpp

@@ -1,7 +1,7 @@
 
 #include "module.h"
-#include "xmlrpc.h"
-#include "httpd.h"
+#include "modules/xmlrpc.h"
+#include "modules/httpd.h"
 
 class MyXMLRPCServiceInterface : public XMLRPCServiceInterface, public HTTPPage
 {

modules/extra/m_xmlrpc_main.cpp

@@ -1,5 +1,5 @@
 #include "module.h"
-#include "xmlrpc.h"
+#include "modules/xmlrpc.h"
 
 static Module *me;
 

modules/extra/webcpanel/pages/confirm.h

@@ -5,7 +5,7 @@
  * Please read COPYING and README for further details.
  */
 
-#include "../../httpd.h"
+#include "modules/httpd.h"
 
 namespace WebCPanel
 {

modules/extra/webcpanel/pages/index.h

@@ -5,7 +5,7 @@
  * Please read COPYING and README for further details.
  */
 
-#include "../../httpd.h"
+#include "modules/httpd.h"
 
 namespace WebCPanel
 {

modules/extra/webcpanel/pages/register.h

@@ -5,7 +5,7 @@
  * Please read COPYING and README for further details.
  */
 
-#include "../../httpd.h"
+#include "modules/httpd.h"
 
 namespace WebCPanel
 {

modules/extra/webcpanel/static_fileserver.h

@@ -5,7 +5,7 @@
  * Please read COPYING and README for further details.
  */
 
-#include "../httpd.h"
+#include "modules/httpd.h"
 
 /* A basic file server. Used for serving static content on disk. */
 class StaticFileServer : public HTTPPage

modules/extra/webcpanel/template_fileserver.h

@@ -5,7 +5,7 @@
  * Please read COPYING and README for further details.
  */
 
-#include "../httpd.h"
+#include "modules/httpd.h"
 
 /* A basic file server. Used for serving non-static non-binary content on disk. */
 class TemplateFileServer

modules/extra/webcpanel/webcpanel.h

@@ -6,7 +6,7 @@
  */
 
 #include "module.h"
-#include "../httpd.h"
+#include "modules/httpd.h"
 
 #include "static_fileserver.h"
 #include "template_fileserver.h"