diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
index e25bd0a8d..a14ef05c5 100644
--- a/cmake/install_layout.cmake
+++ b/cmake/install_layout.cmake
@@ -5,8 +5,7 @@ set(MAXSCALE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/maxscale CACHE PATH "Library install
 set(MAXSCALE_BINDIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Executable installation path")
 set(MAXSCALE_SHAREDIR ${CMAKE_INSTALL_DATADIR}/maxscale CACHE PATH "Share file installation path, includes licence and readme files")
 set(MAXSCALE_DOCDIR ${CMAKE_INSTALL_DOCDIR}/maxscale CACHE PATH "Documentation installation path, text versions only")
-set(MAXSCALE_CONFDIR ${CMAKE_INSTALL_SYSCONFDIR} CACHE PATH "Configuration file installation path, this is not usually needed")
 
-# This is the only hard-coded absolute path
+# These are the only hard-coded absolute paths
 set(MAXSCALE_VARDIR /var CACHE PATH "Data file path (usually /var/)")
-
+set(MAXSCALE_CONFDIR /etc CACHE PATH "Configuration file installation path (/etc/)")
diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index 53734e9cc..4b3f9af21 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -19,7 +19,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#define _XOPEN_SOURCE
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 700
+#endif
 #include <unistd.h>
 #include <crypt.h>
 #include <users.h>