diff --git a/Makefile.am b/Makefile.am
index 0f6271aa5..56f63b28b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -289,7 +289,7 @@ src_mpd_SOURCES = \
 	src/playlist.c \
 	src/playlist_global.c \
 	src/playlist_control.c \
-	src/playlist_edit.c \
+	src/PlaylistEdit.cxx \
 	src/PlaylistPrint.cxx src/PlaylistPrint.hxx \
 	src/PlaylistSave.cxx src/PlaylistSave.hxx \
 	src/PlaylistMapper.cxx src/PlaylistMapper.hxx \
diff --git a/src/playlist_edit.c b/src/PlaylistEdit.cxx
similarity index 99%
rename from src/playlist_edit.c
rename to src/PlaylistEdit.cxx
index 2b7cdd8ae..76e102862 100644
--- a/src/playlist_edit.c
+++ b/src/PlaylistEdit.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,12 +24,14 @@
  */
 
 #include "config.h"
+extern "C" {
 #include "playlist_internal.h"
 #include "player_control.h"
 #include "database.h"
 #include "uri.h"
 #include "song.h"
 #include "idle.h"
+}
 
 #include <stdlib.h>