3 files changed, 6 insertions, 2 deletions

diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index ef65810c..bef2af77 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -51,6 +51,7 @@ struct sway_seat {
         bool has_focus;
         struct wl_list focus_stack; // list of containers in focus order
         struct sway_workspace *workspace;
+        char *prev_workspace_name; // for workspace back_and_forth
 
         // If the focused layer is set, views cannot receive keyboard focus
         struct wlr_layer_surface_v1 *focused_layer;
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h
index efdae5a1..b5ae92f3 100644
--- a/include/sway/tree/workspace.h
+++ b/include/sway/tree/workspace.h
@@ -45,8 +45,6 @@ struct sway_workspace {
         struct sway_workspace_state current;
 };
 
-extern char *prev_workspace_name;
-
 struct workspace_config *workspace_find_config(const char *ws_name);
 
 struct sway_output *workspace_get_initial_output(const char *name);
diff --git a/include/sway/xwayland.h b/include/sway/xwayland.h
index 121edad3..93055c46 100644
--- a/include/sway/xwayland.h
+++ b/include/sway/xwayland.h
@@ -10,6 +10,11 @@ enum atom_name {
         NET_WM_WINDOW_TYPE_UTILITY,
         NET_WM_WINDOW_TYPE_TOOLBAR,
         NET_WM_WINDOW_TYPE_SPLASH,
+        NET_WM_WINDOW_TYPE_MENU,
+        NET_WM_WINDOW_TYPE_DROPDOWN_MENU,
+        NET_WM_WINDOW_TYPE_POPUP_MENU,
+        NET_WM_WINDOW_TYPE_TOOLTIP,
+        NET_WM_WINDOW_TYPE_NOTIFICATION,
         NET_WM_STATE_MODAL,
         ATOM_LAST,
 };