5 files changed, 5 insertions, 5 deletions
diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp
index 157304b50..ef139e90a 100644
--- a/modules/core/cs_saset.cpp
+++ b/modules/core/cs_saset.cpp
@@ -15,7 +15,7 @@
 
 class CommandCSSASet : public Command
 {
-	typedef std::map<Anope::string, Command *, hash_compare_ci_string> subcommand_map;
+	typedef std::map<Anope::string, Command *, std::less<ci::string> > subcommand_map;
 	subcommand_map subcommands;
 
  public:
diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp
index b9acb2a53..219fbb3c1 100644
--- a/modules/core/cs_set.cpp
+++ b/modules/core/cs_set.cpp
@@ -15,7 +15,7 @@
 
 class CommandCSSet : public Command
 {
-	typedef std::map<Anope::string, Command *, hash_compare_ci_string> subcommand_map;
+	typedef std::map<Anope::string, Command *, std::less<ci::string> > subcommand_map;
 	subcommand_map subcommands;
 
  public:
diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp
index 081e1d466..624f25b7b 100644
--- a/modules/core/ns_saset.cpp
+++ b/modules/core/ns_saset.cpp
@@ -15,7 +15,7 @@
 
 class CommandNSSASet : public Command
 {
-	typedef std::map<Anope::string, Command *, hash_compare_ci_string> subcommand_map;
+	typedef std::map<Anope::string, Command *, std::less<ci::string> > subcommand_map;
 	subcommand_map subcommands;
 
  public:
diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp
index a55adefb4..f05e9ccdb 100644
--- a/modules/core/ns_set.cpp
+++ b/modules/core/ns_set.cpp
@@ -15,7 +15,7 @@
 
 class CommandNSSet : public Command
 {
-	typedef std::map<Anope::string, Command *, hash_compare_ci_string> subcommand_map;
+	typedef std::map<Anope::string, Command *, std::less<ci::string> > subcommand_map;
 	subcommand_map subcommands;
 
  public:
diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp
index 2f40e6912..5c5a649f0 100644
--- a/modules/extra/hs_request.cpp
+++ b/modules/extra/hs_request.cpp
@@ -66,7 +66,7 @@ struct HostRequest
 	time_t time;
 };
 
-typedef std::map<Anope::string, HostRequest *, hash_compare_ci_string> RequestMap;
+typedef std::map<Anope::string, HostRequest *, std::less<ci::string> > RequestMap;
 RequestMap Requests;
 
 static Module *me;