Remove compose.hpp includes.

sed -i "/include.*compose.hpp/d;" src/lib/*.cc src/wx/*.cc src/wx/*.h src/tools/*.cc src/lib/*.h test/*.cc

109 files changed, 0 insertions, 109 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index d2c3b04e5..eb3fcecb7 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -21,7 +21,6 @@
 
 #include "analyse_audio_job.h"
 #include "audio_analysis.h"
-#include "compose.hpp"
 #include "dcpomatic_log.h"
 #include "film.h"
 #include "filter.h"
diff --git a/src/lib/atmos_mxf_content.cc b/src/lib/atmos_mxf_content.cc
index eda876dff..32e8a73b2 100644
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -21,7 +21,6 @@
 
 #include "atmos_content.h"
 #include "atmos_mxf_content.h"
-#include "compose.hpp"
 #include "film.h"
 #include "job.h"
 #include <asdcp/KM_log.h>
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 6e9d832ee..142dc0855 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -20,7 +20,6 @@
 
 
 #include "audio_content.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "exceptions.h"
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index d66858c29..9dd57f32a 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -25,7 +25,6 @@
 #include "dcpomatic_log.h"
 #include "log.h"
 #include "resampler.h"
-#include "compose.hpp"
 #include <iostream>
 
 #include "i18n.h"
diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc
index f6244fd99..014ad6e5a 100644
--- a/src/lib/audio_filter_graph.cc
+++ b/src/lib/audio_filter_graph.cc
@@ -21,7 +21,6 @@
 
 #include "audio_buffers.h"
 #include "audio_filter_graph.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "exceptions.h"
 extern "C" {
diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index 3baa9a327..a4f00eb08 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -20,7 +20,6 @@
 
 
 #include "butler.h"
-#include "compose.hpp"
 #include "cross.h"
 #include "dcpomatic_log.h"
 #include "exceptions.h"
diff --git a/src/lib/combine_dcp_job.cc b/src/lib/combine_dcp_job.cc
index 6580c0e79..547abe551 100644
--- a/src/lib/combine_dcp_job.cc
+++ b/src/lib/combine_dcp_job.cc
@@ -20,7 +20,6 @@
 
 
 #include "combine_dcp_job.h"
-#include "compose.hpp"
 #include "config.h"
 #include <dcp/combine.h>
 #include <dcp/exceptions.h>
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 61bf95ac4..9b5bd34be 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -21,7 +21,6 @@
 
 #include "cinema_list.h"
 #include "colour_conversion.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
diff --git a/src/lib/content.cc b/src/lib/content.cc
index 2152c5457..196288f4a 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -26,7 +26,6 @@
 
 #include "audio_content.h"
 #include "change_signaller.h"
-#include "compose.hpp"
 #include "content.h"
 #include "content_factory.h"
 #include "exceptions.h"
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index e8ac59527..5d0fe8c3c 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -39,7 +39,6 @@
 #include "string_text_file_content.h"
 #include "util.h"
 #include "video_mxf_content.h"
-#include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <dcp/filesystem.h>
 #include <dcp/smpte_text_asset.h>
diff --git a/src/lib/copy_to_drive_job.cc b/src/lib/copy_to_drive_job.cc
index 17f39fa05..dde12d244 100644
--- a/src/lib/copy_to_drive_job.cc
+++ b/src/lib/copy_to_drive_job.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "copy_to_drive_job.h"
 #include "dcpomatic_log.h"
 #include "disk_writer_messages.h"
diff --git a/src/lib/create_cli.cc b/src/lib/create_cli.cc
index 3701f2597..df040e134 100644
--- a/src/lib/create_cli.cc
+++ b/src/lib/create_cli.cc
@@ -20,7 +20,6 @@
 
 
 #include "audio_content.h"
-#include "compose.hpp"
 #include "config.h"
 #include "content_factory.h"
 #include "create_cli.h"
diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index ddaae541f..215325248 100644
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -20,7 +20,6 @@
 
 
 #include "cross.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "dcpomatic_log.h"
 #include <dcp/warnings.h>
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 46ba9f5f7..528dd4c7a 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "cross.h"
 #include "dcpomatic_log.h"
diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 46240df07..069b8409a 100644
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "cross.h"
 #include "dcpomatic_log.h"
diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index 8408ca299..29b16c715 100644
--- a/src/lib/cross_windows.cc
+++ b/src/lib/cross_windows.cc
@@ -22,7 +22,6 @@
 #define UNICODE 1
 
 #include "cross.h"
-#include "compose.hpp"
 #include "log.h"
 #include "dcpomatic_log.h"
 #include "config.h"
diff --git a/src/lib/curl_uploader.cc b/src/lib/curl_uploader.cc
index 769cdf673..91ef6b7a4 100644
--- a/src/lib/curl_uploader.cc
+++ b/src/lib/curl_uploader.cc
@@ -24,7 +24,6 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include <iostream>
 
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index c04bbc2e9..5a4593ec2 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -21,7 +21,6 @@
 
 #include "atmos_content.h"
 #include "audio_content.h"
-#include "compose.hpp"
 #include "config.h"
 #include "dcp_content.h"
 #include "dcp_decoder.h"
diff --git a/src/lib/dcp_film_encoder.cc b/src/lib/dcp_film_encoder.cc
index 83da57756..631010071 100644
--- a/src/lib/dcp_film_encoder.cc
+++ b/src/lib/dcp_film_encoder.cc
@@ -28,7 +28,6 @@
 
 
 #include "audio_decoder.h"
-#include "compose.hpp"
 #include "dcp_film_encoder.h"
 #include "film.h"
 #include "j2k_encoder.h"
diff --git a/src/lib/dcp_subtitle.cc b/src/lib/dcp_subtitle.cc
index 348402a59..53fa871c9 100644
--- a/src/lib/dcp_subtitle.cc
+++ b/src/lib/dcp_subtitle.cc
@@ -21,7 +21,6 @@
 
 #include "dcp_subtitle.h"
 #include "exceptions.h"
-#include "compose.hpp"
 #include <dcp/interop_text_asset.h>
 #include <dcp/smpte_text_asset.h>
 #include <memory>
diff --git a/src/lib/dcp_text_track.cc b/src/lib/dcp_text_track.cc
index 63ce6bdc8..ef3890401 100644
--- a/src/lib/dcp_text_track.cc
+++ b/src/lib/dcp_text_track.cc
@@ -20,7 +20,6 @@
 
 
 #include "dcp_text_track.h"
-#include "compose.hpp"
 #include <fmt/format.h>
 #include <string>
 
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index e55cec5fa..f07801c03 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -30,7 +30,6 @@
  */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "cross.h"
 #include "dcp_video.h"
