4 files changed, 36 insertions, 58 deletions

diff --git a/include/sway/tree/arrange.h b/include/sway/tree/arrange.h
index d6abcc81..346103d3 100644
--- a/include/sway/tree/arrange.h
+++ b/include/sway/tree/arrange.h
@@ -4,12 +4,6 @@
 
 struct sway_container;
 
-// Remove gaps around container
-void remove_gaps(struct sway_container *c);
-
-// Add gaps around container
-void add_gaps(struct sway_container *c);
-
 /**
  * Arrange layout for all the children of the given container.
  */
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 2cedb613..e4071cfe 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -53,6 +53,9 @@ struct sway_output;
 struct sway_workspace;
 struct sway_view;
 
+enum movement_direction;
+enum wlr_direction;
+
 struct sway_container_state {
         // Container/swayc properties
         enum sway_container_layout layout;
@@ -335,6 +338,35 @@ struct sway_output *container_get_effective_output(struct sway_container *con);
 
 void container_discover_outputs(struct sway_container *con);
 
+void container_remove_gaps(struct sway_container *container);
+
+void container_add_gaps(struct sway_container *container);
+
 int container_sibling_index(const struct sway_container *child);
 
+void container_handle_fullscreen_reparent(struct sway_container *con,
+                struct sway_container *old_parent);
+
+void container_add_child(struct sway_container *parent,
+                struct sway_container *child);
+
+void container_insert_child(struct sway_container *parent,
+                struct sway_container *child, int i);
+
+struct sway_container *container_add_sibling(struct sway_container *parent,
+                struct sway_container *child);
+
+struct sway_container *container_remove_child(struct sway_container *child);
+
+struct sway_container *container_replace_child(struct sway_container *child,
+                struct sway_container *new_child);
+
+bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out);
+
+enum sway_container_layout container_get_default_layout(
+                struct sway_container *con);
+
+struct sway_container *container_split(struct sway_container *child,
+                enum sway_container_layout layout);
+
 #endif
diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h
deleted file mode 100644
index 5c834ad2..00000000
--- a/include/sway/tree/layout.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _SWAY_LAYOUT_H
-#define _SWAY_LAYOUT_H
-#include <wlr/types/wlr_output_layout.h>
-#include <wlr/render/wlr_texture.h>
-#include "sway/tree/container.h"
-#include "sway/tree/root.h"
-#include "config.h"
-
-enum movement_direction {
-        MOVE_LEFT,
-        MOVE_RIGHT,
-        MOVE_UP,
-        MOVE_DOWN,
-        MOVE_PARENT,
-        MOVE_CHILD,
-};
-
-enum wlr_edges;
-
-struct sway_container;
-
-void container_handle_fullscreen_reparent(struct sway_container *con,
-                struct sway_container *old_parent);
-
-void container_add_child(struct sway_container *parent,
-                struct sway_container *child);
-
-void container_insert_child(struct sway_container *parent,
-                struct sway_container *child, int i);
-
-struct sway_container *container_add_sibling(struct sway_container *parent,
-                struct sway_container *child);
-
-struct sway_container *container_remove_child(struct sway_container *child);
-
-struct sway_container *container_replace_child(struct sway_container *child,
-                struct sway_container *new_child);
-
-bool sway_dir_to_wlr(enum movement_direction dir, enum wlr_direction *out);
-
-enum sway_container_layout container_get_default_layout(
-                struct sway_container *con);
-
-struct sway_container *container_split(struct sway_container *child,
-                enum sway_container_layout layout);
-
-void container_recursive_resize(struct sway_container *container,
-                double amount, enum wlr_edges edge);
-
-void container_swap(struct sway_container *con1, struct sway_container *con2);
-
-#endif
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index efcb7c69..04325919 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -75,4 +75,8 @@ struct sway_container *workspace_wrap_children(struct sway_container *ws);
 void workspace_add_floating(struct sway_container *workspace,
                 struct sway_container *con);
 
+void workspace_remove_gaps(struct sway_container *ws);
+
+void workspace_add_gaps(struct sway_container *ws);
+
 #endif