3 files changed, 14 insertions, 24 deletions
diff --git a/include/sway/debug.h b/include/sway/debug.h
deleted file mode 100644
index 0e9bb056..00000000
--- a/include/sway/debug.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef SWAY_DEBUG_H
-#define SWAY_DEBUG_H
-#include <stdbool.h>
-
-struct sway_debug {
-	bool noatomic;         // Ignore atomic layout updates
-	bool render_tree;      // Render the tree overlay
-	bool txn_timings;      // Log verbose messages about transactions
-	bool txn_wait;         // Always wait for the timeout before applying
-
-	enum {
-		DAMAGE_DEFAULT,    // Default behaviour
-		DAMAGE_HIGHLIGHT,  // Highlight regions of the screen being damaged
-		DAMAGE_RERENDER,   // Render the full output when any damage occurs
-	} damage;
-};
-
-extern struct sway_debug debug;
-
-void update_debug_tree(void);
-
-#endif
diff --git a/include/sway/server.h b/include/sway/server.h
index 5eef7c1a..39cf4f18 100644
--- a/include/sway/server.h
+++ b/include/sway/server.h
@@ -74,6 +74,20 @@ struct sway_server {
 
 struct sway_server server;
 
+struct sway_debug {
+	bool noatomic;         // Ignore atomic layout updates
+	bool txn_timings;      // Log verbose messages about transactions
+	bool txn_wait;         // Always wait for the timeout before applying
+
+	enum {
+		DAMAGE_DEFAULT,    // Default behaviour
+		DAMAGE_HIGHLIGHT,  // Highlight regions of the screen being damaged
+		DAMAGE_RERENDER,   // Render the full output when any damage occurs
+	} damage;
+};
+
+struct sway_debug debug;
+
 /* Prepares an unprivileged server_init by performing all privileged operations in advance */
 bool server_privileged_prepare(struct sway_server *server);
 bool server_init(struct sway_server *server);
diff --git a/include/sway/tree/root.h b/include/sway/tree/root.h
index 9ff45eb5..9f6cd3bb 100644
--- a/include/sway/tree/root.h
+++ b/include/sway/tree/root.h
@@ -21,8 +21,6 @@ struct sway_root {
 #endif
 	struct wl_list drag_icons; // sway_drag_icon::link
 
-	struct wlr_texture *debug_tree;
-
 	// Includes disabled outputs
 	struct wl_list all_outputs; // sway_output::link