diff --git a/include/common/lab-scene-rect.h b/include/common/lab-scene-rect.h
index da83154e..d79d879d 100644
--- a/include/common/lab-scene-rect.h
+++ b/include/common/lab-scene-rect.h
@@ -3,9 +3,6 @@
 #define LABWC_LAB_SCENE_RECT_H
 #include <wayland-server-core.h>
 
-
-// Ensure we can access theme data to decide if we need bevels
-extern struct rcxml rc;
 struct wlr_scene_tree;
 
 struct lab_scene_rect_options {
diff --git a/include/common/macros.h b/include/common/macros.h
index 9bcbe20c..7fb5d0dc 100644
--- a/include/common/macros.h
+++ b/include/common/macros.h
@@ -65,7 +65,6 @@
 #define LAB_WLR_VERSION_AT_LEAST(major, minor, micro) \
 	(WLR_VERSION_NUM >= (((major) << 16) | ((minor) << 8) | (micro)))
 
-
 /**
  * PIXEL () - calculate pixel offset in an array of "bw" columns wide.
  *
@@ -73,7 +72,7 @@
  * @param y y-coordinate
  * Assumes "bw" was defined externally
  */
- 
-#define PIXEL(x,y) (bw * y + x)
+
+#define PIXEL(x, y) (bw * y + x)
 
 #endif /* LABWC_MACROS_H */
diff --git a/include/ssd-internal.h b/include/ssd-internal.h
index de91d558..965944dc 100644
--- a/include/ssd-internal.h
+++ b/include/ssd-internal.h
@@ -115,7 +115,8 @@ struct ssd {
 		struct ssd_border_subtree {
 			struct wlr_scene_tree *tree;
 			struct wlr_scene_rect *top, *bottom, *left, *right;
-			struct wlr_scene_buffer *tlcorner, *trcorner, *blcorner, *brcorner, *ttexture, *btexture, *ltexture, *rtexture;
+			struct wlr_scene_buffer *tlcorner, *trcorner, *blcorner, *brcorner,
+				*ttexture, *btexture, *ltexture, *rtexture;
 		} subtrees[2]; /* indexed by enum ssd_active_state */
 	} border;
 
diff --git a/src/common/lab-scene-rect.c b/src/common/lab-scene-rect.c
index 7b64f9bc..93b750e1 100644
--- a/src/common/lab-scene-rect.c
+++ b/src/common/lab-scene-rect.c
@@ -6,8 +6,6 @@
 #include "common/scene-helpers.h"
 #include "common/macros.h"
 #include "buffer.h"
-#include "config/rcxml.h"
-#include "theme.h"
 
 struct border_scene {
 	struct wlr_scene_tree *tree;