3 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 42f4b1c3d..a9d7b7381 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -35,7 +35,6 @@
 #include "format.h"
 #include "job.h"
 #include "filter.h"
-#include "transcoder.h"
 #include "util.h"
 #include "job_manager.h"
 #include "ab_transcode_job.h"
@@ -48,15 +47,13 @@
 #include "config.h"
 #include "version.h"
 #include "ui_signaller.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "sndfile_decoder.h"
 #include "analyse_audio_job.h"
 #include "playlist.h"
 #include "player.h"
 #include "ffmpeg_content.h"
 #include "imagemagick_content.h"
 #include "sndfile_content.h"
+#include "dcp_content_type.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/film.h b/src/lib/film.h
index a03fd5d97..091ac4f97 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -32,15 +32,12 @@
 #include <boost/thread.hpp>
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
-#include "dcp_content_type.h"
 #include "util.h"
 #include "dci_metadata.h"
 #include "types.h"
 #include "ffmpeg_content.h"
 
+class DCPContentType;
 class Format;
 class Job;
 class Filter;
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index d413d33f3..5d38860e7 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -22,12 +22,14 @@
 #include <libdcp/sound_asset.h>
 #include <libdcp/picture_frame.h>
 #include <libdcp/reel.h>
+#include <libdcp/dcp.h>
 #include "writer.h"
 #include "compose.hpp"
 #include "film.h"
 #include "format.h"
 #include "log.h"
 #include "dcp_video_frame.h"
+#include "dcp_content_type.h"
 #include "player.h"
 
 #include "i18n.h"