diff --git a/log_manager/log_manager.h b/log_manager/log_manager.h
index 1abfbeb1b..2b838dc13 100644
--- a/log_manager/log_manager.h
+++ b/log_manager/log_manager.h
@@ -136,6 +136,10 @@ enum log_flush
 
 EXTERN_C_BLOCK_BEGIN
 
+extern int lm_enabled_logfiles_bitmask;
+extern ssize_t log_ses_count[];
+extern __thread log_info_t tls_log_info;
+
 bool skygw_logmanager_init(int argc, char* argv[]);
 void skygw_logmanager_done(void);
 void skygw_logmanager_exit(void);
diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index 10ced0a5e..25220cb61 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -61,10 +61,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 #define QTYPE_LESS_RESTRICTIVE_THAN_WRITE(t) (t<QUERY_TYPE_WRITE ? true : false)
 
 static THD* get_or_create_thd_for_parsing(MYSQL* mysql, char* query_str);
diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 81df4bf4f..9a344f0b2 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -30,10 +30,6 @@
 #include <log_manager.h>
 #include <gwdirs.h>
 #include <sys/stat.h>
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
 
 /**
  * @file adminusers.c - Administration user account management
diff --git a/server/core/buffer.c b/server/core/buffer.c
index 8de0f6851..dca4ffb69 100644
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@@ -47,11 +47,6 @@
 #include <log_manager.h>
 #include <errno.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static buffer_object_t* gwbuf_remove_buffer_object(
         GWBUF*           buf,
         buffer_object_t* bufobj);
diff --git a/server/core/config.c b/server/core/config.c
index eb5ed0109..8e152cd41 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -82,11 +82,6 @@
 /** According to the PCRE manual, this should be a multiple of 3 */
 #define MAXSCALE_PCRE_BUFSZ 24
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 extern int setipaddress(struct in_addr *, char *);
 static	int	process_config_context(CONFIG_CONTEXT	*);
 static	int	process_config_update(CONFIG_CONTEXT *);
diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 721f9c4ab..2dc434329 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -105,10 +105,6 @@
 #define ERROR_NO_SHOW_DATABASES "%s: Unable to load database grant information, \
     MaxScale authentication will proceed without including database permissions. \
     To correct this GRANT SHOW DATABASES ON *.* privilege to the user %s."
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
 
 static int getUsers(SERVICE *service, USERS *users);
 static int uh_cmpfun( void* v1, void* v2);
diff --git a/server/core/dcb.c b/server/core/dcb.c
index 19d95a177..f45f682f1 100644
--- a/server/core/dcb.c
+++ b/server/core/dcb.c
@@ -82,11 +82,6 @@
 
 #define SSL_ERRBUF_LEN 140
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static	DCB		*allDCBs = NULL;	/* Diagnostics need a list of DCBs */
 static	DCB		*zombies = NULL;
 static	SPINLOCK	dcbspin = SPINLOCK_INIT;
diff --git a/server/core/externcmd.c b/server/core/externcmd.c
index d58b06351..8e8735ac3 100644
--- a/server/core/externcmd.c
+++ b/server/core/externcmd.c
@@ -1,10 +1,5 @@
 #include <externcmd.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * Tokenize a string into arguments suitable for a execvp call.
  * @param args Argument string
diff --git a/server/core/filter.c b/server/core/filter.c
index b8b1d3902..0afeda131 100644
--- a/server/core/filter.c
+++ b/server/core/filter.c
@@ -38,11 +38,6 @@
 #include <skygw_utils.h>
 #include <log_manager.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static SPINLOCK	filter_spin = SPINLOCK_INIT;	/**< Protects the list of all filters */
 static FILTER_DEF *allFilters = NULL;		/**< The list of all filters */
 
diff --git a/server/core/gateway.c b/server/core/gateway.c
index 62f5afabc..4cd3aa869 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -101,16 +101,6 @@ time_t  MaxScaleStarted;
 extern char *program_invocation_name;
 extern char *program_invocation_short_name;
 
