7 files changed, 8 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 96a835af8..fe24dd2cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -311,7 +311,7 @@ libpcm_a_SOURCES = \
 	src/pcm/PcmVolume.cxx src/pcm/PcmVolume.hxx \
 	src/pcm/PcmMix.cxx src/pcm/PcmMix.hxx \
 	src/pcm/PcmChannels.cxx src/pcm/PcmChannels.hxx \
-	src/pcm/pcm_pack.c src/pcm/pcm_pack.h \
+	src/pcm/PcmPack.cxx src/pcm/PcmPack.hxx \
 	src/pcm/PcmFormat.cxx src/pcm/PcmFormat.hxx \
 	src/pcm/PcmResample.cxx src/pcm/PcmResample.hxx \
 	src/pcm/PcmResampleFallback.cxx \
diff --git a/src/pcm/PcmConvert.cxx b/src/pcm/PcmConvert.cxx
index 95361ee1b..6061aee88 100644
--- a/src/pcm/PcmConvert.cxx
+++ b/src/pcm/PcmConvert.cxx
@@ -21,7 +21,6 @@
 #include "PcmConvert.hxx"
 #include "PcmChannels.hxx"
 #include "PcmFormat.hxx"
-#include "pcm_pack.h"
 #include "AudioFormat.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/pcm/PcmExport.cxx b/src/pcm/PcmExport.cxx
index 762411f59..389670b6f 100644
--- a/src/pcm/PcmExport.cxx
+++ b/src/pcm/PcmExport.cxx
@@ -20,9 +20,9 @@
 #include "config.h"
 #include "PcmExport.hxx"
 #include "PcmDsdUsb.hxx"
+#include "PcmPack.hxx"
 
 extern "C" {
-#include "pcm_pack.h"
 #include "util/byte_reverse.h"
 }
 
diff --git a/src/pcm/PcmFormat.cxx b/src/pcm/PcmFormat.cxx
index b4307ca1f..a0de163ba 100644
--- a/src/pcm/PcmFormat.cxx
+++ b/src/pcm/PcmFormat.cxx
@@ -21,7 +21,6 @@
 #include "PcmFormat.hxx"
 #include "PcmDither.hxx"
 #include "PcmBuffer.hxx"
-#include "pcm_pack.h"
 #include "PcmUtils.hxx"
 
 #include <type_traits>
diff --git a/src/pcm/pcm_pack.c b/src/pcm/PcmPack.cxx
index 921d880c0..fa020bf63 100644
--- a/src/pcm/pcm_pack.c
+++ b/src/pcm/PcmPack.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
@@ -17,7 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "pcm_pack.h"
+#include "PcmPack.hxx"
 
 #include <glib.h>
 
diff --git a/src/pcm/pcm_pack.h b/src/pcm/PcmPack.hxx
index f3184b403..aed011767 100644
--- a/src/pcm/pcm_pack.h
+++ b/src/pcm/PcmPack.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
@@ -22,10 +22,9 @@
  * Library for working with packed 24 bit samples.
  */
 
-#ifndef PCM_PACK_H
-#define PCM_PACK_H
+#ifndef PCM_PACK_HXX
+#define PCM_PACK_HXX
 
-#include <stdbool.h>
 #include <stdint.h>
 
 /**
diff --git a/test/test_pcm_pack.cxx b/test/test_pcm_pack.cxx
index 313948838..4c105ce08 100644
--- a/test/test_pcm_pack.cxx
+++ b/test/test_pcm_pack.cxx
@@ -19,10 +19,7 @@
 
 #include "test_pcm_all.hxx"
 #include "test_pcm_util.hxx"
-
-extern "C" {
-#include "pcm/pcm_pack.h"
-}
+#include "pcm/PcmPack.hxx"
 
 #include <glib.h>