diff --git a/src/Makefile.am b/src/Makefile.am
index bfb028c8..31d52363 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,8 @@
 bin_PROGRAMS = ncmpcpp
 ncmpcpp_SOURCES = browser.cpp charset.cpp clock.cpp conv.cpp display.cpp \
 	error.cpp help.cpp helpers.cpp info.cpp lyrics.cpp media_library.cpp menu.cpp \
-	misc.cpp mpdpp.cpp ncmpcpp.cpp outputs.cpp playlist.cpp playlist_editor.cpp \
-	scrollpad.cpp search_engine.cpp server_info.cpp settings.cpp song.cpp status.cpp \
+	mpdpp.cpp ncmpcpp.cpp outputs.cpp playlist.cpp playlist_editor.cpp scrollpad.cpp \
+	search_engine.cpp sel_items_adder.cpp server_info.cpp settings.cpp song.cpp status.cpp \
 	tag_editor.cpp tiny_tag_editor.cpp tolower.cpp visualizer.cpp window.cpp
 
 # set the include path found by configure
@@ -11,6 +11,7 @@ INCLUDES= $(all_includes)
 # the library search path.
 ncmpcpp_LDFLAGS = $(all_libraries)
 noinst_HEADERS = browser.h charset.h clock.h conv.h display.h error.h global.h \
-	help.h helpers.h home.h info.h lyrics.h media_library.h menu.h misc.h mpdpp.h \
-	outputs.h playlist_editor.h screen.h scrollpad.h search_engine.h server_info.h \
-	settings.h song.h tag_editor.h tiny_tag_editor.h tolower.h visualizer.h window.h
+	help.h helpers.h home.h info.h lyrics.h media_library.h menu.h mpdpp.h \
+	outputs.h playlist_editor.h screen.h scrollpad.h search_engine.h \
+	sel_items_adder.h server_info.h settings.h song.h tag_editor.h tiny_tag_editor.h \
+	tolower.h visualizer.h window.h
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 77fdf8a5..7aab62fd 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -39,7 +39,7 @@
 #include "help.h"
 #include "helpers.h"
 #include "media_library.h"
-#include "misc.h"
+#include "sel_items_adder.h"
 #include "server_info.h"
 #include "lyrics.h"
 #include "playlist.h"
diff --git a/src/misc.cpp b/src/sel_items_adder.cpp
similarity index 99%
rename from src/misc.cpp
rename to src/sel_items_adder.cpp
index 0003d01e..79f82a7d 100644
--- a/src/misc.cpp
+++ b/src/sel_items_adder.cpp
@@ -22,10 +22,10 @@
 #include "browser.h"
 #include "display.h"
 #include "global.h"
-#include "misc.h"
 #include "mpdpp.h"
 #include "playlist.h"
 #include "playlist_editor.h"
+#include "sel_items_adder.h"
 
 using Global::MainHeight;
 using Global::MainStartY;
diff --git a/src/misc.h b/src/sel_items_adder.h
similarity index 97%
rename from src/misc.h
rename to src/sel_items_adder.h
index c2d6a199..d58702af 100644
--- a/src/misc.h
+++ b/src/sel_items_adder.h
@@ -18,8 +18,8 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef _MISC_H
-#define _MISC_H
+#ifndef _SEL_ITEMS_ADDER_H
+#define _SEL_ITEMS_ADDER_H
 
 #include "ncmpcpp.h"
 #include "screen.h"
diff --git a/src/status.cpp b/src/status.cpp
index 16cfb2c1..9a4d79f7 100644
--- a/src/status.cpp
+++ b/src/status.cpp
@@ -30,11 +30,11 @@
 #include "helpers.h"
 #include "lyrics.h"
 #include "media_library.h"
-#include "misc.h"
 #include "outputs.h"
 #include "playlist.h"
 #include "playlist_editor.h"
 #include "search_engine.h"
+#include "sel_items_adder.h"
 #include "settings.h"
 #include "status.h"
 #include "tag_editor.h"