diff --git a/commandline.c b/commandline.c
index eb8af704..b4d935df 100644
--- a/commandline.c
+++ b/commandline.c
@@ -18,7 +18,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 #define _GNU_SOURCE // For asprintf()
-#include <sys/stat.h>
 #include <sys/time.h>
 #include <math.h>
 #include <string.h>
diff --git a/server.c b/server.c
index 985ca8b2..efe77cfc 100644
--- a/server.c
+++ b/server.c
@@ -20,6 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <sys/stat.h>
 
 #include "serval.h"
 
@@ -582,10 +583,7 @@ int simpleServerMode()
     int len;
     int r;
 
-    if (servalShutdown) {
-      serverCleanUp();
-      exit(0);
-    }
+    server_shutdown_check();
 
     bzero((void *)&recvaddr,sizeof(recvaddr));