Consolidate some header files.

23 files changed, 137 insertions, 350 deletions

diff --git a/modules/webcpanel/pages/chanserv/access.cpp b/modules/webcpanel/pages/chanserv/access.cpp
index c0403b0d7..f4fdccf1f 100644
--- a/modules/webcpanel/pages/chanserv/access.cpp
+++ b/modules/webcpanel/pages/chanserv/access.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "../../webcpanel.h"
-#include "utils.h"
 
 WebCPanel::ChanServ::Access::Access(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
diff --git a/modules/webcpanel/pages/chanserv/access.h b/modules/webcpanel/pages/chanserv/access.h
deleted file mode 100644
index e7ecef034..000000000
--- a/modules/webcpanel/pages/chanserv/access.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace ChanServ
-{
-
-class Access final
-	: public WebPanelProtectedPage
-{
-public:
-	Access(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-
-	std::set<Anope::string> GetData() override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/chanserv/akick.cpp b/modules/webcpanel/pages/chanserv/akick.cpp
index 182883eda..1c238b9ba 100644
--- a/modules/webcpanel/pages/chanserv/akick.cpp
+++ b/modules/webcpanel/pages/chanserv/akick.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "../../webcpanel.h"
-#include "utils.h"
 
 WebCPanel::ChanServ::Akick::Akick(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
diff --git a/modules/webcpanel/pages/chanserv/akick.h b/modules/webcpanel/pages/chanserv/akick.h
deleted file mode 100644
index 101110526..000000000
--- a/modules/webcpanel/pages/chanserv/akick.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace ChanServ
-{
-
-class Akick final
-	: public WebPanelProtectedPage
-{
-public:
-	Akick(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-
-	std::set<Anope::string> GetData() override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/chanserv/chanserv.h b/modules/webcpanel/pages/chanserv/chanserv.h
new file mode 100644
index 000000000..76fc30193
--- /dev/null
+++ b/modules/webcpanel/pages/chanserv/chanserv.h
@@ -0,0 +1,72 @@
+/*
+ * (C) 2003-2024 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
+
+namespace WebCPanel::ChanServ
+{
+	class Access;
+	class Akick;
+	class Drop;
+	class Info;
+	class Modes;
+	class Set;
+
+	extern void BuildChanList(NickAlias *, TemplateFileServer::Replacements &);
+}
+
+class WebCPanel::ChanServ::Access final
+	: public WebPanelProtectedPage
+{
+public:
+	Access(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	std::set<Anope::string> GetData() override;
+};
+
+class WebCPanel::ChanServ::Akick final
+	: public WebPanelProtectedPage
+{
+public:
+	Akick(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	std::set<Anope::string> GetData() override;
+};
+
+class WebCPanel::ChanServ::Drop final
+	: public WebPanelProtectedPage
+{
+public:
+	Drop(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+};
+
+class WebCPanel::ChanServ::Info final
+	: public WebPanelProtectedPage
+{
+public:
+	Info(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+};
+
+class WebCPanel::ChanServ::Modes final
+	: public WebPanelProtectedPage
+{
+public:
+	Modes(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	std::set<Anope::string> GetData() override;
+};
+
+class WebCPanel::ChanServ::Set final
+	: public WebPanelProtectedPage
+{
+public:
+	Set(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+	std::set<Anope::string> GetData() override;
+};
diff --git a/modules/webcpanel/pages/chanserv/drop.cpp b/modules/webcpanel/pages/chanserv/drop.cpp
index 039cb8ec2..743bc5d92 100644
--- a/modules/webcpanel/pages/chanserv/drop.cpp
+++ b/modules/webcpanel/pages/chanserv/drop.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "../../webcpanel.h"
-#include "utils.h"
 
 WebCPanel::ChanServ::Drop::Drop(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage (cat, u)
 {
diff --git a/modules/webcpanel/pages/chanserv/drop.h b/modules/webcpanel/pages/chanserv/drop.h
deleted file mode 100644
index 2ea06a142..000000000
--- a/modules/webcpanel/pages/chanserv/drop.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-	namespace ChanServ
-	{
-
-		class Drop final
-			: public WebPanelProtectedPage
-		{
-		public:
-			Drop(const Anope::string &cat, const Anope::string &u);
-
-			bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-
-		};
-
-	}
-
-}
diff --git a/modules/webcpanel/pages/chanserv/info.cpp b/modules/webcpanel/pages/chanserv/info.cpp
index b0f70b20e..a888e2c20 100644
--- a/modules/webcpanel/pages/chanserv/info.cpp
+++ b/modules/webcpanel/pages/chanserv/info.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "../../webcpanel.h"
-#include "utils.h"
 
 WebCPanel::ChanServ::Info::Info(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
diff --git a/modules/webcpanel/pages/chanserv/info.h b/modules/webcpanel/pages/chanserv/info.h
deleted file mode 100644
index 05b0b3327..000000000
--- a/modules/webcpanel/pages/chanserv/info.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace ChanServ
-{
-
-class Info final
-	: public WebPanelProtectedPage
-{
-public:
-	Info(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/chanserv/modes.cpp b/modules/webcpanel/pages/chanserv/modes.cpp
index 4e9a10614..b17cc2d09 100644
--- a/modules/webcpanel/pages/chanserv/modes.cpp
+++ b/modules/webcpanel/pages/chanserv/modes.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "../../webcpanel.h"
-#include "utils.h"
 
 WebCPanel::ChanServ::Modes::Modes(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
diff --git a/modules/webcpanel/pages/chanserv/modes.h b/modules/webcpanel/pages/chanserv/modes.h
deleted file mode 100644
index b2546b540..000000000
--- a/modules/webcpanel/pages/chanserv/modes.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace ChanServ
-{
-
-class Modes final
-	: public WebPanelProtectedPage
-{
-public:
-	Modes(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-
-	std::set<Anope::string> GetData() override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/chanserv/set.cpp b/modules/webcpanel/pages/chanserv/set.cpp
index 65f79700b..e08a61d3b 100644
--- a/modules/webcpanel/pages/chanserv/set.cpp
+++ b/modules/webcpanel/pages/chanserv/set.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "../../webcpanel.h"
-#include "utils.h"
 
 WebCPanel::ChanServ::Set::Set(const Anope::string &cat, const Anope::string &u) : WebPanelProtectedPage(cat, u)
 {
diff --git a/modules/webcpanel/pages/chanserv/set.h b/modules/webcpanel/pages/chanserv/set.h
deleted file mode 100644
index 1306499b7..000000000
--- a/modules/webcpanel/pages/chanserv/set.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace ChanServ
-{
-
-class Set final
-	: public WebPanelProtectedPage
-{
-public:
-	Set(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-
-	std::set<Anope::string> GetData() override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/chanserv/utils.h b/modules/webcpanel/pages/chanserv/utils.h
deleted file mode 100644
index badffcc4c..000000000
--- a/modules/webcpanel/pages/chanserv/utils.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace ChanServ
-{
-
-extern void BuildChanList(NickAlias *, TemplateFileServer::Replacements &);
-
-}
-
-}
diff --git a/modules/webcpanel/pages/hostserv/request.h b/modules/webcpanel/pages/hostserv/hostserv.h
index c76f0a448..8494fee14 100644
--- a/modules/webcpanel/pages/hostserv/request.h
+++ b/modules/webcpanel/pages/hostserv/hostserv.h
@@ -7,21 +7,15 @@
 
 #pragma once
 
-namespace WebCPanel
-{
-
-namespace HostServ
+namespace WebCPanel::HostServ
 {
+	class Request;
+}
 
-class Request final
+class WebCPanel::HostServ::Request final
 	: public WebPanelProtectedPage
 {
 public:
 	Request(const Anope::string &cat, const Anope::string &u);
-
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
 };
-
-}
-
-}
diff --git a/modules/webcpanel/pages/memoserv/memos.h b/modules/webcpanel/pages/memoserv/memoserv.h
index 98539337a..a3bd11d62 100644
--- a/modules/webcpanel/pages/memoserv/memos.h
+++ b/modules/webcpanel/pages/memoserv/memoserv.h
@@ -7,21 +7,15 @@
 
 #pragma once
 
-namespace WebCPanel
-{
-
-namespace MemoServ
+namespace WebCPanel::MemoServ
 {
+	class Memos;
+}
 
-class Memos final
+class WebCPanel::MemoServ::Memos final
 	: public WebPanelProtectedPage
 {
 public:
 	Memos(const Anope::string &cat, const Anope::string &u);
-
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
 };
-
-}
-
-}
diff --git a/modules/webcpanel/pages/nickserv/alist.h b/modules/webcpanel/pages/nickserv/alist.h
deleted file mode 100644
index 0880ea855..000000000
--- a/modules/webcpanel/pages/nickserv/alist.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace NickServ
-{
-
-class Alist final
-	: public WebPanelProtectedPage
-{
-public:
-	Alist(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/nickserv/cert.h b/modules/webcpanel/pages/nickserv/cert.h
deleted file mode 100644
index 2f07f6ef8..000000000
--- a/modules/webcpanel/pages/nickserv/cert.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace NickServ
-{
-
-class Cert final
-	: public WebPanelProtectedPage
-{
-public:
-	Cert(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/nickserv/confirm.h b/modules/webcpanel/pages/nickserv/confirm.h
deleted file mode 100644
index 82a64f5e2..000000000
--- a/modules/webcpanel/pages/nickserv/confirm.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-namespace WebCPanel
-{
-
-namespace NickServ
-{
-
-class Confirm final
-	: public WebPanelProtectedPage
-{
-public:
-	Confirm(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/nickserv/info.h b/modules/webcpanel/pages/nickserv/info.h
deleted file mode 100644
index 0e53b60d7..000000000
--- a/modules/webcpanel/pages/nickserv/info.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * (C) 2003-2024 Anope Team
- * Contact us at team@anope.org
- *
- * Please read COPYING and README for further details.
- */
-
-#pragma once
-
-namespace WebCPanel
-{
-
-namespace NickServ
-{
-
-class Info final
-	: public WebPanelProtectedPage
-{
-public:
-	Info(const Anope::string &cat, const Anope::string &u);
-
-	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
-};
-
-}
-
-}
diff --git a/modules/webcpanel/pages/nickserv/nickserv.h b/modules/webcpanel/pages/nickserv/nickserv.h
new file mode 100644
index 000000000..ef6a9924a
--- /dev/null
+++ b/modules/webcpanel/pages/nickserv/nickserv.h
@@ -0,0 +1,48 @@
+/*
+ * (C) 2003-2024 Anope Team
+ * Contact us at team@anope.org
+ *
+ * Please read COPYING and README for further details.
+ */
+
+#pragma once
+
+namespace WebCPanel::NickServ
+{
+	class Alist;
+	class Cert;
+	class Confirm;
+	class Info;
+}
+
+class WebCPanel::NickServ::Alist final
+	: public WebPanelProtectedPage
+{
+public:
+	Alist(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+};
+
+class WebCPanel::NickServ::Cert final
+	: public WebPanelProtectedPage
+{
+public:
+	Cert(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+};
+
+class WebCPanel::NickServ::Confirm final
+	: public WebPanelProtectedPage
+{
+public:
+	Confirm(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+};
+
+class WebCPanel::NickServ::Info final
+	: public WebPanelProtectedPage
+{
+public:
+	Info(const Anope::string &cat, const Anope::string &u);
+	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
+};
diff --git a/modules/webcpanel/pages/operserv/akill.h b/modules/webcpanel/pages/operserv/operserv.h
index cfa49c56a..28e6b3ec0 100644
--- a/modules/webcpanel/pages/operserv/akill.h
+++ b/modules/webcpanel/pages/operserv/operserv.h
@@ -7,21 +7,15 @@
 
 #pragma once
 
-namespace WebCPanel
-{
-
-namespace OperServ
+namespace WebCPanel::OperServ
 {
+	class Akill;
+}
 
-class Akill final
+class WebCPanel::OperServ::Akill final
 	: public WebPanelProtectedPage
 {
 public:
 	Akill(const Anope::string &cat, const Anope::string &u);
-
 	bool OnRequest(HTTPProvider *, const Anope::string &, HTTPClient *, HTTPMessage &, HTTPReply &, NickAlias *, TemplateFileServer::Replacements &) override;
 };
-
-}
-
-}
diff --git a/modules/webcpanel/webcpanel.h b/modules/webcpanel/webcpanel.h
index d83c12043..362b5e1ac 100644
--- a/modules/webcpanel/webcpanel.h
+++ b/modules/webcpanel/webcpanel.h
@@ -168,20 +168,8 @@ namespace WebPanel
 #include "pages/register.h"
 #include "pages/confirm.h"
 
-#include "pages/nickserv/info.h"
-#include "pages/nickserv/cert.h"
-#include "pages/nickserv/alist.h"
-#include "pages/nickserv/confirm.h"
-
-#include "pages/chanserv/info.h"
-#include "pages/chanserv/set.h"
-#include "pages/chanserv/access.h"
-#include "pages/chanserv/akick.h"
-#include "pages/chanserv/modes.h"
-#include "pages/chanserv/drop.h"
-
-#include "pages/memoserv/memos.h"
-
-#include "pages/hostserv/request.h"
-
-#include "pages/operserv/akill.h"
+#include "pages/chanserv/chanserv.h"
+#include "pages/hostserv/hostserv.h"
+#include "pages/memoserv/memoserv.h"
+#include "pages/nickserv/nickserv.h"
+#include "pages/operserv/operserv.h"