From 9430da94b92e8fa332a8c6701e460755a4f71989 Mon Sep 17 00:00:00 2001
From: Esa Korhonen <esa.korhonen@mariadb.com>
Date: Fri, 20 Jan 2017 14:31:16 +0200
Subject: [PATCH] Further cleanup of monitor headers

---
 include/maxscale/monitor.h     |  5 -----
 server/core/config.c           |  3 +++
 server/core/maxscale/monitor.h | 22 +++++++++++-----------
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/include/maxscale/monitor.h b/include/maxscale/monitor.h
index 028e5081a..fb2dbf67f 100644
--- a/include/maxscale/monitor.h
+++ b/include/maxscale/monitor.h
@@ -22,11 +22,6 @@
 
 #include <maxscale/config.h>
 #include <maxscale/dcb.h>
-#include <maxscale/externcmd.h>
-#include <maxscale/log_manager.h>
-#include <maxscale/modinfo.h>
-#include <maxscale/resultset.h>
-#include <maxscale/secrets.h>
 #include <maxscale/server.h>
 
 MXS_BEGIN_DECLS
diff --git a/server/core/config.c b/server/core/config.c
index 32f3e310c..84fadac60 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -45,8 +45,10 @@
  * @endverbatim
  */
 #include <maxscale/config.h>
+
 #include <ctype.h>
 #include <ftw.h>
+#include <fcntl.h>
 #include <glob.h>
 #include <net/if.h>
 #include <stdio.h>
@@ -54,6 +56,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 #include <ini.h>
+
 #include <maxscale/alloc.h>
 #include <maxscale/housekeeper.h>
 #include <maxscale/limits.h>
diff --git a/server/core/maxscale/monitor.h b/server/core/maxscale/monitor.h
index 1fcc4cde9..d8c4e28b7 100644
--- a/server/core/maxscale/monitor.h
+++ b/server/core/maxscale/monitor.h
@@ -38,13 +38,13 @@ typedef enum
     MONITOR_WRITE_TIMEOUT   = 2
 } monitor_timeouts_t;
 
-extern MXS_MONITOR *monitor_alloc(char *, char *);
-extern void monitor_free(MXS_MONITOR *);
+MXS_MONITOR *monitor_alloc(char *, char *);
+void monitor_free(MXS_MONITOR *);
 
 void monitorStart(MXS_MONITOR *, void*);
 void monitorStop(MXS_MONITOR *);
-extern void monitorStopAll();
-extern void monitorStartAll();
+void monitorStopAll();
+void monitorStartAll();
 
 MXS_MONITOR *monitor_find(const char *);
 
@@ -54,14 +54,14 @@ void monitorShowAll(DCB *);
 void monitorList(DCB *);
 RESULTSET *monitorGetList();
 
-extern bool monitorAddServer(MXS_MONITOR *mon, SERVER *server);
-extern void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server);
-extern void monitorAddUser(MXS_MONITOR *, char *, char *);
-extern void monitorAddParameters(MXS_MONITOR *monitor, CONFIG_PARAMETER *params);
-extern bool monitorRemoveParameter(MXS_MONITOR *monitor, const char *key);
+bool monitorAddServer(MXS_MONITOR *mon, SERVER *server);
+void monitorRemoveServer(MXS_MONITOR *mon, SERVER *server);
+void monitorAddUser(MXS_MONITOR *, char *, char *);
+void monitorAddParameters(MXS_MONITOR *monitor, CONFIG_PARAMETER *params);
+bool monitorRemoveParameter(MXS_MONITOR *monitor, const char *key);
 
-extern void monitorSetInterval (MXS_MONITOR *, unsigned long);
-extern bool monitorSetNetworkTimeout(MXS_MONITOR *, int, int);
+void monitorSetInterval (MXS_MONITOR *, unsigned long);
+bool monitorSetNetworkTimeout(MXS_MONITOR *, int, int);
 
 /**
  * @brief Serialize the servers of a monitor to a file