Fix includes.

sed -i "s/#include \"stereo_picture_asset_writer.h\"/#include \"stereo_j2k_picture_asset_writer.h\""/g src/*.{cc,h}
sed -i "s/#include \"mono_picture_asset_writer.h\"/#include \"mono_j2k_picture_asset_writer.h\""/g src/*.{cc,h} examples/*.cc
sed -i "s/#include \"stereo_picture_asset_reader.h\"/#include \"stereo_j2k_picture_asset_reader.h\""/g src/*.{cc,h}
sed -i "s/#include \"mono_picture_asset_reader.h\"/#include \"mono_j2k_picture_asset_reader.h\""/g src/*.{cc,h} test/*.cc examples/*.cc
sed -i "s/#include \"stereo_picture_asset.h\"/#include \"stereo_j2k_picture_asset.h\""/g src/*.{cc,h} test/*.cc examples/*.cc
sed -i "s/#include \"mono_picture_asset.h\"/#include \"mono_j2k_picture_asset.h\""/g src/*.{cc,h} examples/*.cc
sed -i "s/#include \"picture_asset_writer.h\"/#include \"j2k_picture_asset_writer.h\""/g src/*.{cc,h} test/*.cc
sed -i "s/#include \"mono_picture_asset_writer.h\"/#include \"mono_j2k_picture_asset_writer.h\""/g src/*.{cc,h} test/*.cc tools/*.cc
sed -i "s/#include \"picture_asset.h\"/#include \"j2k_picture_asset.h\""/g src/*.{cc,h} tools/*.cc
sed -i "s/#include \"mono_picture_asset.h\"/#include \"mono_j2k_picture_asset.h\""/g src/*.{cc,h} test/*.cc tools/*.cc
sed -i "s/#include \"mono_picture_frame.h\"/#include \"mono_j2k_picture_frame.h\""/g src/*.{cc,h} test/*.cc examples/*.cc
sed -i "s/#include \"stereo_picture_frame.h\"/#include \"stereo_j2k_picture_frame.h\""/g src/*.{cc,h}
sed -i "s/#include \"picture_asset_writer_common.cc\"/#include \"j2k_picture_asset_writer_common.cc\""/g src/*.{cc,h}

39 files changed, 85 insertions, 85 deletions

diff --git a/examples/make_dcp.cc b/examples/make_dcp.cc
index 6e0961a5..fd1aa6bc 100644
--- a/examples/make_dcp.cc
+++ b/examples/make_dcp.cc
@@ -33,8 +33,8 @@
 
 #include "dcp.h"
 #include "cpl.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
 #include "reel.h"
diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index f099409f..ee18b8b0 100644
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -27,10 +27,10 @@
 #include "cpl.h"
 #include "reel.h"
 #include "reel_picture_asset.h"
-#include "mono_picture_frame.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_reader.h"
-#include "stereo_picture_asset.h"
+#include "mono_j2k_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
+#include "stereo_j2k_picture_asset.h"
 #include "sound_asset.h"
 #include "subtitle_asset.h"
 #include "openjpeg_image.h"
diff --git a/src/asset_factory.cc b/src/asset_factory.cc
index 9eb42c8b..19ee460e 100644
--- a/src/asset_factory.cc
+++ b/src/asset_factory.cc
@@ -40,11 +40,11 @@
 #include "asset_factory.h"
 #include "atmos_asset.h"
 #include "compose.hpp"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
-#include "stereo_picture_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include <memory>
 
 
diff --git a/src/dcp.cc b/src/dcp.cc
index 7b238b97..dac20547 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -51,15 +51,15 @@
 #include "font_asset.h"
 #include "interop_subtitle_asset.h"
 #include "metadata.h"
-#include "mono_picture_asset.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "pkl.h"
 #include "raw_convert.h"
 #include "reel_asset.h"
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "util.h"
 #include "verify.h"
 #include "warnings.h"
diff --git a/src/j2k_picture_asset.cc b/src/j2k_picture_asset.cc
index c9f669a6..5b4bed20 100644
--- a/src/j2k_picture_asset.cc
+++ b/src/j2k_picture_asset.cc
@@ -43,8 +43,8 @@
 #include "exceptions.h"
 #include "j2k_transcode.h"
 #include "openjpeg_image.h"
-#include "picture_asset.h"
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "util.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
diff --git a/src/j2k_picture_asset_writer.cc b/src/j2k_picture_asset_writer.cc
index c30be1bc..594eb6a4 100644
--- a/src/j2k_picture_asset_writer.cc
+++ b/src/j2k_picture_asset_writer.cc
@@ -37,9 +37,9 @@
  */
 
 
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include "exceptions.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 #include <asdcp/KM_fileio.h>
 #include <asdcp/AS_DCP.h>
 #include <inttypes.h>
