diff --git a/src/wayland/meta-wayland-surface-private.h b/src/wayland/meta-wayland-surface-private.h
deleted file mode 100644
index 9b882dfb1..000000000
--- a/src/wayland/meta-wayland-surface-private.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2014 Red Hat
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Written by:
- *     Jasper St. Pierre <jstpierre@mecheye.net>
- */
-
-#ifndef META_WAYLAND_SURFACE_PRIVATE_H
-#define META_WAYLAND_SURFACE_PRIVATE_H
-
-#include "meta-wayland-types.h"
-
-void meta_wayland_surface_commit (MetaWaylandSurface *surface);
-
-#endif /* META_WAYLAND_SURFACE_PRIVATE_H */
diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index 53c484455..b7d1b1bea 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -48,7 +48,6 @@
 #include "meta-wayland-keyboard.h"
 #include "meta-wayland-pointer.h"
 #include "meta-wayland-data-device.h"
-#include "meta-wayland-surface-private.h"
 
 #include "meta-cursor-tracker-private.h"
 #include "display-private.h"
@@ -354,7 +353,7 @@ commit_double_buffered_state (MetaWaylandSurface             *surface,
   double_buffered_state_reset (pending);
 }
 
-void
+static void
 meta_wayland_surface_commit (MetaWaylandSurface *surface)
 {
   commit_double_buffered_state (surface, &surface->pending);
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 856213cfe..22a77b23f 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -26,8 +26,6 @@
 #include "meta-xwayland.h"
 #include "meta-xwayland-private.h"
 
-#include "meta-wayland-surface-private.h"
-
 #include <glib.h>
 #include <glib-unix.h>
 #include <unistd.h>
@@ -57,12 +55,6 @@ associate_window_with_surface (MetaWindow         *window,
 
   meta_compositor_window_surface_changed (display->compositor, window);
 
-  /* Since the association comes in the form of a ClientMessage,
-   * we have no way to know when the surface was set up. Since
-   * commit just breaks if we don't have a window associated with
-   * it, we need to do a commit *again* here. */
-  meta_wayland_surface_commit (surface);
-
   /* Now that we have a surface check if it should have focus. */
   meta_display_sync_wayland_input_focus (display);
 }