diff --git a/src/Makefile.am b/src/Makefile.am
index 3a3e8ab6cf42bd4942fe67f42548656cd839416b..af3c752636fe7bb22ec720469f32d2b68a353a76 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,7 +93,7 @@ test_passwd_LDADD = \
 test_window_SOURCES = \
 	test-window.c    \
 	gs-window.h      \
-	gs-window-x11.c  \
+	gs-window.c      \
 	gs-marshal.c     \
 	gs-marshal.h     \
 	gs-debug.c       \
@@ -132,7 +132,7 @@ test_window_LDADD = \
 
 if ENABLE_X11
 test_window_SOURCES += \
-	gs-grab-x11.c \
+	gs-grab.c \
 	gs-grab.h \
 	$(NULL)
 
@@ -254,7 +254,7 @@ xfce4_screensaver_SOURCES = \
 	gs-listener.h               \
 	gs-manager.c                \
 	gs-manager.h                \
-	gs-window-x11.c             \
+	gs-window.c                 \
 	gs-window.h                 \
 	gs-prefs.c                  \
 	gs-prefs.h                  \
@@ -297,7 +297,7 @@ if ENABLE_X11
 xfce4_screensaver_SOURCES += \
 	gs-listener-x11.c \
 	gs-listener-x11.h \
-	gs-grab-x11.c \
+	gs-grab.c \
 	gs-grab.h \
 	$(NULL)
 
diff --git a/src/gs-grab-x11.c b/src/gs-grab.c
similarity index 100%
rename from src/gs-grab-x11.c
rename to src/gs-grab.c
diff --git a/src/gs-window-x11.c b/src/gs-window.c
similarity index 100%
rename from src/gs-window-x11.c
rename to src/gs-window.c