diff --git a/src/lib/dcpomatic_log.h b/src/lib/dcpomatic_log.h
index 494f13129..237f5e5d0 100644
--- a/src/lib/dcpomatic_log.h
+++ b/src/lib/dcpomatic_log.h
@@ -20,7 +20,6 @@
 
 
 #include "log.h"
-#include "compose.hpp"
 #include <fmt/format.h>
 
 
diff --git a/src/lib/dcpomatic_socket.cc b/src/lib/dcpomatic_socket.cc
index c1cbfa0ca..7aecf752f 100644
--- a/src/lib/dcpomatic_socket.cc
+++ b/src/lib/dcpomatic_socket.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "dcpomatic_log.h"
 #include "dcpomatic_socket.h"
diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 8dfa5640e..f6646e4d2 100644
--- a/src/lib/dkdm_wrapper.cc
+++ b/src/lib/dkdm_wrapper.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "dkdm_wrapper.h"
 #include "dcpomatic_assert.h"
 #include <dcp/warnings.h>
diff --git a/src/lib/email.cc b/src/lib/email.cc
index 35a0650f8..6a70ff774 100644
--- a/src/lib/email.cc
+++ b/src/lib/email.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "dcpomatic_log.h"
 #include "email.h"
diff --git a/src/lib/encode_server.cc b/src/lib/encode_server.cc
index b9d503a02..cd7e89abb 100644
--- a/src/lib/encode_server.cc
+++ b/src/lib/encode_server.cc
@@ -25,7 +25,6 @@
  */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index d6d5a5a1b..4a6f7ebcc 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "cross.h"
 #include "log.h"
 #include "variant.h"
