diff --git a/include/maxscale/skygw_types.h b/include/maxscale/skygw_types.h
deleted file mode 100644
index 21ddd0027..000000000
--- a/include/maxscale/skygw_types.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#pragma once
-#ifndef _MAXSCALE_SKYGW_TYPES_H
-#define _MAXSCALE_SKYGW_TYPES_H
-/*
- * Copyright (c) 2016 MariaDB Corporation Ab
- *
- * Use of this software is governed by the Business Source License included
- * in the LICENSE.TXT file and at www.mariadb.com/bsl.
- *
- * Change Date: 2019-07-01
- *
- * On the date above, in accordance with the Business Source License, use
- * of this software will be governed by version 2 or later of the General
- * Public License.
- */
-
-#include <maxscale/cdefs.h>
-#include <math.h>
-#include <stdbool.h>
-#include <ctype.h>
-
-MXS_BEGIN_DECLS
-
-#define SECOND_USEC (1024*1024L)
-#define MSEC_USEC   (1024L)
-
-#define KILOBYTE_BYTE (1024L)
-#define MEGABYTE_BYTE (1024*1024L)
-#define GIGABYTE_BYTE (1024*1024*1024L)
-
-#define KB KILOBYTE_BYTE
-#define MB MEGABYTE_BYTE
-#define GB GIGABYTE_BYTE
-
-#define CALCLEN(i) ((size_t)(floor(log10(abs(i))) + 1))
-
-#define UINTLEN(i) (i<10 ? 1 : (i<100 ? 2 : (i<1000 ? 3 : CALCLEN(i))))
-
-#if !defined(PATH_MAX)
-# if defined(__USE_POSIX)
-#   define PATH_MAX _POSIX_PATH_MAX
-# else
-#   define PATH_MAX 256
-# endif
-#endif
-
-#define MAX_ERROR_MSG PATH_MAX
-#define array_nelems(a) ((uint)(sizeof(a)/sizeof(a[0])))
-
-MXS_END_DECLS
-
-#endif /* SKYGW_TYPES_H */
diff --git a/include/maxscale/skygw_utils.h b/include/maxscale/skygw_utils.h
index e797621d5..50c238546 100644
--- a/include/maxscale/skygw_utils.h
+++ b/include/maxscale/skygw_utils.h
@@ -33,7 +33,6 @@ MXS_BEGIN_DECLS
 #endif
 #define FSYNCLIMIT 10
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/debug.h>
 
 #define DISKWRITE_LATENCY (5*MSEC_USEC)
diff --git a/include/maxscale/utils.h b/include/maxscale/utils.h
index eb6d29995..bca259700 100644
--- a/include/maxscale/utils.h
+++ b/include/maxscale/utils.h
@@ -27,9 +27,16 @@
  */
 
 #include <maxscale/cdefs.h>
+#include <math.h>
+#include <stdlib.h>
 
 MXS_BEGIN_DECLS
 
+#define CALCLEN(i) ((size_t)(floor(log10(abs(i))) + 1))
+#define UINTLEN(i) (i<10 ? 1 : (i<100 ? 2 : (i<1000 ? 3 : CALCLEN(i))))
+
+#define MXS_ARRAY_NELEMS(array) ((size_t)(sizeof(array)/sizeof(array[0])))
+
 int setnonblocking(int fd);
 char  *gw_strend(register const char *s);
 static char gw_randomchar();
diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index a5f0eb5f3..9baaee794 100644
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@@ -55,7 +55,6 @@
 #include <strfunc.h>
 #include <item_func.h>
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/debug.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/query_classifier.h>
diff --git a/server/core/externcmd.c b/server/core/externcmd.c
index 9bcef24ae..d4fa6bcbb 100644
--- a/server/core/externcmd.c
+++ b/server/core/externcmd.c
@@ -12,6 +12,7 @@
  */
 
 #include <maxscale/externcmd.h>
