10 files changed, 13 insertions, 16 deletions
diff --git a/src/DatabaseSave.cxx b/src/DatabaseSave.cxx
index 0424fbe29..5bd50f55f 100644
--- a/src/DatabaseSave.cxx
+++ b/src/DatabaseSave.cxx
@@ -23,10 +23,10 @@
 #include "Directory.hxx"
 #include "DirectorySave.hxx"
 #include "song.h"
+#include "TextFile.hxx"
 
 extern "C" {
 #include "path.h"
-#include "text_file.h"
 #include "tag.h"
 #include "tag_internal.h"
 }
diff --git a/src/DirectorySave.cxx b/src/DirectorySave.cxx
index cd750c9b2..9c5df685f 100644
--- a/src/DirectorySave.cxx
+++ b/src/DirectorySave.cxx
@@ -23,10 +23,7 @@
 #include "song.h"
 #include "SongSave.hxx"
 #include "PlaylistDatabase.hxx"
-
-extern "C" {
-#include "text_file.h"
-}
+#include "TextFile.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx
index 4604a8956..984af4adc 100644
--- a/src/PlaylistDatabase.cxx
+++ b/src/PlaylistDatabase.cxx
@@ -20,9 +20,9 @@
 #include "config.h"
 #include "PlaylistDatabase.hxx"
 #include "PlaylistVector.hxx"
+#include "TextFile.hxx"
 
 extern "C" {
-#include "text_file.h"
 #include "string_util.h"
 }
 
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index 7459bd69a..e03cc5e54 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -25,9 +25,9 @@
 #include "song.h"
 #include "io_error.h"
 #include "Mapper.hxx"
+#include "TextFile.hxx"
 
 extern "C" {
-#include "text_file.h"
 #include "path.h"
 #include "uri.h"
 #include "idle.h"
diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx
index 0cfd32723..c45c2a834 100644
--- a/src/PlaylistState.cxx
+++ b/src/PlaylistState.cxx
@@ -25,11 +25,11 @@
 #include "config.h"
 #include "PlaylistState.hxx"
 #include "QueueSave.hxx"
+#include "TextFile.hxx"
 
 extern "C" {
 #include "playlist.h"
 #include "player_control.h"
-#include "text_file.h"
 #include "conf.h"
 }
 
diff --git a/src/QueueSave.cxx b/src/QueueSave.cxx
index d8b698a9a..a468013f4 100644
--- a/src/QueueSave.cxx
+++ b/src/QueueSave.cxx
@@ -23,11 +23,11 @@
 #include "SongSave.hxx"
 #include "DatabasePlugin.hxx"
 #include "DatabaseGlue.hxx"
+#include "TextFile.hxx"
 
 extern "C" {
 #include "queue.h"
 #include "uri.h"
-#include "text_file.h"
 }
 
 #include <stdlib.h>
diff --git a/src/SongSave.cxx b/src/SongSave.cxx
index 1aaf15481..cbc2536b1 100644
--- a/src/SongSave.cxx
+++ b/src/SongSave.cxx
@@ -22,10 +22,10 @@
 #include "song.h"
 #include "TagSave.hxx"
 #include "Directory.hxx"
+#include "TextFile.hxx"
 
 extern "C" {
 #include "tag.h"
-#include "text_file.h"
 #include "string_util.h"
 }
 
diff --git a/src/StateFile.cxx b/src/StateFile.cxx
index 6635d9f9d..5af60ddba 100644
--- a/src/StateFile.cxx
+++ b/src/StateFile.cxx
@@ -22,10 +22,10 @@
 #include "OutputState.hxx"
 #include "playlist.h"
 #include "PlaylistState.hxx"
+#include "TextFile.hxx"
 
 extern "C" {
 #include "volume.h"
-#include "text_file.h"
 }
 
 #include <glib.h>
diff --git a/src/text_file.c b/src/TextFile.cxx
index 3674e5ce2..ec9c5d442 100644
--- a/src/text_file.c
+++ b/src/TextFile.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
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "text_file.h"
+#include "TextFile.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/text_file.h b/src/TextFile.hxx
index 9dd810943..5bd6dbd3c 100644
--- a/src/text_file.h
+++ b/src/TextFile.hxx
@@ -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
@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MPD_TEXT_FILE_H
-#define MPD_TEXT_FILE_H
+#ifndef MPD_TEXT_FILE_HXX
+#define MPD_TEXT_FILE_HXX
 
 #include <glib.h>