diff --git a/src/lib/exceptions.cc b/src/lib/exceptions.cc
index e08e6817c..e2e7fc4bc 100644
--- a/src/lib/exceptions.cc
+++ b/src/lib/exceptions.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "exceptions.h"
 #include "sqlite_database.h"
 
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index bc14e3f2b..212d002e2 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -28,7 +28,6 @@
 #define DCPOMATIC_EXCEPTIONS_H
 
 
-#include "compose.hpp"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
diff --git a/src/lib/ext.cc b/src/lib/ext.cc
index f278023a5..1cf63603e 100644
--- a/src/lib/ext.cc
+++ b/src/lib/ext.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "cross.h"
 #include "dcpomatic_log.h"
 #include "digester.h"
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index 6c2ca538c..30b725839 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "dcpomatic_log.h"
 #include "digester.h"
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 7c1ab4941..6261c4003 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -20,7 +20,6 @@
 */
 
 #include "audio_content.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "exceptions.h"
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 9eb4d30cf..74836c1a8 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -27,7 +27,6 @@
 #include "audio_buffers.h"
 #include "audio_content.h"
 #include "audio_decoder.h"
-#include "compose.hpp"
 #include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "ffmpeg_audio_stream.h"
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc
index 65b58885e..3355c2ac8 100644
--- a/src/lib/ffmpeg_file_encoder.cc
+++ b/src/lib/ffmpeg_file_encoder.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "cross.h"
 #include "ffmpeg_file_encoder.h"
 #include "ffmpeg_wrapper.h"
diff --git a/src/lib/ffmpeg_film_encoder.cc b/src/lib/ffmpeg_film_encoder.cc
index 6c26d9555..97a3209e6 100644
--- a/src/lib/ffmpeg_film_encoder.cc
+++ b/src/lib/ffmpeg_film_encoder.cc
@@ -28,7 +28,6 @@
 #include "log.h"
 #include "player.h"
 #include "player_video.h"
-#include "compose.hpp"
 #include <iostream>
 
 #include "i18n.h"
diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 59970ca6e..9ba8f8bf5 100644
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "cross.h"
 #include "dcpomatic_assert.h"
 #include "dcpomatic_socket.h"
diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc
index 115303230..8ff684ed3 100644
--- a/src/lib/file_group.cc
+++ b/src/lib/file_group.cc
@@ -24,7 +24,6 @@
  */
 
 
-#include "compose.hpp"
 #include "cross.h"
 #include "dcpomatic_assert.h"
 #include "exceptions.h"
