diff --git a/lib/MyHGC.cpp b/lib/MyHGC.cpp
index 6daa6be295..9a2a8a0629 100644
--- a/lib/MyHGC.cpp
+++ b/lib/MyHGC.cpp
@@ -1,5 +1,9 @@
 #include "MySQL_HostGroups_Manager.h"
 
+#ifdef TEST_AURORA
+static unsigned long long array_mysrvc_total = 0;
+static unsigned long long array_mysrvc_cands = 0;
+#endif // TEST_AURORA
 
 extern MySQL_Threads_Handler *GloMTH;
 
diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp
index 90bc415367..705a06515a 100644
--- a/lib/MySQL_HostGroups_Manager.cpp
+++ b/lib/MySQL_HostGroups_Manager.cpp
@@ -31,10 +31,6 @@
 
 using std::function;
 
-#ifdef TEST_AURORA
-static unsigned long long array_mysrvc_total = 0;
-static unsigned long long array_mysrvc_cands = 0;
-#endif // TEST_AURORA
 
 #define SAFE_SQLITE3_STEP(_stmt) do {\
   do {\
diff --git a/lib/MySrvC.cpp b/lib/MySrvC.cpp
index 94401e9016..572530d678 100644
--- a/lib/MySrvC.cpp
+++ b/lib/MySrvC.cpp
@@ -1,58 +1,4 @@
 #include "MySQL_HostGroups_Manager.h"
-/*
-#include "proxysql.h"
-#include "cpp.h"
-
-#include "MySQL_PreparedStatement.h"
-#include "MySQL_Data_Stream.h"
-
-#include <memory>
-#include <pthread.h>
-#include <string>
-
-#include <prometheus/counter.h>
-#include <prometheus/detail/builder.h>
-#include <prometheus/family.h>
-#include <prometheus/gauge.h>
-
-#include "prometheus_helpers.h"
-#include "proxysql_utils.h"
-
-#define char_malloc (char *)malloc
-#define itostr(__s, __i)  { __s=char_malloc(32); sprintf(__s, "%lld", __i); }
-
-#include "thread.h"
-#include "wqueue.h"
-
-#include "ev.h"
-
-#include <functional>
-#include <mutex>
-#include <type_traits>
-
-using std::function;
-
-#ifdef TEST_AURORA
-static unsigned long long array_mysrvc_total = 0;
-static unsigned long long array_mysrvc_cands = 0;
-#endif // TEST_AURORA
-
-#define SAFE_SQLITE3_STEP(_stmt) do {\
-  do {\
-    rc=(*proxy_sqlite3_step)(_stmt);\
-    if (rc!=SQLITE_DONE) {\
-      assert(rc==SQLITE_LOCKED);\
-      usleep(100);\
-    }\
-  } while (rc!=SQLITE_DONE);\
-} while (0)
-
-extern ProxySQL_Admin *GloAdmin;
-
-extern MySQL_Threads_Handler *GloMTH;
-
-extern MySQL_Monitor *GloMyMon;
-*/
 
 class MySrvConnList;
 class MySrvC;