5 files changed, 7 insertions, 10 deletions
diff --git a/src/CommandError.cxx b/src/CommandError.cxx
index 7e777d82a..7a33761ae 100644
--- a/src/CommandError.cxx
+++ b/src/CommandError.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "CommandError.hxx"
-#include "db_error.h"
+#include "DatabaseError.hxx"
 #include "io_error.h"
 #include "protocol/Result.hxx"
 
diff --git a/src/db_error.h b/src/DatabaseError.hxx
index 05946aaf1..3827daff0 100644
--- a/src/db_error.h
+++ b/src/DatabaseError.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_DB_ERROR_H
-#define MPD_DB_ERROR_H
+#ifndef MPD_DB_ERROR_HXX
+#define MPD_DB_ERROR_HXX
 
 #include "gcc.h"
 
diff --git a/src/DatabaseGlue.cxx b/src/DatabaseGlue.cxx
index e2076be28..70b7acc9e 100644
--- a/src/DatabaseGlue.cxx
+++ b/src/DatabaseGlue.cxx
@@ -22,11 +22,11 @@
 #include "DatabaseSimple.hxx"
 #include "DatabaseRegistry.hxx"
 #include "DatabaseSave.hxx"
+#include "DatabaseError.hxx"
 #include "Directory.hxx"
 #include "conf.h"
 
 extern "C" {
-#include "db_error.h"
 #include "stats.h"
 }
 
diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx
index 638a801d4..81aad0a4c 100644
--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/ProxyDatabasePlugin.cxx
@@ -21,6 +21,7 @@
 #include "ProxyDatabasePlugin.hxx"
 #include "DatabasePlugin.hxx"
 #include "DatabaseSelection.hxx"
+#include "DatabaseError.hxx"
 #include "PlaylistVector.hxx"
 #include "Directory.hxx"
 #include "Song.hxx"
@@ -28,10 +29,6 @@
 #include "conf.h"
 #include "Tag.hxx"
 
-extern "C" {
-#include "db_error.h"
-}
-
 #undef MPD_DIRECTORY_H
 #undef MPD_SONG_H
 #include <mpd/client.h>
diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx
index 373064c3f..21eb8752d 100644
--- a/src/db/SimpleDatabasePlugin.cxx
+++ b/src/db/SimpleDatabasePlugin.cxx
@@ -25,7 +25,7 @@
 #include "SongFilter.hxx"
 #include "DatabaseSave.hxx"
 #include "DatabaseLock.hxx"
-#include "db_error.h"
+#include "DatabaseError.hxx"
 #include "TextFile.hxx"
 #include "conf.h"
 #include "fs/FileSystem.hxx"