diff --git a/src/lib/film.cc b/src/lib/film.cc
index e4e07392a..46d985e58 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -30,7 +30,6 @@
 #include "audio_processor.h"
 #include "change_signaller.h"
 #include "cinema.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 55ec9b517..809954b23 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -28,7 +28,6 @@
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
-#include "compose.hpp"
 extern "C" {
 #include <libavfilter/buffersrc.h>
 #include <libavfilter/buffersink.h>
diff --git a/src/lib/font_id_allocator.cc b/src/lib/font_id_allocator.cc
index d7c3944eb..902d76be6 100644
--- a/src/lib/font_id_allocator.cc
+++ b/src/lib/font_id_allocator.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "constants.h"
 #include "dcpomatic_assert.h"
 #include "font_id_allocator.h"
diff --git a/src/lib/frame_rate_change.cc b/src/lib/frame_rate_change.cc
index 315d53e3b..69296c970 100644
--- a/src/lib/frame_rate_change.cc
+++ b/src/lib/frame_rate_change.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "content.h"
 #include "film.h"
 #include "frame_rate_change.h"
diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index de56b6574..cf385216e 100644
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -22,7 +22,6 @@
 #include "audio_analysis.h"
 #include "audio_content.h"
 #include "audio_processor.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "content.h"
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 1d06ef418..b1557bf47 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -24,7 +24,6 @@
  */
 
 
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "dcpomatic_socket.h"
 #include "enum_indexed_vector.h"
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 218c0e80c..8d3092196 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "exceptions.h"
 #include "film.h"
 #include "frame_rate_change.h"
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index cba2d47c6..4a91a103f 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "cross.h"
 #include "exceptions.h"
diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index f4a8e95d7..92ab4c854 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "cross.h"
 #include "exceptions.h"
 #include "scoped_temporary.h"
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index 3513d5a90..441e91827 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -24,7 +24,6 @@
  */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "cross.h"
 #include "dcp_video.h"
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 53a2de0ac..b523df740 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -24,7 +24,6 @@
  */
 
 
-#include "compose.hpp"
 #include "constants.h"
 #include "cross.h"
 #include "dcpomatic_log.h"
diff --git a/src/lib/map_cli.cc b/src/lib/map_cli.cc
index dfc1abb92..43023a440 100644
--- a/src/lib/map_cli.cc
+++ b/src/lib/map_cli.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "util.h"
 #include <dcp/cpl.h>
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 212258508..ef6280a3a 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -24,7 +24,6 @@
 #include "audio_content.h"
 #include "audio_decoder.h"
 #include "audio_processor.h"
-#include "compose.hpp"
 #include "config.h"
 #include "content_audio.h"
 #include "content_video.h"
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index f0e4cb50d..5c83add7c 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -20,7 +20,6 @@
 
 
 #include "audio_content.h"
-#include "compose.hpp"
 #include "config.h"
 #include "content_factory.h"
 #include "dcp_content.h"
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index f30bc94ac..01a798676 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -20,7 +20,6 @@
 
 
 #include "audio_buffers.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index fbdc54b01..a23f771c4 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -22,7 +22,6 @@
 #include "resampler.h"
 #include "audio_buffers.h"
 #include "exceptions.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include <samplerate.h>
 #include <iostream>
diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index da8bc1866..8619f68d3 100644
--- a/src/lib/scp_uploader.cc
+++ b/src/lib/scp_uploader.cc
@@ -24,7 +24,6 @@
 #include "job.h"
 #include "config.h"
 #include "cross.h"
-#include "compose.hpp"
 #include <dcp/file.h>
 #include <dcp/filesystem.h>
 #include <dcp/warnings.h>
diff --git a/src/lib/send_kdm_email_job.cc b/src/lib/send_kdm_email_job.cc
index bbe75521f..edf959cbb 100644
--- a/src/lib/send_kdm_email_job.cc
+++ b/src/lib/send_kdm_email_job.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "film.h"
 #include "kdm_with_metadata.h"
 #include "send_kdm_email_job.h"
diff --git a/src/lib/send_notification_email_job.cc b/src/lib/send_notification_email_job.cc
index a2f3016f9..69a28e297 100644
--- a/src/lib/send_notification_email_job.cc
+++ b/src/lib/send_notification_email_job.cc
@@ -23,7 +23,6 @@
 #include "exceptions.h"
 #include "config.h"
 #include "email.h"
-#include "compose.hpp"
 
 #include "i18n.h"
 
diff --git a/src/lib/send_problem_report_job.cc b/src/lib/send_problem_report_job.cc
index 3fd854171..5d62bb4d1 100644
--- a/src/lib/send_problem_report_job.cc
+++ b/src/lib/send_problem_report_job.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "cross.h"
 #include "email.h"
 #include "environment_info.h"
diff --git a/src/lib/sqlite_table.cc b/src/lib/sqlite_table.cc
index 7394b9adf..81843ee00 100644
--- a/src/lib/sqlite_table.cc
+++ b/src/lib/sqlite_table.cc
@@ -20,7 +20,6 @@
 
 
 #include "dcpomatic_assert.h"
-#include "compose.hpp"
 #include "sqlite_table.h"
 #include "util.h"
 
diff --git a/src/lib/subtitle_film_encoder.cc b/src/lib/subtitle_film_encoder.cc
index 91d35257d..2f1fc7099 100644
--- a/src/lib/subtitle_film_encoder.cc
+++ b/src/lib/subtitle_film_encoder.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "film.h"
 #include "job.h"
 #include "player.h"
diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 9985abaaf..6534b6a38 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "dcpomatic_log.h"
 #include "log.h"
 #include "text_content.h"
diff --git a/src/lib/timer.cc b/src/lib/timer.cc
index 6ec51af7a..32525b908 100644
--- a/src/lib/timer.cc
+++ b/src/lib/timer.cc
@@ -24,7 +24,6 @@
  */
 
 
-#include "compose.hpp"
 #include "timer.h"
 #include "util.h"
 #include <sys/time.h>
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 514038a90..2a408266f 100644
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -25,7 +25,6 @@
 
 
 #include "analytics.h"
-#include "compose.hpp"
 #include "content.h"
 #include "config.h"
 #include "dcp_film_encoder.h"
diff --git a/src/lib/types.cc b/src/lib/types.cc
index 28d58f36b..7247a726a 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -19,7 +19,6 @@
 */
 
 #include "types.h"
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index 3019b7662..1cb778667 100644
--- a/src/lib/upload_job.cc
+++ b/src/lib/upload_job.cc
@@ -24,7 +24,6 @@
  */
 
 
-#include "compose.hpp"
 #include "config.h"
 #include "curl_uploader.h"
 #include "dcpomatic_log.h"
diff --git a/src/lib/uploader.cc b/src/lib/uploader.cc
index d21f7ff66..1e879804a 100644
--- a/src/lib/uploader.cc
+++ b/src/lib/uploader.cc
@@ -21,7 +21,6 @@
 
 #include "uploader.h"
 #include "dcpomatic_assert.h"
-#include "compose.hpp"
 #include <memory>
 
 #include "i18n.h"
diff --git a/src/lib/util.cc b/src/lib/util.cc
index e1eaed9b9..12ea8c0eb 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -29,7 +29,6 @@
 #include "audio_buffers.h"
 #include "audio_processor.h"
 #include "cinema_sound_processor.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
diff --git a/src/lib/variant.h b/src/lib/variant.h
index affee08a0..c7e26c1d6 100644
--- a/src/lib/variant.h
+++ b/src/lib/variant.h
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include <string>
 
 
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index a51ebc8e2..b6e350d34 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -20,7 +20,6 @@
 
 
 #include "colour_conversion.h"
-#include "compose.hpp"
 #include "config.h"
 #include "content.h"
 #include "dcpomatic_log.h"
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 410a71cc4..6aa638cea 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "frame_interval_checker.h"
 #include "image.h"
 #include "j2k_image_proxy.h"
diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc
index 7c3ac5dc5..d647acc6f 100644
--- a/src/lib/video_filter_graph.cc
+++ b/src/lib/video_filter_graph.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "dcpomatic_assert.h"
 #include "exceptions.h"
 #include "image.h"
diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index bf5321ed7..a26c54473 100644
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "compose.hpp"
 #include "film.h"
 #include "job.h"
 #include "video_content.h"
diff --git a/src/lib/video_ring_buffers.cc b/src/lib/video_ring_buffers.cc
index 1c2344c83..7971b170f 100644
--- a/src/lib/video_ring_buffers.cc
+++ b/src/lib/video_ring_buffers.cc
@@ -21,7 +21,6 @@
 
 #include "video_ring_buffers.h"
 #include "player_video.h"
-#include "compose.hpp"
 #include <list>
 #include <iostream>
 
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 19d14a381..63b9dddbd 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -21,7 +21,6 @@
 
 #include "audio_buffers.h"
 #include "audio_mapping.h"
-#include "compose.hpp"
 #include "config.h"
 #include "constants.h"
 #include "cross.h"
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 852106757..e7011fba1 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -62,7 +62,6 @@
 #include "lib/audio_content.h"
 #include "lib/check_content_job.h"
 #include "lib/cinema.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/constants.h"
 #include "lib/content.h"
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index baa799aad..ee35034f4 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -29,7 +29,6 @@
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
 #include "wx/wx_variant.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/dcpomatic_socket.h"
 #include "lib/film.h"
diff --git a/src/tools/dcpomatic_disk_writer.cc b/src/tools/dcpomatic_disk_writer.cc
index 1880baefd..94c1af40f 100644
--- a/src/tools/dcpomatic_disk_writer.cc
+++ b/src/tools/dcpomatic_disk_writer.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/digester.h"
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index acab8c682..31b40cfb7 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -42,7 +42,6 @@
 #include "wx/wx_variant.h"
 #include "lib/cinema.h"
 #include "lib/collator.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include "lib/config.h"
 #include "lib/cross.h"
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index db5bb5d81..d40bd11bd 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -38,7 +38,6 @@
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
 #include "wx/wx_variant.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/constants.h"
 #include "lib/cross.h"
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index c4cbde70a..df85fe782 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -27,7 +27,6 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "wx_variant.h"
-#include "lib/compose.hpp"
 #include "lib/variant.h"
 #include "lib/version.h"
 #include <dcp/warnings.h>
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index d1d9b9769..3982f9705 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -24,7 +24,6 @@
 #include "wx_util.h"
 #include "lib/audio_decoder.h"
 #include "lib/audio_analysis.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include "lib/maths_util.h"
 #include <dcp/warnings.h>
diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc
index f5475fa76..879097e48 100644
--- a/src/wx/barco_alchemy_certificate_panel.cc
+++ b/src/wx/barco_alchemy_certificate_panel.cc
@@ -23,7 +23,6 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 1218657f7..de4c6969d 100644
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/internet.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 
 using std::string;
diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index e95da4863..34c5681a7 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -23,7 +23,6 @@
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "lib/butler.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include "lib/film.h"
 #include "lib/string_text.h"
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 218dd2c36..06a257dbb 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -34,7 +34,6 @@
 #include "wx_variant.h"
 #include "lib/audio_content.h"
 #include "lib/case_insensitive_sorter.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index 10fdfa232..8b60c740e 100644
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -23,7 +23,6 @@
 #include "content_panel.h"
 #include "wx_util.h"
 #include "lib/dcp_content.h"
-#include "lib/compose.hpp"
 #include "lib/log.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/content_timeline_dialog.cc b/src/wx/content_timeline_dialog.cc
index 697e6561f..4d1bbb1d4 100644
--- a/src/wx/content_timeline_dialog.cc
+++ b/src/wx/content_timeline_dialog.cc
@@ -23,7 +23,6 @@
 #include "content_timeline_dialog.h"
 #include "film_editor.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/film.h"
 #include "lib/playlist.h"
diff --git a/src/wx/dcp_timeline_dialog.cc b/src/wx/dcp_timeline_dialog.cc
index 2cf6a74f1..45c58aed9 100644
--- a/src/wx/dcp_timeline_dialog.cc
+++ b/src/wx/dcp_timeline_dialog.cc
@@ -23,7 +23,6 @@
 #include "dcp_timeline_dialog.h"
 #include "film_editor.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/film.h"
 #include "lib/playlist.h"
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 4ddb8fc8f..5b7b40cf8 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "dolby_doremi_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/internet.h"
 #include "lib/signal_manager.h"
 #include "lib/util.h"
diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 1a3896773..5995b0385 100644
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "download_certificate_panel.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/signal_manager.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 2933c1b31..893b789f9 100644
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -26,7 +26,6 @@
 #ifdef DCPOMATIC_USE_OWN_PICKER
 #include "dir_picker_ctrl.h"
 #endif
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 7b22999b0..45476c75d 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -34,7 +34,6 @@
 #include "simple_video_view.h"
 #include "wx_util.h"
 #include "lib/butler.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/dcp_content.h"
 #include "lib/dcpomatic_log.h"
diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index e937cff2a..bbbafd61b 100644
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "gdc_certificate_panel.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/internet.h"
 #include <boost/algorithm/string.hpp>
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 9c3c29baa..7e445a9db 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -29,7 +29,6 @@
 #include "job_manager_view.h"
 #include "normal_job_view.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/exceptions.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index aa175816d..7ed44ee1e 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -27,7 +27,6 @@
 #include "wx_util.h"
 #include "wx_variant.h"
 #include "lib/analyse_audio_job.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index b4fe5691e..70a02a902 100644
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -23,7 +23,6 @@
 #define DCPOMATIC_NAME_FORMAT_EDITOR_H
 
 
-#include "lib/compose.hpp"
 #include <dcp/name_format.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/wx/player_information.cc b/src/wx/player_information.cc
index da73ec933..6eed7ae2f 100644
--- a/src/wx/player_information.cc
+++ b/src/wx/player_information.cc
@@ -23,7 +23,6 @@
 #include "wx_util.h"
 #include "film_viewer.h"
 #include "lib/playlist.h"
-#include "lib/compose.hpp"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
 #include "lib/dcp_content.h"
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 87a0e9a4a..c7dad4139 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -26,7 +26,6 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "wx_variant.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include "lib/cross.h"
 #include "lib/dcp_content.h"
diff --git a/src/wx/qube_certificate_panel.cc b/src/wx/qube_certificate_panel.cc
index 5e098a047..f246ea384 100644
--- a/src/wx/qube_certificate_panel.cc
+++ b/src/wx/qube_certificate_panel.cc
@@ -22,7 +22,6 @@
 #include "download_certificate_dialog.h"
 #include "qube_certificate_panel.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/internet.h"
 #include <boost/algorithm/string.hpp>
diff --git a/src/wx/recipient_dialog.cc b/src/wx/recipient_dialog.cc
index 85c01c97e..69caa3251 100644
--- a/src/wx/recipient_dialog.cc
+++ b/src/wx/recipient_dialog.cc
@@ -25,7 +25,6 @@
 #include "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/exceptions.h>
 #include <dcp/certificate_chain.h>
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 21786b8a2..84d798065 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -26,7 +26,6 @@
 #include "static_text.h"
 #include "table_dialog.h"
 #include "wx_util.h"
-#include "lib/compose.hpp"
 #include "lib/util.h"
 #include <dcp/warnings.h>
 #include <dcp/exceptions.h>
diff --git a/test/audio_mapping_test.cc b/test/audio_mapping_test.cc
index d046a95d2..dfde022a0 100644
--- a/test/audio_mapping_test.cc
+++ b/test/audio_mapping_test.cc
@@ -26,7 +26,6 @@
 
 
 #include "lib/audio_mapping.h"
-#include "lib/compose.hpp"
 #include "lib/constants.h"
 #include <boost/test/unit_test.hpp>
 #include <fmt/format.h>
diff --git a/test/digest_test.cc b/test/digest_test.cc
index cfd862793..dc3546888 100644
--- a/test/digest_test.cc
+++ b/test/digest_test.cc
@@ -25,7 +25,6 @@
  */
 
 
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/dcp_content_type.h"
 #include "lib/film.h"
diff --git a/test/ffmpeg_encoder_test.cc b/test/ffmpeg_encoder_test.cc
index 247b2d394..9865d093d 100644
--- a/test/ffmpeg_encoder_test.cc
+++ b/test/ffmpeg_encoder_test.cc
@@ -20,7 +20,6 @@
 
 
 #include "lib/audio_content.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/constants.h"
 #include "lib/content_factory.h"
diff --git a/test/ffmpeg_properties_test.cc b/test/ffmpeg_properties_test.cc
index bc18efe02..c0c55542f 100644
--- a/test/ffmpeg_properties_test.cc
+++ b/test/ffmpeg_properties_test.cc
@@ -19,7 +19,6 @@
 */
 
 
-#include "lib/compose.hpp"
 #include "lib/content.h"
 #include "lib/content_factory.h"
 #include "lib/user_property.h"
diff --git a/test/image_filename_sorter_test.cc b/test/image_filename_sorter_test.cc
index b7b65611b..aed8d7721 100644
--- a/test/image_filename_sorter_test.cc
+++ b/test/image_filename_sorter_test.cc
@@ -25,7 +25,6 @@
  */
 
 
-#include "lib/compose.hpp"
 #include "lib/image_filename_sorter.h"
 #include <fmt/format.h>
 #include <boost/test/unit_test.hpp>
diff --git a/test/image_test.cc b/test/image_test.cc
index 18710f842..46a8c15c9 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -26,7 +26,6 @@
  */
 
 
-#include "lib/compose.hpp"
 #include "lib/image.h"
 #include "lib/image_content.h"
 #include "lib/image_decoder.h"
diff --git a/test/player_test.cc b/test/player_test.cc
index 1ba1602a2..788633796 100644
--- a/test/player_test.cc
+++ b/test/player_test.cc
@@ -28,7 +28,6 @@
 #include "lib/audio_buffers.h"
 #include "lib/audio_content.h"
 #include "lib/butler.h"
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/constants.h"
 #include "lib/content_factory.h"
diff --git a/test/test.cc b/test/test.cc
index 85698b3fe..c6f1a210f 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -25,7 +25,6 @@
  */
 
 
-#include "lib/compose.hpp"
 #include "lib/config.h"
 #include "lib/cross.h"
 #include "lib/dcp_content_type.h"