-/**
- * Variable holding the enabled logfiles information.
- * Used from log users to check enabled logs prior calling
- * actual library calls such as skygw_log_write.
- */
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /*
  * Server options are passed to the mysql_server_init. Each gateway must have a unique
  * data directory that is passed to the mysql_server_init, therefore the data directory
diff --git a/server/core/gw_utils.c b/server/core/gw_utils.c
index 043a4d645..2950cdc15 100644
--- a/server/core/gw_utils.c
+++ b/server/core/gw_utils.c
@@ -48,11 +48,6 @@
 
 SPINLOCK tmplock = SPINLOCK_INIT;
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /*
  * Set IP address in socket structure in_addr
  *
@@ -245,4 +240,4 @@ long get_processor_count()
 #error _SC_NPROCESSORS_ONLN not available.
 #endif
     return processors;
-}
\ No newline at end of file
+}
diff --git a/server/core/load_utils.c b/server/core/load_utils.c
index 7ff97bfa7..50d543261 100644
--- a/server/core/load_utils.c
+++ b/server/core/load_utils.c
@@ -51,11 +51,6 @@
 #include        <gw.h>
 #include        <gwdirs.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static	MODULES	*registered = NULL;
 
 static MODULES *find_module(const char *module);
diff --git a/server/core/modutil.c b/server/core/modutil.c
index fdf4d4f73..b7c8c467d 100644
--- a/server/core/modutil.c
+++ b/server/core/modutil.c
@@ -33,11 +33,6 @@
 #include <mysql_client_server_protocol.h>
 #include <modutil.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /** These are used when converting MySQL wildcards to regular expressions */
 static SPINLOCK re_lock = SPINLOCK_INIT;
 static bool pattern_init = false;
diff --git a/server/core/monitor.c b/server/core/monitor.c
index ef782ed47..f55b78e0c 100644
--- a/server/core/monitor.c
+++ b/server/core/monitor.c
@@ -43,11 +43,6 @@
 #include <secrets.h>
 #include <mysql/mysqld_error.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static MONITOR	*allMonitors = NULL;
 static SPINLOCK	monLock = SPINLOCK_INIT;
 
@@ -526,4 +521,4 @@ bool check_monitor_permissions(MONITOR* monitor)
     mysql_close(mysql);
     free(dpasswd);
     return rval;
-}
\ No newline at end of file
+}
diff --git a/server/core/poll.c b/server/core/poll.c
index 906682d22..8b6e455ff 100644
--- a/server/core/poll.c
+++ b/server/core/poll.c
@@ -46,11 +46,6 @@ extern unsigned long hkheartbeat;
 MEMLOG	*plog;
 #endif
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 int	number_poll_spins;
 int	max_poll_sleep;
 
diff --git a/server/core/secrets.c b/server/core/secrets.c
index fd4f42ac5..b92398acf 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -24,10 +24,6 @@
 #include <mysql_client_server_protocol.h>
 #include <gwdirs.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
 /**
  * Generate a random printable character
  *
diff --git a/server/core/server.c b/server/core/server.c
index 34875fe91..919b5bcbe 100644
--- a/server/core/server.c
+++ b/server/core/server.c
@@ -48,11 +48,6 @@
 #include <skygw_utils.h>
 #include <log_manager.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static SPINLOCK	server_spin = SPINLOCK_INIT;
 static SERVER	*allServers = NULL;
 
diff --git a/server/core/service.c b/server/core/service.c
index 4ee1394eb..b77043888 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -66,11 +66,6 @@
 #include <gwdirs.h>
 #include <math.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static RSA *rsa_512 = NULL;
 static RSA *rsa_1024 = NULL;
 
diff --git a/server/core/session.c b/server/core/session.c
index 32c7148e5..f3a7375f6 100644
--- a/server/core/session.c
+++ b/server/core/session.c
@@ -45,11 +45,6 @@
 #include <log_manager.h>
 #include <housekeeper.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /** Global session id; updated safely by holding session_spin */
 static size_t session_id;
 
diff --git a/server/core/utils.c b/server/core/utils.c
index 8b8f4d55f..c5c60a773 100644
--- a/server/core/utils.c
+++ b/server/core/utils.c
@@ -44,11 +44,6 @@
 #include <log_manager.h>
 #include <secrets.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /* used in the hex2bin function */
 #define char_val(X) (X >= '0' && X <= '9' ? X-'0' :\
                      X >= 'A' && X <= 'Z' ? X-'A'+10 :\
