9 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index e70b5df04..dd991f2f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,6 @@ mpd_headers = \
 	src/stats.h \
 	src/tag.h \
 	src/tag_internal.h \
-	src/tag_table.h \
 	src/Timer.hxx \
 	src/mpd_error.h
 
@@ -222,6 +221,7 @@ src_mpd_SOURCES = \
 	src/StateFile.cxx src/StateFile.hxx \
 	src/Stats.cxx \
 	src/Tag.cxx \
+	src/TagTable.hxx \
 	src/TagNames.c \
 	src/TagPool.cxx src/TagPool.hxx \
 	src/TagPrint.cxx src/TagPrint.hxx \
diff --git a/src/ApeTag.cxx b/src/ApeTag.cxx
index 7713310c1..e0ef24c75 100644
--- a/src/ApeTag.cxx
+++ b/src/ApeTag.cxx
@@ -21,7 +21,7 @@
 #include "ApeTag.hxx"
 #include "ApeLoader.hxx"
 #include "tag.h"
-#include "tag_table.h"
+#include "TagTable.hxx"
 #include "TagHandler.hxx"
 
 const struct tag_table ape_tags[] = {
diff --git a/src/ApeTag.hxx b/src/ApeTag.hxx
index 3e6655531..96b53612b 100644
--- a/src/ApeTag.hxx
+++ b/src/ApeTag.hxx
@@ -20,7 +20,7 @@
 #ifndef MPD_APE_TAG_HXX
 #define MPD_APE_TAG_HXX
 
-#include "tag_table.h"
+#include "TagTable.hxx"
 
 #include <stdbool.h>
 
diff --git a/src/TagId3.cxx b/src/TagId3.cxx
index c5719f481..7f033b5c4 100644
--- a/src/TagId3.cxx
+++ b/src/TagId3.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "TagId3.hxx"
 #include "TagHandler.hxx"
-#include "tag_table.h"
+#include "TagTable.hxx"
 #include "tag.h"
 
 extern "C" {
diff --git a/src/tag_table.h b/src/TagTable.hxx
index 8e2172c18..0d249d181 100644
--- a/src/tag_table.h
+++ b/src/TagTable.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_TAG_TABLE_H
-#define MPD_TAG_TABLE_H
+#ifndef MPD_TAG_TABLE_HXX
+#define MPD_TAG_TABLE_HXX
 
 #include "tag.h"
 #include "gcc.h"
@@ -40,7 +40,7 @@ gcc_pure
 static inline enum tag_type
 tag_table_lookup(const struct tag_table *table, const char *name)
 {
-	for (; table->name != NULL; ++table)
+	for (; table->name != nullptr; ++table)
 		if (strcmp(name, table->name) == 0)
 			return table->type;
 
@@ -56,7 +56,7 @@ gcc_pure
 static inline enum tag_type
 tag_table_lookup_i(const struct tag_table *table, const char *name)
 {
-	for (; table->name != NULL; ++table)
+	for (; table->name != nullptr; ++table)
 		if (g_ascii_strcasecmp(name, table->name) == 0)
 			return table->type;
 
diff --git a/src/decoder/FfmpegMetaData.cxx b/src/decoder/FfmpegMetaData.cxx
index 509aaf947..c383245d0 100644
--- a/src/decoder/FfmpegMetaData.cxx
+++ b/src/decoder/FfmpegMetaData.cxx
@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "FfmpegMetaData.hxx"
-#include "tag_table.h"
+#include "TagTable.hxx"
 #include "TagHandler.hxx"
 
 #undef G_LOG_DOMAIN
diff --git a/src/decoder/FlacMetadata.cxx b/src/decoder/FlacMetadata.cxx
index 9c227e546..64f091c04 100644
--- a/src/decoder/FlacMetadata.cxx
+++ b/src/decoder/FlacMetadata.cxx
@@ -22,7 +22,7 @@
 #include "XiphTags.hxx"
 #include "tag.h"
 #include "TagHandler.hxx"
-#include "tag_table.h"
+#include "TagTable.hxx"
 #include "replay_gain_info.h"
 
 #include <glib.h>
diff --git a/src/decoder/VorbisComments.cxx b/src/decoder/VorbisComments.cxx
index dfb9dc314..a2bec30f1 100644
--- a/src/decoder/VorbisComments.cxx
+++ b/src/decoder/VorbisComments.cxx
@@ -21,7 +21,7 @@
 #include "VorbisComments.hxx"
 #include "XiphTags.hxx"
 #include "tag.h"
-#include "tag_table.h"
+#include "TagTable.hxx"
 #include "TagHandler.hxx"
 #include "replay_gain_info.h"
 
diff --git a/src/decoder/XiphTags.hxx b/src/decoder/XiphTags.hxx
index 03a75b731..43a1d3ec7 100644
--- a/src/decoder/XiphTags.hxx
+++ b/src/decoder/XiphTags.hxx
@@ -21,7 +21,7 @@
 #define MPD_XIPH_TAGS_HXX
 
 #include "check.h"
-#include "tag_table.h"
+#include "TagTable.hxx"
 
 extern const struct tag_table xiph_tags[];