diff --git a/include/FLAC/Makefile.am b/include/FLAC/Makefile.am
index a0923e6c..2970dbec 100644
--- a/include/FLAC/Makefile.am
+++ b/include/FLAC/Makefile.am
@@ -22,9 +22,9 @@ include_HEADERS = \
 	assert.h \
 	file_decoder.h \
 	format.h \
+	metadata.h \
 	ordinals.h \
 	seek_table.h \
 	seekable_stream_decoder.h \
 	stream_decoder.h \
-	stream_encoder.h \
-	utility.h
+	stream_encoder.h
diff --git a/include/FLAC/all.h b/include/FLAC/all.h
index 244c0089..293cdc57 100644
--- a/include/FLAC/all.h
+++ b/include/FLAC/all.h
@@ -23,11 +23,11 @@
 #include "assert.h"
 #include "file_decoder.h"
 #include "format.h"
+#include "metadata.h"
 #include "ordinals.h"
 #include "seek_table.h"
 #include "seekable_stream_decoder.h"
 #include "stream_decoder.h"
 #include "stream_encoder.h"
-#include "utility.h"
 
 #endif