diff --git a/gdk/broadway/broadway-buffer.c b/gdk/broadway/broadway-buffer.c
index a03e12cdbc..f864f526ee 100644
--- a/gdk/broadway/broadway-buffer.c
+++ b/gdk/broadway/broadway-buffer.c
@@ -258,7 +258,7 @@ encode_pixel (struct encoder *encoder, guint32 color, guint32 prev_color)
     }
 }
 
-void
+static void
 encoder_flush (struct encoder *encoder)
 {
   encode_run (encoder);
diff --git a/gdk/broadway/broadway-server.c b/gdk/broadway/broadway-server.c
index 5f78f400a8..9f06c085a6 100644
--- a/gdk/broadway/broadway-server.c
+++ b/gdk/broadway/broadway-server.c
@@ -120,6 +120,8 @@ struct BroadwayWindow {
 
 static void broadway_server_resync_windows (BroadwayServer *server);
 
+static GType broadway_server_get_type (void);
+
 G_DEFINE_TYPE (BroadwayServer, broadway_server, G_TYPE_OBJECT)
 
 static void
@@ -752,16 +754,10 @@ broadway_server_flush (BroadwayServer *server)
     }
 }
 
-void
-broadway_server_sync (BroadwayServer *server)
-{
-  broadway_server_flush (server);
-}
-
-
+#if 0
 /* TODO: This is not used atm, is it needed? */
 /* Note: This may be called while handling a message (i.e. sorta recursively) */
-BroadwayInputMsg *
+static BroadwayInputMsg *
 broadway_server_block_for_input (BroadwayServer *server, char op,
 				 guint32 serial, gboolean remove_message)
 {
@@ -814,6 +810,7 @@ broadway_server_block_for_input (BroadwayServer *server, char op,
     queue_process_input_at_idle (server);
   }
 }
+#endif
 
 static void *
 map_named_shm (char *name, gsize size)
diff --git a/gdk/broadway/broadwayd.c b/gdk/broadway/broadwayd.c
index 30448ac76f..031e866b00 100644
--- a/gdk/broadway/broadwayd.c
+++ b/gdk/broadway/broadwayd.c
@@ -124,7 +124,7 @@ send_reply (BroadwayClient *client,
     }
 }
 
-void
+static void
 add_client_serial_mapping (BroadwayClient *client,
 			   guint32 client_serial,
 			   guint32 daemon_serial)
@@ -154,7 +154,7 @@ add_client_serial_mapping (BroadwayClient *client,
 
 /* Returns the latest seen client serial at the time we sent
    a daemon request to the browser with a specific daemon serial */
-guint32
+static guint32
 get_client_serial (BroadwayClient *client, guint32 daemon_serial)
 {
   BroadwaySerialMapping *map;
diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c
index dfbb19dc4f..642e65df44 100644
--- a/gdk/broadway/gdkbroadway-server.c
+++ b/gdk/broadway/gdkbroadway-server.c
@@ -53,6 +53,8 @@ struct _GdkBroadwayServerClass
 
 static gboolean input_available_cb (gpointer stream, gpointer user_data);
 
+static GType gdk_broadway_server_get_type (void);
+
 G_DEFINE_TYPE (GdkBroadwayServer, gdk_broadway_server, G_TYPE_OBJECT)
 
 static void
diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 327d95d5a9..53c675d326 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -260,11 +260,6 @@ gdk_broadway_display_finalize (GObject *object)
   G_OBJECT_CLASS (gdk_broadway_display_parent_class)->finalize (object);
 }
 
-void
-_gdk_broadway_display_make_default (GdkDisplay *display)
-{
-}
-
 static void
 gdk_broadway_display_notify_startup_complete (GdkDisplay  *display,
 					      const gchar *startup_id)
diff --git a/gdk/broadway/gdkkeys-broadway.c b/gdk/broadway/gdkkeys-broadway.c
index cf3c029af4..c52d1bbb59 100644
--- a/gdk/broadway/gdkkeys-broadway.c
+++ b/gdk/broadway/gdkkeys-broadway.c
@@ -46,6 +46,8 @@ typedef struct _GdkKeymapClass GdkBroadwayKeymapClass;
 #define GDK_BROADWAY_KEYMAP(object)       (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_BROADWAY_KEYMAP, GdkBroadwayKeymap))
 #define GDK_IS_BROADWAY_KEYMAP(object)    (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_BROADWAY_KEYMAP))
 
+static GType gdk_broadway_keymap_get_type (void);
+
 typedef struct _DirectionCacheEntry DirectionCacheEntry;
 
 struct _GdkBroadwayKeymap
diff --git a/gdk/broadway/gdktestutils-broadway.c b/gdk/broadway/gdktestutils-broadway.c
index dca67e6677..a3b1ee2fde 100644
--- a/gdk/broadway/gdktestutils-broadway.c
+++ b/gdk/broadway/gdktestutils-broadway.c
@@ -19,6 +19,7 @@
 #include <gdk/gdktestutils.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkinternals.h>
+#include "gdkprivate-broadway.h"
 
 void
 _gdk_broadway_window_sync_rendering (GdkWindow *window)
diff --git a/gdk/broadway/gdkwindow-broadway.c b/gdk/broadway/gdkwindow-broadway.c
index 3113040f31..cc897c5ecc 100644
--- a/gdk/broadway/gdkwindow-broadway.c
+++ b/gdk/broadway/gdkwindow-broadway.c
@@ -662,18 +662,6 @@ gdk_window_broadway_set_device_cursor (GdkWindow *window,
     GDK_DEVICE_GET_CLASS (device)->set_window_cursor (device, window, cursor);
 }
 
-GdkCursor *
-_gdk_broadway_window_get_cursor (GdkWindow *window)
-{
-  GdkWindowImplBroadway *impl;
-
-  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
-
-  impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
-
-  return impl->cursor;
-}
-
 static void
 gdk_window_broadway_get_geometry (GdkWindow *window,
 				  gint      *x,