diff --git a/Makefile.am b/Makefile.am
index aad7352dd..563c5f6eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,7 +93,6 @@ mpd_headers = \
 	src/tag_table.h \
 	src/tag_ape.h \
 	src/tag_id3.h \
-	src/tag_rva2.h \
 	src/Timer.hxx \
 	src/mpd_error.h
 
@@ -441,7 +440,7 @@ libtag_a_SOURCES =\
 if HAVE_ID3TAG
 libtag_a_SOURCES += \
 	src/tag_id3.c \
-	src/tag_rva2.c \
+	src/TagRva2.cxx src/TagRva2.hxx \
 	src/riff.c src/aiff.c
 endif
 
@@ -1189,11 +1188,11 @@ if HAVE_ID3TAG
 test_dump_rva2_LDADD = \
 	$(ID3TAG_LIBS) \
 	$(GLIB_LIBS)
-test_dump_rva2_SOURCES = test/dump_rva2.c \
+test_dump_rva2_SOURCES = test/dump_rva2.cxx \
 	src/riff.c src/aiff.c \
 	src/tag_handler.c \
 	src/tag_id3.c \
-	src/tag_rva2.c
+	src/TagRva2.cxx
 endif
 
 test_run_filter_LDADD = \
diff --git a/src/tag_rva2.c b/src/TagRva2.cxx
similarity index 95%
rename from src/tag_rva2.c
rename to src/TagRva2.cxx
index 9250311b9..f41119c35 100644
--- a/src/tag_rva2.c
+++ b/src/TagRva2.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 "tag_rva2.h"
+#include "TagRva2.hxx"
 #include "replay_gain_info.h"
 
 #include <stdint.h>
@@ -102,7 +102,7 @@ rva2_apply_frame(struct replay_gain_info *replay_gain_info,
 	const id3_byte_t *data =
 		id3_field_getbinarydata(id3_frame_field(frame, 1), &length);
 
-	if (id == NULL || data == NULL)
+	if (id == nullptr || data == nullptr)
 		return false;
 
 	/*
@@ -141,7 +141,7 @@ tag_rva2_parse(struct id3_tag *tag, struct replay_gain_info *replay_gain_info)
 	   track and album gain in separate tags */
 	const struct id3_frame *frame;
 	for (unsigned i = 0;
-	     (frame = id3_tag_findframe(tag, "RVA2", i)) != NULL;
+	     (frame = id3_tag_findframe(tag, "RVA2", i)) != nullptr;
 	     ++i)
 		if (rva2_apply_frame(replay_gain_info, frame))
 			found = true;
diff --git a/src/tag_rva2.h b/src/TagRva2.hxx
similarity index 90%
rename from src/tag_rva2.h
rename to src/TagRva2.hxx
index 8aac2fe9f..057f03186 100644
--- a/src/tag_rva2.h
+++ b/src/TagRva2.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_RVA2_H
-#define MPD_TAG_RVA2_H
+#ifndef MPD_TAG_RVA2_HXX
+#define MPD_TAG_RVA2_HXX
 
 #include "check.h"
 
diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx
index 339fd5397..a8b607386 100644
--- a/src/decoder/MadDecoderPlugin.cxx
+++ b/src/decoder/MadDecoderPlugin.cxx
@@ -24,9 +24,9 @@
 
 extern "C" {
 #include "tag_id3.h"
-#include "tag_rva2.h"
 }
 
+#include "TagRva2.hxx"
 #include "tag_handler.h"
 #include "audio_check.h"
 
diff --git a/test/dump_rva2.c b/test/dump_rva2.cxx
similarity index 96%
rename from test/dump_rva2.c
rename to test/dump_rva2.cxx
index 6e978c424..e58b8cd30 100644
--- a/test/dump_rva2.c
+++ b/test/dump_rva2.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2012 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,8 +18,10 @@
  */
 
 #include "config.h"
+extern "C" {
 #include "tag_id3.h"
-#include "tag_rva2.h"
+}
+#include "TagRva2.hxx"
 #include "replay_gain_info.h"
 #include "conf.h"
 #include "tag.h"