diff --git a/server/modules/filter/hint/hintparser.c b/server/modules/filter/hint/hintparser.c
index abf2fb141..6556b2a99 100644
--- a/server/modules/filter/hint/hintparser.c
+++ b/server/modules/filter/hint/hintparser.c
@@ -25,11 +25,6 @@
 #include <modutil.h>
 #include <mysqlhint.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * hintparser.c - Find any comment in the SQL packet and look for MAXSCALE
  * hints in that comment.
diff --git a/server/modules/filter/namedserverfilter.c b/server/modules/filter/namedserverfilter.c
index 822b5eaf2..f478e05d2 100644
--- a/server/modules/filter/namedserverfilter.c
+++ b/server/modules/filter/namedserverfilter.c
@@ -25,11 +25,6 @@
 #include <regex.h>
 #include <hint.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * @file namedserverfilter.c - a very simple regular expression based filter
  * that routes to a named server if a regular expression match is found.
diff --git a/server/modules/filter/qlafilter.c b/server/modules/filter/qlafilter.c
index e03dabf98..94ccdefca 100644
--- a/server/modules/filter/qlafilter.c
+++ b/server/modules/filter/qlafilter.c
@@ -52,11 +52,6 @@
 #include <string.h>
 #include <atomic.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
 	MODULE_GA,
diff --git a/server/modules/filter/regexfilter.c b/server/modules/filter/regexfilter.c
index c424ec666..732675336 100644
--- a/server/modules/filter/regexfilter.c
+++ b/server/modules/filter/regexfilter.c
@@ -27,11 +27,6 @@
 #include <atomic.h>
 #include "maxconfig.h"
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * @file regexfilter.c - a very simple regular expression rewrite filter.
  * @verbatim
diff --git a/server/modules/filter/slavelag.c b/server/modules/filter/slavelag.c
index eb6b9536d..1e9bbaaa2 100644
--- a/server/modules/filter/slavelag.c
+++ b/server/modules/filter/slavelag.c
@@ -26,11 +26,6 @@
 #include <query_classifier.h>
 #include <regex.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * @file slavelag.c - a very simple filter designed to send queries to the 
  * master server after data modification has occurred. This is done to prevent
diff --git a/server/modules/filter/tee.c b/server/modules/filter/tee.c
index 1557166f9..3906367a9 100644
--- a/server/modules/filter/tee.c
+++ b/server/modules/filter/tee.c
@@ -96,11 +96,6 @@ static unsigned char required_packets[] = {
 	MYSQL_COM_CONNECT,
 	0 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
 	MODULE_GA,
@@ -1400,4 +1395,4 @@ int reset_session_state(TEE_SESSION* my_session, GWBUF* buffer)
         my_session->command = command;
 
 	return 1;
-}
\ No newline at end of file
+}
diff --git a/server/modules/filter/topfilter.c b/server/modules/filter/topfilter.c
index 38eab05c6..a8089b830 100644
--- a/server/modules/filter/topfilter.c
+++ b/server/modules/filter/topfilter.c
@@ -49,11 +49,6 @@
 #include <regex.h>
 #include <atomic.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 MODULE_INFO 	info = {
 	MODULE_API_FILTER,
 	MODULE_GA,
diff --git a/server/modules/monitor/galeramon.c b/server/modules/monitor/galeramon.c
index 8e7e7e24b..4b78f30e2 100644
--- a/server/modules/monitor/galeramon.c
+++ b/server/modules/monitor/galeramon.c
@@ -42,11 +42,6 @@
 
 #include <galeramon.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static	void	monitorMain(void *);
 
 static char *version_str = "V2.0.0";
@@ -770,4 +765,4 @@ bool isGaleraEvent(monitor_event_t event)
 	    return true;
     }
     return false;
-}
\ No newline at end of file
+}
diff --git a/server/modules/monitor/mmmon.c b/server/modules/monitor/mmmon.c
index 3bbb3c588..9abccf153 100644
--- a/server/modules/monitor/mmmon.c
+++ b/server/modules/monitor/mmmon.c
@@ -32,11 +32,6 @@
 
 #include <mmmon.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static	void	monitorMain(void *);
 
 static char *version_str = "V1.1.1";
