Remove some unused stuff.

9 files changed, 14 insertions, 17 deletions

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index ddfb296c9..2ad53da8b 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -26,6 +26,7 @@
 
 #include "decoder.h"
 #include "content.h"
+#include "audio_content.h"
 
 class AudioBuffers;
 
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 637e0ddb2..3f4cda6eb 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -34,5 +34,5 @@ using boost::shared_ptr;
 Decoder::Decoder (shared_ptr<const Film> f)
 	: _film (f)
 {
-	_film_connection = f->Changed.connect (bind (&Decoder::film_changed, this, _1));
+
 }
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 6cce9e68d..9eb4850f9 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -24,17 +24,11 @@
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
-#include <vector>
-#include <string>
-#include <stdint.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include "film.h"
+#include <boost/weak_ptr.hpp>
+#include <boost/utility.hpp>
 
-class Image;
-class Log;
-class DelayLine;
-class FilterGraph;
+class Film;
 
 /** @class Decoder.
  *  @brief Parent class for decoders of content.
@@ -56,13 +50,6 @@ protected:
 
 	/** The Film that we are decoding in */
 	boost::weak_ptr<const Film> _film;
-
-private:
-	/** This will be called when our Film emits Changed */
-	virtual void film_changed (Film::Property) {}
-
-	/** Connection to our Film */
-	boost::signals2::scoped_connection _film_connection;
 };
 
 #endif
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index e6a99b157..e3aa484d1 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -39,6 +39,7 @@ extern "C" {
 #include "ffmpeg.h"
 
 class Film;
+class FilterGraph;
 class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index a3bb0093e..cd5d19807 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -33,6 +33,7 @@ extern "C" {
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
+#include "ffmpeg_content.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 49b78df16..9b403c2bc 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -28,6 +28,7 @@
 
 class Image;
 class VideoFilter;
+class FFmpegContent;
 
 /** @class FilterGraph
  *  @brief A graph of FFmpeg filters.
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 549af09b1..e5491480f 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -20,6 +20,7 @@
 #include <libcxml/cxml.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
+#include "film.h"
 #include "compose.hpp"
 #include "job.h"
 
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 628f4d60d..eeeadbd3f 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -24,6 +24,7 @@
 
 class Film;
 class TimedSubtitle;
+class Image;
 
 class SubtitleDecoder : public virtual Decoder
 {
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 0560cbb6f..26a11c805 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -20,10 +20,14 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
 #include "util.h"
 
 class VideoContent;
+class Image;
 
 class VideoDecoder : public virtual Decoder
 {