diff --git a/Makefile.am b/Makefile.am
index 5de143b6..b49ce24a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = profanity
-profanity_SOURCES = src/command.c src/contact.c src/history.c src/xmpp.h \
+profanity_SOURCES = src/command.c src/contact.c src/command_history.c src/xmpp.h \
 	src/preferences.c src/autocomplete.c src/ui_statusbar.c \
-	src/command.h src/contact.h src/history.h src/log.c src/preferences.h \
+	src/command.h src/contact.h src/log.c src/preferences.h \
 	src/autocomplete.h src/ui_titlebar.c src/ui_windows.c src/common.c \
 	src/contact_list.c src/ui_inputwin.c src/log.h src/profanity.c \
 	src/prof_history.c src/ui.h src/common.h src/ contact_list.h src/xmpp_conn.c \
diff --git a/src/command.c b/src/command.c
index 767081af..788d8bfd 100644
--- a/src/command.c
+++ b/src/command.c
@@ -34,7 +34,6 @@
 #include "contact.h"
 #include "contact_list.h"
 #include "chat_log.h"
-#include "history.h"
 #include "jid.h"
 #include "log.h"
 #include "parser.h"
diff --git a/src/command.h b/src/command.h
index f7e38954..f54e841e 100644
--- a/src/command.h
+++ b/src/command.h
@@ -45,4 +45,9 @@ GSList * cmd_get_basic_help(void);
 GSList * cmd_get_settings_help(void);
 GSList * cmd_get_presence_help(void);
 
+void history_init(void);
+void history_append(char *inp);
+char *history_previous(char *inp, int *size);
+char *history_next(char *inp, int *size);
+
 #endif
diff --git a/src/history.c b/src/command_history.c
similarity index 98%
rename from src/history.c
rename to src/command_history.c
index d7e360c1..1b918a95 100644
--- a/src/history.c
+++ b/src/command_history.c
@@ -1,5 +1,5 @@
 /*
- * history.c
+ * command_history.c
  *
  * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
  *
diff --git a/src/history.h b/src/history.h
deleted file mode 100644
index 0b9f3b30..00000000
--- a/src/history.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * history.h
- *
- * Copyright (C) 2012, 2013 James Booth <boothj5@gmail.com>
- *
- * This file is part of Profanity.
- *
- * Profanity 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 3 of the License, or
- * (at your option) any later version.
- *
- * Profanity 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 Profanity.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef HISTORY_H
-#define HISTORY_H
-
-void history_init(void);
-void history_append(char *inp);
-char *history_previous(char *inp, int *size);
-char *history_next(char *inp, int *size);
-
-#endif
diff --git a/src/profanity.c b/src/profanity.c
index 9ee3775f..a6cafacc 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -37,7 +37,6 @@
 #include "contact.h"
 #include "contact_list.h"
 #include "files.h"
-#include "history.h"
 #include "log.h"
 #include "preferences.h"
 #include "profanity.h"
diff --git a/src/ui_inputwin.c b/src/ui_inputwin.c
index f4e70d95..58818a9e 100644
--- a/src/ui_inputwin.c
+++ b/src/ui_inputwin.c
@@ -36,7 +36,6 @@
 #include "common.h"
 #include "command.h"
 #include "contact_list.h"
-#include "history.h"
 #include "log.h"
 #include "preferences.h"
 #include "profanity.h"