diff --git a/src/action.c b/src/action.c
index b1c8cc3b..5d37653e 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1,5 +1,4 @@
 #include <strings.h>
-
 #include "common/log.h"
 #include "common/spawn.h"
 #include "labwc.h"
diff --git a/src/deco.c b/src/deco.c
index e4b5d346..30cf113f 100644
--- a/src/deco.c
+++ b/src/deco.c
@@ -5,7 +5,6 @@
  */
 
 #include <assert.h>
-
 #include "config/rcxml.h"
 #include "labwc.h"
 #include "theme/theme.h"
diff --git a/src/desktop.c b/src/desktop.c
index 7c71667f..c3777b1c 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -1,5 +1,4 @@
 #include <assert.h>
-
 #include "labwc.h"
 
 static void
diff --git a/src/main.c b/src/main.c
index 0e40af5c..bd2b3ec5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
-#include "common/spawn.h"
 #include "common/font.h"
+#include "common/log.h"
+#include "common/spawn.h"
 #include "config/session.h"
 #include "labwc.h"
 #include "theme/theme.h"
@@ -68,8 +69,7 @@ main(int argc, char *argv[])
 	rcxml_read(config_file);
 
 	if (!getenv("XDG_RUNTIME_DIR")) {
-		wlr_log(WLR_ERROR, "XDG_RUNTIME_DIR is required to be set");
-		return 1;
+		die("XDG_RUNTIME_DIR is unset");
 	}
 
 	struct server server = { 0 };
diff --git a/src/server.c b/src/server.c
index 3a858f66..64d89d01 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1,8 +1,4 @@
 #define _POSIX_C_SOURCE 200809L
-#include "config/rcxml.h"
-#include "labwc.h"
-#include "theme/theme.h"
-
 #include <signal.h>
 #include <wlr/types/wlr_data_control_v1.h>
 #include <wlr/types/wlr_export_dmabuf_v1.h>
@@ -10,7 +6,10 @@
 #include <wlr/types/wlr_primary_selection_v1.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include "common/log.h"
+#include "config/rcxml.h"
+#include "labwc.h"
 #include "layers.h"
+#include "theme/theme.h"
 
 static struct wlr_compositor *compositor;
 static struct wl_event_source *sighup_source;
diff --git a/src/xwayland.c b/src/xwayland.c
index 809e9ce0..9a6e1be5 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -1,5 +1,4 @@
 #include <assert.h>
-
 #include "labwc.h"
 
 static void