4 files changed, 5 insertions, 15 deletions
diff --git a/src/modules/extra/m_opersha256.cpp b/src/modules/extra/m_opersha256.cpp
index 6437a1050..04d00f7b4 100644
--- a/src/modules/extra/m_opersha256.cpp
+++ b/src/modules/extra/m_opersha256.cpp
@@ -43,7 +43,7 @@ using namespace std;
 #include "modules.h"
 #include "helperfuncs.h"
 
-Server *Srv;
+static Server *Srv;
 
 #define SHA256_DIGEST_SIZE (256 / 8)
 #define SHA256_BLOCK_SIZE  (512 / 8)
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 36b9b8611..0f5fde5f3 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -37,10 +37,9 @@ using namespace std;
 
 /* $ModDesc: Allow/Deny connections based upon an arbitary SQL table */
 
-Server *Srv;
-
 class ModuleSQLAuth : public Module
 {
+	Server* Srv;
 	ConfigReader* Conf;
 	std::string usertable;
 	std::string userfield;
diff --git a/src/modules/extra/m_sqllog.cpp b/src/modules/extra/m_sqllog.cpp
index 8e7deac8b..48b846fee 100644
--- a/src/modules/extra/m_sqllog.cpp
+++ b/src/modules/extra/m_sqllog.cpp
@@ -34,21 +34,13 @@ using namespace std;
 #include "inspircd.h"
 #include "m_sql.h"
 
-#define LT_OPER		1
-#define LT_KILL		2
-#define LT_SERVLINK	3
-#define LT_XLINE	4
-#define LT_CONNECT	5
-#define LT_DISCONNECT	6
-#define LT_FLOOD	7
-#define LT_LOADMODULE	8
+enum LogTypes { LT_OPER = 1, LT_KILL, LT_SERVLINK, LT_XLINE, LT_CONNECT, LT_DISCONNECT, LT_FLOOD, LT_LOADMODULE };
 
 /* $ModDesc: Logs network-wide data to an SQL database */
 
-Server *Srv;
-
 class ModuleSQLLog : public Module
 {
+	Server* Srv;
 	ConfigReader* Conf;
 	unsigned long dbid;
 	Module* SQLModule;
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index b4b70961b..f1d54e70a 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -44,10 +44,9 @@ extern ServerConfig* Config;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 
-Server *Srv;
-
 class ModuleSQLOper : public Module
 {
+	Server* Srv;
 	ConfigReader* Conf;
 	unsigned long dbid;
 	Module* SQLModule;