+#include <ctype.h>
 #include <maxscale/alloc.h>
 
 /**
diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc
index 0997e3041..ebf893bc8 100644
--- a/server/core/log_manager.cc
+++ b/server/core/log_manager.cc
@@ -29,9 +29,9 @@
 #include <maxscale/mlist.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/debug.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/alloc.h>
+#include <maxscale/utils.h>
 
 #define MAX_PREFIXLEN 250
 #define MAX_SUFFIXLEN 250
diff --git a/server/core/service.c b/server/core/service.c
index be80fc8c1..137324ea8 100644
--- a/server/core/service.c
+++ b/server/core/service.c
@@ -67,6 +67,7 @@
 #include <maxscale/version.h>
 #include <maxscale/queuemanager.h>
 #include <maxscale/alloc.h>
+#include <maxscale/utils.h>
 
 /** To be used with configuration type checks */
 typedef struct typelib_st
@@ -78,13 +79,13 @@ typedef struct typelib_st
 
 /** Set of subsequent false,true pairs */
 static const char* bool_strings[11]  = {"FALSE", "TRUE", "OFF", "ON", "N", "Y", "0", "1", "NO", "YES", 0};
-typelib_t bool_type  = {array_nelems(bool_strings) - 1, "bool_type", bool_strings};
+typelib_t bool_type  = {MXS_ARRAY_NELEMS(bool_strings) - 1, "bool_type", bool_strings};
 
 /** List of valid values */
 static const char* sqlvar_target_strings[4] = {"MASTER", "ALL", 0};
 typelib_t sqlvar_target_type =
 {
-    array_nelems(sqlvar_target_strings) - 1,
+    MXS_ARRAY_NELEMS(sqlvar_target_strings) - 1,
     "sqlvar_target_type",
     sqlvar_target_strings
 };
diff --git a/server/core/skygw_utils.cc b/server/core/skygw_utils.cc
index 498224c22..6c6566c47 100644
--- a/server/core/skygw_utils.cc
+++ b/server/core/skygw_utils.cc
@@ -15,6 +15,8 @@
 #define PCRE2_CODE_UNIT_WIDTH 8
 #endif
 
+#include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
@@ -24,13 +26,22 @@
 #include <stddef.h>
 #include <regex.h>
 #include <maxscale/debug.h>
-#include <maxscale/skygw_types.h>
 #include <sys/time.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/atomic.h>
 #include <maxscale/random_jkiss.h>
 #include <pcre2.h>
 
+#if !defined(PATH_MAX)
+# if defined(__USE_POSIX)
+#   define PATH_MAX _POSIX_PATH_MAX
+# else
+#   define PATH_MAX 256
+# endif
+#endif
+
+#define MAX_ERROR_MSG PATH_MAX
+
 static void simple_mutex_free_memory(simple_mutex_t* sm);
 static void thread_free_memory(skygw_thread_t* th, char* name);
 /** End of static function declarations */
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c
index 33e684bd1..8ba47775c 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.c
@@ -70,7 +70,6 @@
 #include <maxscale/query_classifier.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/skygw_types.h>
 #include <time.h>
 #include <assert.h>
 #include <regex.h>
diff --git a/server/modules/filter/luafilter/luafilter.c b/server/modules/filter/luafilter/luafilter.c
index 589a4294c..5da797e47 100644
--- a/server/modules/filter/luafilter/luafilter.c
+++ b/server/modules/filter/luafilter/luafilter.c
@@ -36,7 +36,6 @@
  * or diagnostic being made for the session script.
  */
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/debug.h>
 #include <maxscale/log_manager.h>
diff --git a/server/modules/filter/tpmfilter/tpmfilter.c b/server/modules/filter/tpmfilter/tpmfilter.c
index d803421a4..d082c89f6 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.c
+++ b/server/modules/filter/tpmfilter/tpmfilter.c
@@ -39,6 +39,7 @@
  * @endverbatim
  */
 
