4 files changed, 6 insertions, 9 deletions

diff --git a/include/commands.h b/include/commands.h
index 8e53c74d..f6777930 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -2,6 +2,7 @@
 #define _SWAY_COMMANDS_H
 #include <stdbool.h>
 #include <json-c/json.h>
+#include <wlc/wlc.h>
 #include "config.h"
 
 
diff --git a/include/container.h b/include/container.h
index ae9a9fc5..d5eb27c1 100644
--- a/include/container.h
+++ b/include/container.h
@@ -98,6 +98,8 @@ swayc_t *swayc_by_name(const char *name);
 swayc_t *swayc_active_output(void);
 swayc_t *swayc_active_workspace(void);
 swayc_t *swayc_active_workspace_for(swayc_t *view);
+// set focus to current pointer location and return focused container
+swayc_t *container_under_pointer(void);
 
 // Container information
 
diff --git a/include/handlers.h b/include/handlers.h
index 4c71f953..d7f6ffdd 100644
--- a/include/handlers.h
+++ b/include/handlers.h
@@ -5,10 +5,6 @@
 #include <wlc/wlc.h>
 
 extern struct wlc_interface interface;
-extern struct wlc_origin mouse_origin;
 extern uint32_t keys_pressed[32];
 
-// set focus to current pointer location and return focused container
-swayc_t *container_under_pointer(void);
-
 #endif
diff --git a/include/input_state.h b/include/input_state.h
index d87ae18c..a1f238e1 100644
--- a/include/input_state.h
+++ b/include/input_state.h
@@ -48,11 +48,6 @@ extern struct pointer_state {
         struct pointer_button_state right;
         struct pointer_button_state scroll;
 
-        // pointer position
-        struct mouse_origin{
-                int x, y;
-        } origin;
-
         // change in pointer position
         struct {
                 int x, y;
@@ -65,6 +60,9 @@ extern struct pointer_state {
         int mode;
 } pointer_state;
 
+void pointer_position_set(struct wlc_origin *new_origin, bool force_focus);
+void center_pointer_on(swayc_t *view);
+
 // on button release unset mode depending on the button.
 // on button press set mode conditionally depending on the button
 void pointer_mode_set(uint32_t button, bool condition);