diff --git a/src/mono_j2k_picture_asset.cc b/src/mono_j2k_picture_asset.cc
index 9a0beb42..7fd0f277 100644
--- a/src/mono_j2k_picture_asset.cc
+++ b/src/mono_j2k_picture_asset.cc
@@ -42,10 +42,10 @@
 #include "equality_options.h"
 #include "exceptions.h"
 #include "filesystem.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_reader.h"
-#include "mono_picture_asset_writer.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "mono_j2k_picture_frame.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
diff --git a/src/mono_j2k_picture_asset.h b/src/mono_j2k_picture_asset.h
index 9658dcf6..255ee0a0 100644
--- a/src/mono_j2k_picture_asset.h
+++ b/src/mono_j2k_picture_asset.h
@@ -41,8 +41,8 @@
 #define LIBDCP_MONO_PICTURE_ASSET_H
 
 
-#include "picture_asset.h"
-#include "mono_picture_asset_reader.h"
+#include "j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
 
 
 namespace dcp {
diff --git a/src/mono_j2k_picture_asset_reader.h b/src/mono_j2k_picture_asset_reader.h
index 5bead791..79c44d36 100644
--- a/src/mono_j2k_picture_asset_reader.h
+++ b/src/mono_j2k_picture_asset_reader.h
@@ -42,7 +42,7 @@
 
 
 #include "asset_reader.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_frame.h"
 
 
 namespace dcp {
diff --git a/src/mono_j2k_picture_asset_writer.cc b/src/mono_j2k_picture_asset_writer.cc
index 7fd58114..81fb88ca 100644
--- a/src/mono_j2k_picture_asset_writer.cc
+++ b/src/mono_j2k_picture_asset_writer.cc
@@ -40,8 +40,8 @@
 #include "crypto_context.h"
 #include "dcp_assert.h"
 #include "exceptions.h"
-#include "mono_picture_asset_writer.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "j2k_picture_asset.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
@@ -49,7 +49,7 @@ LIBDCP_DISABLE_WARNINGS
 LIBDCP_ENABLE_WARNINGS
 
 
-#include "picture_asset_writer_common.cc"
+#include "j2k_picture_asset_writer_common.cc"
 
 
 using std::string;
diff --git a/src/mono_j2k_picture_asset_writer.h b/src/mono_j2k_picture_asset_writer.h
index 551d8c80..6e653f54 100644
--- a/src/mono_j2k_picture_asset_writer.h
+++ b/src/mono_j2k_picture_asset_writer.h
@@ -41,7 +41,7 @@
 #define LIBDCP_MONO_PICTURE_ASSET_WRITER_H
 
 
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include <memory>
 #include <boost/utility.hpp>
 #include <stdint.h>
diff --git a/src/mono_j2k_picture_frame.cc b/src/mono_j2k_picture_frame.cc
index 2abd57e4..dfdb05a7 100644
--- a/src/mono_j2k_picture_frame.cc
+++ b/src/mono_j2k_picture_frame.cc
@@ -44,7 +44,7 @@
 #include "file.h"
 #include "filesystem.h"
 #include "j2k_transcode.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_frame.h"
 #include "rgb_xyz.h"
 #include "util.h"
 #include <asdcp/KM_fileio.h>
diff --git a/src/reel.cc b/src/reel.cc
index def3a4ae..fc47239d 100644
--- a/src/reel.cc
+++ b/src/reel.cc
@@ -41,8 +41,8 @@
 #include "decrypted_kdm_key.h"
 #include "equality_options.h"
 #include "interop_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "reel.h"
 #include "reel_atmos_asset.h"
 #include "reel_closed_caption_asset.h"
@@ -57,7 +57,7 @@
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
 #include "sound_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "subtitle_asset.h"
 #include "util.h"
 #include <libxml++/nodes/element.h>
diff --git a/src/reel_mono_picture_asset.cc b/src/reel_mono_picture_asset.cc
index 9c44ec20..25f76d2f 100644
--- a/src/reel_mono_picture_asset.cc
+++ b/src/reel_mono_picture_asset.cc
@@ -38,7 +38,7 @@
 
 
 #include "reel_mono_picture_asset.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include <libcxml/cxml.h>
 
 
diff --git a/src/reel_mono_picture_asset.h b/src/reel_mono_picture_asset.h
index fb2dff70..b03b691d 100644
--- a/src/reel_mono_picture_asset.h
+++ b/src/reel_mono_picture_asset.h
@@ -42,7 +42,7 @@
 
 
 #include "reel_picture_asset.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 
 
 namespace dcp {
diff --git a/src/reel_picture_asset.cc b/src/reel_picture_asset.cc
index 7ee5fa38..e2e13067 100644
--- a/src/reel_picture_asset.cc
+++ b/src/reel_picture_asset.cc
@@ -39,7 +39,7 @@
 
 #include "compose.hpp"
 #include "dcp_assert.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "raw_convert.h"
 #include "reel_picture_asset.h"
 #include "warnings.h"
diff --git a/src/reel_picture_asset.h b/src/reel_picture_asset.h
index ebfef744..0c167045 100644
--- a/src/reel_picture_asset.h
+++ b/src/reel_picture_asset.h
@@ -42,7 +42,7 @@
 
 
 #include "reel_file_asset.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 
 
 namespace dcp {
diff --git a/src/reel_stereo_picture_asset.cc b/src/reel_stereo_picture_asset.cc
index 5bf4756c..ec3f7786 100644
--- a/src/reel_stereo_picture_asset.cc
+++ b/src/reel_stereo_picture_asset.cc
@@ -38,7 +38,7 @@
 
 
 #include "reel_stereo_picture_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include <libcxml/cxml.h>
 
 
diff --git a/src/reel_stereo_picture_asset.h b/src/reel_stereo_picture_asset.h
index 7cac1c8b..7a836164 100644
--- a/src/reel_stereo_picture_asset.h
+++ b/src/reel_stereo_picture_asset.h
@@ -42,7 +42,7 @@
 
 
 #include "reel_picture_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 
 
 namespace dcp {
diff --git a/src/stereo_j2k_picture_asset.cc b/src/stereo_j2k_picture_asset.cc
index 687d8572..ffce0f51 100644
--- a/src/stereo_j2k_picture_asset.cc
+++ b/src/stereo_j2k_picture_asset.cc
@@ -41,10 +41,10 @@
 #include "equality_options.h"
 #include "exceptions.h"
 #include "filesystem.h"
-#include "stereo_picture_asset.h"
-#include "stereo_picture_asset_reader.h"
-#include "stereo_picture_asset_writer.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_asset.h"
+#include "stereo_j2k_picture_asset_reader.h"
+#include "stereo_j2k_picture_asset_writer.h"
+#include "stereo_j2k_picture_frame.h"
 #include <asdcp/AS_DCP.h>
 
 
diff --git a/src/stereo_j2k_picture_asset.h b/src/stereo_j2k_picture_asset.h
index 6ee1d423..42d17542 100644
--- a/src/stereo_j2k_picture_asset.h
+++ b/src/stereo_j2k_picture_asset.h
@@ -41,8 +41,8 @@
 #define LIBDCP_STEREO_PICTURE_ASSET_H
 
 
-#include "picture_asset.h"
-#include "stereo_picture_asset_reader.h"
+#include "j2k_picture_asset.h"
+#include "stereo_j2k_picture_asset_reader.h"
 
 
 namespace dcp {
diff --git a/src/stereo_j2k_picture_asset_reader.h b/src/stereo_j2k_picture_asset_reader.h
index 9cb05263..1ed769ac 100644
--- a/src/stereo_j2k_picture_asset_reader.h
+++ b/src/stereo_j2k_picture_asset_reader.h
@@ -42,7 +42,7 @@
 
 
 #include "asset_reader.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_frame.h"
 
 
 namespace dcp {
diff --git a/src/stereo_j2k_picture_asset_writer.cc b/src/stereo_j2k_picture_asset_writer.cc
index 6ee271bc..4f8fb656 100644
--- a/src/stereo_j2k_picture_asset_writer.cc
+++ b/src/stereo_j2k_picture_asset_writer.cc
@@ -37,16 +37,16 @@
  */
 
 
-#include "stereo_picture_asset_writer.h"
+#include "stereo_j2k_picture_asset_writer.h"
 #include "exceptions.h"
 #include "dcp_assert.h"
-#include "picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "crypto_context.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
 
-#include "picture_asset_writer_common.cc"
+#include "j2k_picture_asset_writer_common.cc"
 
 
 using std::string;
diff --git a/src/stereo_j2k_picture_asset_writer.h b/src/stereo_j2k_picture_asset_writer.h
index 1cee1202..606f789a 100644
--- a/src/stereo_j2k_picture_asset_writer.h
+++ b/src/stereo_j2k_picture_asset_writer.h
@@ -37,7 +37,7 @@
  */
 
 
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include <memory>
 #include <stdint.h>
 #include <string>
diff --git a/src/stereo_j2k_picture_frame.cc b/src/stereo_j2k_picture_frame.cc
index 8d3a2757..fc98a673 100644
--- a/src/stereo_j2k_picture_frame.cc
+++ b/src/stereo_j2k_picture_frame.cc
@@ -43,7 +43,7 @@
 #include "exceptions.h"
 #include "j2k_transcode.h"
 #include "rgb_xyz.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_frame.h"
 #include "util.h"
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
diff --git a/src/verify.cc b/src/verify.cc
index cfcce04f..9103546d 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -43,8 +43,8 @@
 #include "exceptions.h"
 #include "filesystem.h"
 #include "interop_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_frame.h"
 #include "raw_convert.h"
 #include "reel.h"
 #include "reel_closed_caption_asset.h"
@@ -55,8 +55,8 @@
 #include "reel_smpte_subtitle_asset.h"
 #include "reel_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "stereo_picture_asset.h"
-#include "stereo_picture_frame.h"
+#include "stereo_j2k_picture_asset.h"
+#include "stereo_j2k_picture_frame.h"
 #include "verify.h"
 #include "verify_j2k.h"
 #include <libxml/parserInternals.h>
diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 0ecc87e0..39d9c483 100644
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -33,7 +33,7 @@
 
 
 #include "cpl.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "warnings.h"
 #include <libcxml/cxml.h>
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 5456092c..feb7f51d 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -38,8 +38,8 @@
 #include "dcp.h"
 #include "equality_options.h"
 #include "metadata.h"
-#include "mono_picture_asset.h"
-#include "picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_atmos_asset.h"
 #include "reel_markers_asset.h"
@@ -49,7 +49,7 @@
 #include "reel_stereo_picture_asset.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "test.h"
 #include <asdcp/KM_util.h>
 #include <sndfile.h>
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 8f3dbff7..3d858028 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -36,11 +36,11 @@
 #include "dcp.h"
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_reader.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_reader.h"
+#include "mono_j2k_picture_frame.h"
 #include "openjpeg_image.h"
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_file_asset.h"
 #include "reel_mono_picture_asset.h"
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 358a3fd9..6e145056 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -37,8 +37,8 @@
 #include "certificate_chain.h"
 #include "cpl.h"
 #include "filesystem.h"
-#include "mono_picture_asset.h"
-#include "picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "sound_asset_writer.h"
 #include "sound_asset.h"
 #include "reel.h"
diff --git a/test/frame_info_hash_test.cc b/test/frame_info_hash_test.cc
index c8bdb3e8..94336867 100644
--- a/test/frame_info_hash_test.cc
+++ b/test/frame_info_hash_test.cc
@@ -33,8 +33,8 @@
 
 
 #include "j2k_transcode.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "openjpeg_image.h"
 #include <boost/random.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index 6f06b4c9..5eae90c3 100644
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -36,8 +36,8 @@
 #include "cpl.h"
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
-#include "mono_picture_asset.h"
-#include "picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_mono_picture_asset.h"
 #include "reel_sound_asset.h"
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index eaf34f81..b968c86f 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -32,8 +32,8 @@
 */
 
 
-#include "mono_picture_asset_writer.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
 #include "test.h"
 #include <asdcp/KM_util.h>
 #include <boost/filesystem.hpp>
diff --git a/test/round_trip_test.cc b/test/round_trip_test.cc
index 028accbe..02b9f78e 100644
--- a/test/round_trip_test.cc
+++ b/test/round_trip_test.cc
@@ -35,15 +35,15 @@
 #include "decrypted_kdm.h"
 #include "encrypted_kdm.h"
 #include "certificate_chain.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "sound_asset.h"
 #include "reel.h"
 #include "test.h"
 #include "cpl.h"
-#include "mono_picture_frame.h"
+#include "mono_j2k_picture_frame.h"
 #include "certificate_chain.h"
-#include "mono_picture_asset_writer.h"
-#include "mono_picture_asset_reader.h"
+#include "mono_j2k_picture_asset_writer.h"
+#include "mono_j2k_picture_asset_reader.h"
 #include "reel_picture_asset.h"
 #include "reel_mono_picture_asset.h"
 #include "openjpeg_image.h"
diff --git a/test/test.cc b/test/test.cc
index bf0e9b03..efe02209 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -39,11 +39,11 @@
 #include "interop_subtitle_asset.h"
 #include "file.h"
 #include "j2k_transcode.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "openjpeg_image.h"
-#include "picture_asset_writer.h"
-#include "picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
+#include "j2k_picture_asset_writer.h"
 #include "reel.h"
 #include "reel_asset.h"
 #include "reel_interop_closed_caption_asset.h"
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 30e2e5e7..d9e88ec1 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -38,8 +38,8 @@
 #include "file.h"
 #include "interop_subtitle_asset.h"
 #include "j2k_transcode.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "openjpeg_image.h"
 #include "raw_convert.h"
 #include "reel.h"
@@ -52,7 +52,7 @@
 #include "reel_smpte_closed_caption_asset.h"
 #include "reel_smpte_subtitle_asset.h"
 #include "smpte_subtitle_asset.h"
-#include "stereo_picture_asset.h"
+#include "stereo_j2k_picture_asset.h"
 #include "stream_operators.h"
 #include "test.h"
 #include "util.h"
diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc
index 451a4d34..5285756a 100644
--- a/tools/dcpdecryptmxf.cc
+++ b/tools/dcpdecryptmxf.cc
@@ -41,8 +41,8 @@
 #include "encrypted_kdm.h"
 #include "exceptions.h"
 #include "key.h"
-#include "mono_picture_asset.h"
-#include "mono_picture_asset_writer.h"
+#include "mono_j2k_picture_asset.h"
+#include "mono_j2k_picture_asset_writer.h"
 #include "sound_asset.h"
 #include "sound_asset_writer.h"
 #include "util.h"
diff --git a/tools/dcpdumpimage.cc b/tools/dcpdumpimage.cc
index 728e42c7..c57857b2 100644
--- a/tools/dcpdumpimage.cc
+++ b/tools/dcpdumpimage.cc
@@ -35,7 +35,7 @@
 #include "colour_conversion.h"
 #include "cpl.h"
 #include "dcp.h"
-#include "mono_picture_asset.h"
+#include "mono_j2k_picture_asset.h"
 #include "openjpeg_image.h"
 #include "reel_picture_asset.h"
 #include "raw_convert.h"
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index e812afe4..7e65d0d6 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -41,8 +41,8 @@
 #include "exceptions.h"
 #include "filesystem.h"
 #include "interop_subtitle_asset.h"
-#include "mono_picture_asset.h"
-#include "picture_asset.h"
+#include "mono_j2k_picture_asset.h"
+#include "j2k_picture_asset.h"
 #include "reel.h"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"