+#include <ctype.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <maxscale/filter.h>
diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
index 30d763a12..fa1b05141 100644
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
@@ -12,7 +12,6 @@
  */
 
 #include <maxscale/protocol/mysql.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/modutil.h>
diff --git a/server/modules/protocol/MySQL/mysql_common.c b/server/modules/protocol/MySQL/mysql_common.c
index 08fb31b6e..77a827967 100644
--- a/server/modules/protocol/MySQL/mysql_common.c
+++ b/server/modules/protocol/MySQL/mysql_common.c
@@ -46,7 +46,6 @@
 #include <maxscale/utils.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/alloc.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <netinet/tcp.h>
diff --git a/server/modules/routing/avro/avro.c b/server/modules/routing/avro/avro.c
index 8c6cb1807..5e5da7926 100644
--- a/server/modules/routing/avro/avro.c
+++ b/server/modules/routing/avro/avro.c
@@ -39,7 +39,6 @@
 #include <maxscale/housekeeper.h>
 #include <time.h>
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
diff --git a/server/modules/routing/avro/avro_client.c b/server/modules/routing/avro/avro_client.c
index 9a051728c..2c2936f20 100644
--- a/server/modules/routing/avro/avro_client.c
+++ b/server/modules/routing/avro/avro_client.c
@@ -35,7 +35,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/version.h>
diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
index d4161b759..30b17dfb3 100644
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@@ -71,7 +71,6 @@
 #include <maxscale/housekeeper.h>
 #include <time.h>
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
diff --git a/server/modules/routing/binlog/blr_cache.c b/server/modules/routing/binlog/blr_cache.c
index 3e6e5768d..9501f0f92 100644
--- a/server/modules/routing/binlog/blr_cache.c
+++ b/server/modules/routing/binlog/blr_cache.c
@@ -43,7 +43,6 @@
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
diff --git a/server/modules/routing/binlog/blr_file.c b/server/modules/routing/binlog/blr_file.c
index 6edafcb3c..342f64990 100644
--- a/server/modules/routing/binlog/blr_file.c
+++ b/server/modules/routing/binlog/blr_file.c
@@ -56,7 +56,6 @@
 #include <maxscale/dcb.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/gwdirs.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/routing/binlog/blr_master.c b/server/modules/routing/binlog/blr_master.c
index c96c30a70..e3de00ebb 100644
--- a/server/modules/routing/binlog/blr_master.c
+++ b/server/modules/routing/binlog/blr_master.c
@@ -69,7 +69,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 
diff --git a/server/modules/routing/binlog/blr_slave.c b/server/modules/routing/binlog/blr_slave.c
index cbe4b3d07..4650053d7 100644
--- a/server/modules/routing/binlog/blr_slave.c
+++ b/server/modules/routing/binlog/blr_slave.c
@@ -79,7 +79,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/housekeeper.h>
 #include <sys/stat.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/version.h>
diff --git a/server/modules/routing/binlog/test/testbinlog.c b/server/modules/routing/binlog/test/testbinlog.c
index a9e3e2373..f55d038c9 100644
--- a/server/modules/routing/binlog/test/testbinlog.c
+++ b/server/modules/routing/binlog/test/testbinlog.c
@@ -36,7 +36,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/housekeeper.h>
 #include <time.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/gwdirs.h>
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.c b/server/modules/routing/maxinfo/maxinfo_parse.c
index 5fd8bfe05..ccf3aea7a 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.c
+++ b/server/modules/routing/maxinfo/maxinfo_parse.c
@@ -23,6 +23,8 @@
  *
  * @endverbatim
  */
+
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/server/modules/routing/readconnroute/readconnroute.c b/server/modules/routing/readconnroute/readconnroute.c
index c55a82fe8..bbb7d55b6 100644
--- a/server/modules/routing/readconnroute/readconnroute.c
+++ b/server/modules/routing/readconnroute/readconnroute.c
@@ -84,7 +84,6 @@
 #include <maxscale/spinlock.h>
 #include <maxscale/modinfo.h>
 
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/log_manager.h>