Remove unnecessary includes.

16 files changed, 3 insertions, 22 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index a6ce5dcc8..935fbceef 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 403f98933..6b2a64d68 100644
--- a/src/lib/atmos_mxf_content.cc
+++ b/src/lib/atmos_mxf_content.cc
@@ -27,7 +27,6 @@
 #include <asdcp/KM_log.h>
 #include <dcp/atmos_asset.h>
 #include <dcp/exceptions.h>
-#include <dcp/raw_convert.h>
 #include <libxml++/libxml++.h>
 
 #include "i18n.h"
diff --git a/src/lib/copy_to_drive_job.cc b/src/lib/copy_to_drive_job.cc
index 7d208e0ec..4ed9421d6 100644
--- a/src/lib/copy_to_drive_job.cc
+++ b/src/lib/copy_to_drive_job.cc
@@ -24,7 +24,6 @@
 #include "dcpomatic_log.h"
 #include "disk_writer_messages.h"
 #include "exceptions.h"
-#include <dcp/raw_convert.h>
 #include <nanomsg/nn.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -41,7 +40,6 @@ using std::min;
 using std::shared_ptr;
 using std::string;
 using boost::optional;
-using dcp::raw_convert;
 
 
 CopyToDriveJob::CopyToDriveJob(std::vector<boost::filesystem::path> const& dcps, Drive drive, Nanomsg& nanomsg)
diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 6df2f959e..a201cc5f9 100644
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -27,7 +27,6 @@
 #include "log.h"
 #include "variant.h"
 #include <dcp/filesystem.h>
-#include <dcp/raw_convert.h>
 #include <glib.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.hpp>
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/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index 83ba96de6..4ab532f3d 100644
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -24,14 +24,12 @@
 #include "dkdm_recipient.h"
 #include "film.h"
 #include "kdm_with_metadata.h"
-#include <dcp/raw_convert.h>
 
 
 using std::make_shared;
 using std::shared_ptr;
 using std::string;
 using std::vector;
-using dcp::raw_convert;
 
 
 KDMWithMetadataPtr
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 3069d792e..f7e9c9dc5 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/ffmpeg.cc b/src/lib/ffmpeg.cc
index 550e045b3..c6867c081 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -32,7 +32,6 @@
 #include "log.h"
 #include "memory_util.h"
 #include "util.h"
-#include <dcp/raw_convert.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
@@ -50,7 +49,6 @@ using std::cerr;
 using std::vector;
 using std::shared_ptr;
 using boost::optional;
-using dcp::raw_convert;
 using namespace dcpomatic;
 
 
diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 3f43b6ec5..1940092e4 100644
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -18,20 +18,21 @@
 
 */
 
+
 #include "ffmpeg_subtitle_stream.h"
-#include <dcp/raw_convert.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
+
 using std::string;
 using std::map;
 using std::list;
 using std::cout;
 using std::make_pair;
-using dcp::raw_convert;
+
 
 /** Construct a SubtitleStream from a value returned from to_string().
  *  @param node String returned from to_string().
diff --git a/src/lib/image.cc b/src/lib/image.cc
index 7181c4546..f2df4826c 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 e7ba88194..a0fdb0ace 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/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/spl.cc b/src/lib/spl.cc
index e87465cdc..615dd916a 100644
--- a/src/lib/spl.cc
+++ b/src/lib/spl.cc
@@ -23,7 +23,6 @@
 #include "spl.h"
 #include <libcxml/cxml.h>
 #include <dcp/filesystem.h>
-#include <dcp/raw_convert.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
@@ -34,7 +33,6 @@ LIBDCP_ENABLE_WARNINGS
 using std::cout;
 using std::string;
 using std::shared_ptr;
-using dcp::raw_convert;
 
 
 void
diff --git a/src/lib/types.cc b/src/lib/types.cc
index 58382fdc7..48363f892 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -24,7 +24,6 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/filesystem.h>
-#include <dcp/raw_convert.h>
 #include <dcp/reel_asset.h>
 #include <dcp/reel_file_asset.h>
 #include <dcp/warnings.h>
@@ -41,7 +40,6 @@ using std::string;
 using std::list;
 using std::shared_ptr;
 using std::vector;
-using dcp::raw_convert;
 
 
 CPLSummary::CPLSummary (boost::filesystem::path p)
diff --git a/src/lib/upload_job.cc b/src/lib/upload_job.cc
index 113e3a7e8..d8b105daa 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/writer.cc b/src/lib/writer.cc
index 971085046..58a01badb 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -42,7 +42,6 @@
 #include <dcp/cpl.h>
 #include <dcp/mono_mpeg2_picture_frame.h>
 #include <dcp/locale_convert.h>
-#include <dcp/raw_convert.h>
 #include <dcp/reel_file_asset.h>
 #include <dcp/reel_text_asset.h>
 #include <cerrno>