@@ -753,4 +748,4 @@ bool isMySQLEvent(monitor_event_t event)
 	    return true;
     }
     return false;
-}
\ No newline at end of file
+}
diff --git a/server/modules/monitor/mysql_mon.c b/server/modules/monitor/mysql_mon.c
index fccd8b767..6a817c505 100644
--- a/server/modules/monitor/mysql_mon.c
+++ b/server/modules/monitor/mysql_mon.c
@@ -54,11 +54,6 @@
 #include <mysqlmon.h>
 #include <modutil.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static	void	monitorMain(void *);
 
 static char *version_str = "V1.4.0";
diff --git a/server/modules/monitor/ndbclustermon.c b/server/modules/monitor/ndbclustermon.c
index d3cb40db3..02883c925 100644
--- a/server/modules/monitor/ndbclustermon.c
+++ b/server/modules/monitor/ndbclustermon.c
@@ -33,11 +33,6 @@
 
 #include <mysqlmon.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static	void	monitorMain(void *);
 
 static char *version_str = "V2.1.0";
@@ -476,4 +471,4 @@ bool isNdbEvent(monitor_event_t event)
 	    return true;
     }
     return false;
-}
\ No newline at end of file
+}
diff --git a/server/modules/protocol/httpd.c b/server/modules/protocol/httpd.c
index a9c9c3ded..ef1754040 100644
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@@ -50,11 +50,6 @@ MODULE_INFO info = {
 	"An experimental HTTPD implementation for use in admnistration"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 #define ISspace(x) isspace((int)(x))
 #define HTTP_SERVER_STRING "MaxScale(c) v.1.0.0"
 static char *version_str = "V1.0.1";
diff --git a/server/modules/protocol/maxscaled.c b/server/modules/protocol/maxscaled.c
index 874aa8bbd..e1051c3f2 100644
--- a/server/modules/protocol/maxscaled.c
+++ b/server/modules/protocol/maxscaled.c
@@ -45,11 +45,6 @@ MODULE_INFO info = {
 	"A maxscale protocol for the administration interface"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * @file maxscaled.c - MaxScale administration protocol
  *
diff --git a/server/modules/protocol/mysql_backend.c b/server/modules/protocol/mysql_backend.c
index 391ec0cc7..d4c616a66 100644
--- a/server/modules/protocol/mysql_backend.c
+++ b/server/modules/protocol/mysql_backend.c
@@ -55,11 +55,6 @@ MODULE_INFO info = {
 	"The MySQL to backend server protocol"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static char *version_str = "V2.0.0";
 static int gw_create_backend_connection(DCB *backend, SERVER *server, SESSION *in_session);
 static int gw_read_backend_event(DCB* dcb);
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 025a519d3..51ca80e89 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -56,11 +56,6 @@ MODULE_INFO info = {
 	"The client to MaxScale MySQL protocol implementation"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static char *version_str = "V1.0.0";
 
 static int gw_MySQLAccept(DCB *listener);
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index 553af4090..0c6c45179 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -50,11 +50,6 @@
 /* The following can be compared using memcmp to detect a null password */
 uint8_t null_client_sha1[MYSQL_SCRAMBLE_LEN]="";
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 extern int gw_read_backend_event(DCB* dcb);
 extern int gw_write_backend_event(DCB *dcb);
 extern int gw_MySQLWrite_backend(DCB *dcb, GWBUF *queue);
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index f70f8c038..ea236dbe2 100644
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@@ -45,11 +45,6 @@ MODULE_INFO info = {
 	"A telnet deamon protocol for simple administration interface"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * @file telnetd.c - telnet daemon protocol module
  *
diff --git a/server/modules/routing/GaleraHACRoute.c b/server/modules/routing/GaleraHACRoute.c
index 27394c5c8..a14979a31 100644
--- a/server/modules/routing/GaleraHACRoute.c
+++ b/server/modules/routing/GaleraHACRoute.c
@@ -47,8 +47,6 @@
 
 #include <mysql_client_server_protocol.h>
 
-extern int lm_enabled_logfiles_bitmask;
-
 static char *version_str = "V1.0.0";
 
 /* The router entry points */
diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
index c2b5e5c1c..ee55505ad 100644
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@@ -75,10 +75,6 @@
 #include <ini.h>
 #include <sys/stat.h>
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static char *version_str = "V2.0.0";
 
 /* The router entry points */
diff --git a/server/modules/routing/binlog/blr_cache.c b/server/modules/routing/binlog/blr_cache.c
index 400114b9b..63b1e8f9e 100644
--- a/server/modules/routing/binlog/blr_cache.c
+++ b/server/modules/routing/binlog/blr_cache.c
@@ -53,11 +53,6 @@
 #include <log_manager.h>
 
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
-
 /**
  * Initialise the cache for this instanceof the binlog router. As a side
  * effect also determine the binlog file to read and the position to read
diff --git a/server/modules/routing/binlog/blr_file.c b/server/modules/routing/binlog/blr_file.c
index efb9dc88c..29a15687e 100644
--- a/server/modules/routing/binlog/blr_file.c
+++ b/server/modules/routing/binlog/blr_file.c
@@ -63,10 +63,6 @@
 #include <skygw_utils.h>
 #include <log_manager.h>
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static int  blr_file_create(ROUTER_INSTANCE *router, char *file);
 static void blr_file_append(ROUTER_INSTANCE *router, char *file);
 static void blr_log_header(logfile_id_t file, char *msg, uint8_t *ptr);
diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c
index 3ac8086d5..5e8fd7ee1 100644
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@@ -78,10 +78,6 @@
 #include <mysql_client_server_protocol.h>
 
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static GWBUF *blr_make_query(char *statement);
 static GWBUF *blr_make_registration(ROUTER_INSTANCE *router);
 static GWBUF *blr_make_binlog_dump(ROUTER_INSTANCE *router);
diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
index 5b4aa8962..fcce69ea0 100644
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@@ -154,10 +154,6 @@ static int blr_slave_send_heartbeat(ROUTER_INSTANCE *router, ROUTER_SLAVE *slave
 
 void poll_fake_write_event(DCB *dcb);
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * Process a request packet from the slave server.
  *
diff --git a/server/modules/routing/binlog/maxbinlogcheck.c b/server/modules/routing/binlog/maxbinlogcheck.c
index ece9058ff..12ae8b6ed 100644
--- a/server/modules/routing/binlog/maxbinlogcheck.c
+++ b/server/modules/routing/binlog/maxbinlogcheck.c
@@ -63,9 +63,6 @@
 #include <version.h>
 #include <gwdirs.h>
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
 extern int blr_read_events_all_events(ROUTER_INSTANCE *router, int fix, int debug);
 extern uint32_t extract_field(uint8_t *src, int bits);
 static void printVersion(const char *progname);
diff --git a/server/modules/routing/binlog/test/testbinlog.c b/server/modules/routing/binlog/test/testbinlog.c
index 3741130be..4143cd517 100644
--- a/server/modules/routing/binlog/test/testbinlog.c
+++ b/server/modules/routing/binlog/test/testbinlog.c
@@ -51,9 +51,6 @@
 
 #include <version.h>
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
 static void printVersion(const char *progname);
 static void printUsage(const char *progname);
 extern int blr_test_parse_change_master_command(char *input, char *error_string, CHANGE_MASTER_OPTIONS *config);
diff --git a/server/modules/routing/cli.c b/server/modules/routing/cli.c
index 5f927cd3c..311c15c3f 100644
--- a/server/modules/routing/cli.c
+++ b/server/modules/routing/cli.c
@@ -53,11 +53,6 @@ MODULE_INFO 	info = {
 	"The admin user interface"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static char *version_str = "V1.0.0";
 
 /* The router entry points */
diff --git a/server/modules/routing/debugcli.c b/server/modules/routing/debugcli.c
index 635847b42..3467136e6 100644
--- a/server/modules/routing/debugcli.c
+++ b/server/modules/routing/debugcli.c
@@ -52,11 +52,6 @@ MODULE_INFO 	info = {
 	"The debug user interface"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static char *version_str = "V1.1.1";
 
 /* The router entry points */
diff --git a/server/modules/routing/maxinfo/maxinfo.c b/server/modules/routing/maxinfo/maxinfo.c
index 386a4c850..0efe22b63 100644
--- a/server/modules/routing/maxinfo/maxinfo.c
+++ b/server/modules/routing/maxinfo/maxinfo.c
@@ -63,11 +63,6 @@ MODULE_INFO 	info = {
 	"The MaxScale Information Schema"
 };
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 extern char *create_hex_sha1_sha1_passwd(char *passwd);
 
 static char *version_str = "V1.0.0";
diff --git a/server/modules/routing/maxinfo/maxinfo_error.c b/server/modules/routing/maxinfo/maxinfo_error.c
index dd5a8f233..afb4a6270 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.c
+++ b/server/modules/routing/maxinfo/maxinfo_error.c
@@ -45,11 +45,6 @@
 #include <log_manager.h>
 
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * Process a parse error and send error report to client
  *
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.c b/server/modules/routing/maxinfo/maxinfo_exec.c
index 6257228f6..d51f81d0d 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.c
+++ b/server/modules/routing/maxinfo/maxinfo_exec.c
@@ -49,10 +49,6 @@
 #include <resultset.h>
 #include <maxconfig.h>
 
-extern int lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 static void exec_show(DCB *dcb, MAXINFO_TREE *tree);
 static void exec_select(DCB *dcb, MAXINFO_TREE *tree);
 static void exec_show_variables(DCB *dcb, MAXINFO_TREE *filter);
diff --git a/server/modules/routing/readconnroute.c b/server/modules/routing/readconnroute.c
index ccb071e1a..8cc75e17a 100644
--- a/server/modules/routing/readconnroute.c
+++ b/server/modules/routing/readconnroute.c
@@ -92,11 +92,6 @@
 
 #include "modutil.h"
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 MODULE_INFO 	info = {
 	MODULE_API_ROUTER,
 	MODULE_GA,
diff --git a/server/modules/routing/readwritesplit/readwritesplit.c b/server/modules/routing/readwritesplit/readwritesplit.c
index 304bdd78c..dc52f026a 100644
--- a/server/modules/routing/readwritesplit/readwritesplit.c
+++ b/server/modules/routing/readwritesplit/readwritesplit.c
@@ -47,10 +47,6 @@ MODULE_INFO 	info = {
 
 #define RWSPLIT_TRACE_MSG_LEN 1000
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
 /**
  * @file readwritesplit.c	The entry points for the read/write query splitting
  * router module.
diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c
index 9bbf6b357..544fa80df 100644
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/server/modules/routing/schemarouter/schemarouter.c
@@ -52,10 +52,6 @@ MODULE_INFO 	info = {
 };
 
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
 /**
  * @file schemarouter.c	The entry points for the simple sharding
  * router module.
diff --git a/server/modules/routing/schemarouter/sharding_common.c b/server/modules/routing/schemarouter/sharding_common.c
index 813e9f826..201b7ec44 100644
--- a/server/modules/routing/schemarouter/sharding_common.c
+++ b/server/modules/routing/schemarouter/sharding_common.c
@@ -18,11 +18,6 @@
 
 #include <sharding_common.h>
 
-/** Defined in log_manager.cc */
-extern int            lm_enabled_logfiles_bitmask;
-extern size_t         log_ses_count[];
-extern __thread log_info_t tls_log_info;
-
 /**
  * Extract the database name from a COM_INIT_DB or literal USE ... query.
  * @param buf Buffer with the database change query
diff --git a/server/modules/routing/schemarouter/shardrouter.c b/server/modules/routing/schemarouter/shardrouter.c
index a9b033962..272f48664 100644
--- a/server/modules/routing/schemarouter/shardrouter.c
+++ b/server/modules/routing/schemarouter/shardrouter.c
@@ -46,10 +46,6 @@ MODULE_INFO info = {
 };
 
 
-/** Defined in log_manager.cc */
-extern int lm_enabled_logfiles_bitmask;
-extern size_t log_ses_count[];
-extern __thread log_info_t tls_log_info;
 /**
  * @file shardrouter.c	
  *