diff --git a/Documentation/mboxd.md b/Documentation/mboxd.md
index 407ada6..ce82ad8 100644
--- a/Documentation/mboxd.md
+++ b/Documentation/mboxd.md
@@ -31,7 +31,7 @@
                   including pointing the bus so it maps flash and memory.
 mboxd_msg.c -     Contains the handlers for the mbox commands which the daemon
                   can receive.
-mboxd_windows.c - Contains the functions for managing the window cache.
+windows.c - Contains the functions for managing the window cache.
 ```
 
 ## Daemon State
diff --git a/Makefile.am b/Makefile.am
index dd3fcc1..5e12147 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 	control_dbus.c \
 	lpc.c \
 	mboxd_msg.c \
-	mboxd_windows.c \
+	windows.c \
 	mtd.c
 mboxd_LDFLAGS = $(LIBSYSTEMD_LIBS)
 mboxd_CFLAGS = $(LIBSYSTEMD_CFLAGS)
diff --git a/control.c b/control.c
index 92ad21e..eff4f7e 100644
--- a/control.c
+++ b/control.c
@@ -8,7 +8,7 @@
 #include "flash.h"
 #include "lpc.h"
 #include "mboxd_msg.h"
-#include "mboxd_windows.h"
+#include "windows.h"
 
 int control_ping(struct mbox_context *context)
 {
diff --git a/mboxd.c b/mboxd.c
index 634ae03..2e9f10f 100644
--- a/mboxd.c
+++ b/mboxd.c
@@ -34,7 +34,7 @@
 #include "flash.h"
 #include "lpc.h"
 #include "mboxd_msg.h"
-#include "mboxd_windows.h"
+#include "windows.h"
 #include "vpnor/mboxd_pnor_partition_table.h"
 
 #define USAGE \
diff --git a/mboxd_msg.c b/mboxd_msg.c
index 5d92960..5eae6d6 100644
--- a/mboxd_msg.c
+++ b/mboxd_msg.c
@@ -27,7 +27,7 @@
 #include "mbox.h"
 #include "common.h"
 #include "mboxd_msg.h"
-#include "mboxd_windows.h"
+#include "windows.h"
 #include "lpc.h"
 
 /*
diff --git a/test/Makefile.am.include b/test/Makefile.am.include
index 3af58e5..d85dac3 100644
--- a/test/Makefile.am.include
+++ b/test/Makefile.am.include
@@ -20,7 +20,7 @@
 
 TEST_MBOX_SRCS = \
 	mboxd_msg.c \
-	mboxd_windows.c \
+	windows.c \
 	lpc.c \
 	lpc_reset.c \
 	common.c \
diff --git a/test/mbox.c b/test/mbox.c
index 3375810..1ec5698 100644
--- a/test/mbox.c
+++ b/test/mbox.c
@@ -17,7 +17,7 @@
 #include "flash.h"
 #include "lpc.h"
 #include "mboxd_msg.h"
-#include "mboxd_windows.h"
+#include "windows.h"
 
 #include "test/mbox.h"
 
diff --git a/vpnor/test/Makefile.am.include b/vpnor/test/Makefile.am.include
index d1c37c1..f0c6b1d 100644
--- a/vpnor/test/Makefile.am.include
+++ b/vpnor/test/Makefile.am.include
@@ -6,7 +6,7 @@
 TEST_MBOX_VPNOR_INTEG_SRCS = \
 	common.c \
 	mboxd_msg.c \
-	mboxd_windows.c \
+	windows.c \
 	lpc.c \
 	vpnor/lpc_reset.cpp \
 	vpnor/mboxd_pnor_partition_table.cpp \
diff --git a/mboxd_windows.c b/windows.c
similarity index 99%
rename from mboxd_windows.c
rename to windows.c
index c7d223e..762054a 100644
--- a/mboxd_windows.c
+++ b/windows.c
@@ -28,7 +28,7 @@
 #include "mbox.h"
 #include "common.h"
 #include "mboxd_msg.h"
-#include "mboxd_windows.h"
+#include "windows.h"
 #include "flash.h"
 
 /* Initialisation Functions */
diff --git a/mboxd_windows.h b/windows.h
similarity index 100%
rename from mboxd_windows.h
rename to windows.h