diff --git a/Makefile.am b/Makefile.am
index ef1477f3..987a4784 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ core_sources = \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
 	src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \
 	src/ui/console.c src/ui/notifier.c \
-	src/ui/windows.c src/ui/windows.h \
+	src/window_list.c src/window_list.h \
 	src/ui/rosterwin.c src/ui/occupantswin.c \
 	src/ui/buffer.c src/ui/buffer.h \
 	src/command/command.h src/command/command.c \
@@ -57,7 +57,7 @@ unittest_sources = \
 	src/config/account.c src/config/account.h \
 	src/config/preferences.c src/config/preferences.h \
 	src/config/theme.c src/config/theme.h \
-	src/ui/windows.c src/ui/windows.h \
+	src/window_list.c src/window_list.h \
 	src/ui/window.c src/ui/window.h \
 	src/ui/buffer.c \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
diff --git a/src/command/command.c b/src/command/command.c
index c62c7784..00223b29 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -66,7 +66,7 @@
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 
 typedef char*(*autocompleter)(char*, int*);
 
diff --git a/src/command/commands.c b/src/command/commands.c
index 28cba7d7..e439c198 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -64,7 +64,7 @@
 #include "xmpp/xmpp.h"
 #include "xmpp/bookmark.h"
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "event/client_events.h"
 #include "event/ui_events.h"
 
diff --git a/src/event/client_events.c b/src/event/client_events.c
index 8f8501e1..7936a446 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -37,7 +37,7 @@
 #include "config.h"
 #include "log.h"
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "xmpp/xmpp.h"
 #ifdef HAVE_LIBOTR
 #include "otr/otr.h"
diff --git a/src/event/ui_events.c b/src/event/ui_events.c
index ff1d7273..11296739 100644
--- a/src/event/ui_events.c
+++ b/src/event/ui_events.c
@@ -33,7 +33,7 @@
  */
 
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 
 void
 ui_ev_focus_win(ProfWin *win)
@@ -53,4 +53,4 @@ ProfPrivateWin*
 ui_ev_new_private_win(const char * const fulljid)
 {
     return ui_new_private_win(fulljid);
-}
\ No newline at end of file
+}
diff --git a/src/muc.c b/src/muc.c
index d283b55e..8110f9a5 100644
--- a/src/muc.c
+++ b/src/muc.c
@@ -42,7 +42,7 @@
 #include "jid.h"
 #include "tools/autocomplete.h"
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "muc.h"
 
 typedef struct _muc_room_t {
@@ -978,4 +978,4 @@ _occupant_free(Occupant *occupant)
         free(occupant);
         occupant = NULL;
     }
-}
\ No newline at end of file
+}
diff --git a/src/profanity.c b/src/profanity.c
index 0908c658..e2372548 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -62,7 +62,7 @@
 #include "resource.h"
 #include "xmpp/xmpp.h"
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "event/client_events.h"
 
 static void _check_autoaway(void);
diff --git a/src/ui/console.c b/src/ui/console.c
index 1fa8b7b1..5f6b1ef0 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -50,7 +50,7 @@
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "ui/window.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "xmpp/xmpp.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index e2efcb55..78a5e026 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -72,7 +72,7 @@
 #include "ui/statusbar.h"
 #include "ui/inputwin.h"
 #include "ui/window.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "xmpp/xmpp.h"
 #include "event/ui_events.h"
 
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 6ef829a7..1cbf5249 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -62,7 +62,7 @@
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "ui/inputwin.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "event/ui_events.h"
 #include "xmpp/xmpp.h"
 
diff --git a/src/ui/notifier.c b/src/ui/notifier.c
index 76290daf..12367190 100644
--- a/src/ui/notifier.c
+++ b/src/ui/notifier.c
@@ -48,7 +48,7 @@
 #include "log.h"
 #include "muc.h"
 #include "ui/ui.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "config/preferences.h"
 
 static void _notify(const char * const message, int timeout, const char * const category);
diff --git a/src/ui/occupantswin.c b/src/ui/occupantswin.c
index bba9d0b9..fe4a600c 100644
--- a/src/ui/occupantswin.c
+++ b/src/ui/occupantswin.c
@@ -36,7 +36,7 @@
 
 #include "ui/ui.h"
 #include "ui/window.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "config/preferences.h"
 
 static void
@@ -124,4 +124,4 @@ occupantswin_occupants(const char * const roomjid)
 
         g_list_free(occupants);
     }
-}
\ No newline at end of file
+}
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index 763490c3..00bc28a4 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -38,7 +38,7 @@
 #include "contact.h"
 #include "ui/ui.h"
 #include "ui/window.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "config/preferences.h"
 #include "roster_list.h"
 
@@ -192,4 +192,4 @@ rosterwin_roster(void)
         }
         free(by);
     }
-}
\ No newline at end of file
+}
diff --git a/src/ui/titlebar.c b/src/ui/titlebar.c
index 55710c7a..746d2782 100644
--- a/src/ui/titlebar.c
+++ b/src/ui/titlebar.c
@@ -44,7 +44,7 @@
 #include "ui/ui.h"
 #include "ui/titlebar.h"
 #include "ui/inputwin.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "ui/window.h"
 #include "roster_list.h"
 #include "chat_session.h"
diff --git a/src/ui/windows.c b/src/window_list.c
similarity index 99%
rename from src/ui/windows.c
rename to src/window_list.c
index 6472ce0c..40bc30e2 100644
--- a/src/ui/windows.c
+++ b/src/window_list.c
@@ -1,5 +1,5 @@
 /*
- * windows.c
+ * window_list.c
  *
  * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
  *
@@ -46,7 +46,7 @@
 #include "ui/ui.h"
 #include "ui/statusbar.h"
 #include "ui/window.h"
-#include "ui/windows.h"
+#include "window_list.h"
 #include "event/ui_events.h"
 
 static GHashTable *windows;
diff --git a/src/ui/windows.h b/src/window_list.h
similarity index 98%
rename from src/ui/windows.h
rename to src/window_list.h
index 4c753c03..48910461 100644
--- a/src/ui/windows.h
+++ b/src/window_list.h
@@ -1,5 +1,5 @@
 /*
- * windows.h
+ * window_list.h
  *
  * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
  *
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef UI_WINDOWS_H
-#define UI_WINDOWS_H
+#ifndef WINDOW_LIST_H
+#define WINDOW_LIST_H
 
 #include "ui/window.h"