Rest of src/lib/*.h tidying.

31 files changed, 40 insertions, 67 deletions

diff --git a/src/lib/analyse_audio_job.cc b/src/lib/analyse_audio_job.cc
index e997c03c5..0660d8f20 100644
--- a/src/lib/analyse_audio_job.cc
+++ b/src/lib/analyse_audio_job.cc
@@ -20,6 +20,7 @@
 #include "audio_analysis.h"
 #include "audio_buffers.h"
 #include "analyse_audio_job.h"
+#include "audio_content.h"
 #include "compose.hpp"
 #include "film.h"
 #include "player.h"
diff --git a/src/lib/audio_decoder_stream.cc b/src/lib/audio_decoder_stream.cc
index 52a33c172..2f12af198 100644
--- a/src/lib/audio_decoder_stream.cc
+++ b/src/lib/audio_decoder_stream.cc
@@ -25,6 +25,7 @@
 #include "util.h"
 #include "film.h"
 #include "log.h"
+#include "audio_content.h"
 #include "compose.hpp"
 #include <iostream>
 
diff --git a/src/lib/audio_decoder_stream.h b/src/lib/audio_decoder_stream.h
index 5c772e4f7..3503a46d1 100644
--- a/src/lib/audio_decoder_stream.h
+++ b/src/lib/audio_decoder_stream.h
@@ -22,6 +22,7 @@
 
 #include "audio_stream.h"
 #include "content_audio.h"
+#include "dcpomatic_time.h"
 #include <boost/shared_ptr.hpp>
 
 class AudioContent;
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8cd9f9548..ea11cf0bd 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -43,6 +43,10 @@
 #include "md5_digester.h"
 #include "compose.hpp"
 #include "screen.h"
+#include "audio_content.h"
+#include "video_content.h"
+#include "subtitle_content.h"
+#include "ffmpeg_content.h"
 #include <libcxml/cxml.h>
 #include <dcp/cpl.h>
 #include <dcp/certificate_chain.h>
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 6a520300b..8a8dd9a30 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -27,6 +27,7 @@
 #include "util.h"
 
 struct AVFilterContext;
+struct AVFrame;
 class Image;
 class FFmpegContent;
 
diff --git a/src/lib/image.cc b/src/lib/image.cc
index fcdcca95a..a327c3f85 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -32,6 +32,7 @@ extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
+#include <libavutil/frame.h>
 }
 #include <iostream>
 
diff --git a/src/lib/image.h b/src/lib/image.h
index 7c5f50a62..2d267f861 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -27,6 +27,9 @@
 #include "position.h"
 #include "position_image.h"
 #include "types.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 #include <dcp/colour_conversion.h>
 #include <boost/shared_ptr.hpp>
 
diff --git a/src/lib/kdm.h b/src/lib/kdm.h
index a776b62b3..c6962c196 100644
--- a/src/lib/kdm.h
+++ b/src/lib/kdm.h
@@ -19,7 +19,6 @@
 
 #include <dcp/local_time.h>
 #include <dcp/types.h>
-#include <boost/date_time.hpp>
 #include <boost/filesystem.hpp>
 
 class Screen;
diff --git a/src/lib/piece.h b/src/lib/piece.h
index 9aaeec301..cebc3fb14 100644
--- a/src/lib/piece.h
+++ b/src/lib/piece.h
@@ -21,7 +21,6 @@
 #define DCPOMATIC_PIECE_H
 
 #include "types.h"
-#include "video_content.h"
 
 class Content;
 class Decoder;
diff --git a/src/lib/player.h b/src/lib/player.h
index a795f8174..061388c44 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,30 +20,19 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include "content.h"
+#include "player_subtitles.h"
 #include "film.h"
-#include "rect.h"
-#include "audio_content.h"
-#include "dcpomatic_time.h"
-#include "content_subtitle.h"
+#include "content.h"
 #include "position_image.h"
 #include "piece.h"
-#include "content_video.h"
-#include "player_subtitles.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <list>
 
-class Job;
-class Film;
-class AudioContent;
-class Piece;
-class Image;
-class Decoder;
-class Resampler;
 class PlayerVideo;
-class ImageProxy;
+class Playlist;
 class Font;
+class AudioBuffers;
 
 /** @class Player
  *  @brief A class which can `play' a Playlist.
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0a6cab906..77e19a80e 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -19,8 +19,10 @@
 
 #include "types.h"
 #include "position.h"
+#include "dcpomatic_time.h"
 #include "colour_conversion.h"
 #include "position_image.h"
+#include "data.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
@@ -29,7 +31,6 @@ extern "C" {
 class Image;
 class ImageProxy;
 class Socket;
-class Data;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 3829d6f31..d9c035ac7 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -20,24 +20,14 @@
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include "ffmpeg_content.h"
-#include "audio_mapping.h"
 #include "util.h"
 #include "frame_rate_change.h"
+#include <libcxml/cxml.h>
 #include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <boost/signals2.hpp>
 #include <list>
 
-class Content;
-class FFmpegContent;
-class FFmpegDecoder;
-class StillImageMagickContent;
-class StillImageMagickDecoder;
-class SndfileContent;
-class SndfileDecoder;
-class Job;
 class Film;
-class Region;
 
 struct ContentSorter
 {
diff --git a/src/lib/raw_convert.h b/src/lib/raw_convert.h
index 2e5d1373c..b0973583a 100644
--- a/src/lib/raw_convert.h
+++ b/src/lib/raw_convert.h
@@ -17,8 +17,8 @@
 
 */
 
-#include <iomanip>
 #include "safe_stringstream.h"
+#include <iomanip>
 
 /** A sort-of version of boost::lexical_cast that does uses the "C"
  *  locale (i.e. no thousands separators and a . for the decimal separator).
diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 332b9b4b1..36b991ddf 100644
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -18,7 +18,6 @@
 */
 
 #include "types.h"
-#include "audio_content.h"
 extern "C" {
 #include <libswresample/swresample.h>
 }
diff --git a/src/lib/server.h b/src/lib/server.h
index 314102c1c..fd765e160 100644
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -33,10 +33,6 @@
 class Socket;
 class Log;
 
-namespace cxml {
-	class Node;
-}
-
 /** @class Server
  *  @brief A class to run a server which can accept requests to perform JPEG2000
  *  encoding work.
diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index 400cabe0e..134759ea3 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -20,6 +20,7 @@
 #include "signaller.h"
 #include "server_description.h"
 #include "config.h"
+#include "exceptions.h"
 #include <boost/signals2.hpp>
 #include <boost/thread/condition.hpp>
 
diff --git a/src/lib/signal_manager.h b/src/lib/signal_manager.h
index 546d3d739..b8d892c41 100644
--- a/src/lib/signal_manager.h
+++ b/src/lib/signal_manager.h
@@ -20,7 +20,6 @@
 #ifndef DCPOMATIC_SIGNAL_MANAGER_H
 #define DCPOMATIC_SIGNAL_MANAGER_H
 
-#include <boost/bind.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 
diff --git a/src/lib/signaller.h b/src/lib/signaller.h
index fa249078c..13474ee91 100644
--- a/src/lib/signaller.h
+++ b/src/lib/signaller.h
@@ -22,7 +22,6 @@
 
 #include "signal_manager.h"
 #include <boost/thread/mutex.hpp>
-#include <boost/signals2.hpp>
 
 class WrapperBase
 {
diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index c07b823d4..9dcf954b5 100644
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -21,13 +21,6 @@
 #define DCPOMATIC_SNDFILE_CONTENT_H
 
 #include "single_stream_audio_content.h"
-extern "C" {
-#include <libavutil/audioconvert.h>
-}
-
-namespace cxml {
-	class Node;
-}
 
 class SndfileContent : public SingleStreamAudioContent
 {
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 7fcf5037c..c8d1f1f59 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -17,9 +17,7 @@
 
 */
 
-#include "decoder.h"
 #include "audio_decoder.h"
-#include "audio_examiner.h"
 #include "sndfile_base.h"
 
 class SndfileContent;
diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index 217c03ecd..35687eb00 100644
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -20,8 +20,10 @@
 #ifndef DCPOMATIC_SUBRIP_H
 #define DCPOMATIC_SUBRIP_H
 
-#include "subrip_subtitle.h"
+#include "dcpomatic_time.h"
 #include <sub/subtitle.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 class SubRipContent;
 class subrip_time_test;
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 5f11e27e7..d01c4e45b 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -26,8 +26,6 @@
 #include "content_subtitle.h"
 #include <dcp/subtitle_string.h>
 
-class Film;
-class DCPTimedSubtitle;
 class Image;
 
 class SubtitleDecoder : public virtual Decoder
diff --git a/src/lib/transcoder.h b/src/lib/transcoder.h
index ed0a6b1b5..0dc0560c0 100644
--- a/src/lib/transcoder.h
+++ b/src/lib/transcoder.h
@@ -18,12 +18,12 @@
 */
 
 #include "types.h"
-#include "encoder.h"
 
 class Film;
 class Encoder;
-class VideoFilter;
 class Player;
+class Writer;
+class Job;
 
 /** @class Transcoder */
 class Transcoder : public boost::noncopyable
diff --git a/src/lib/types.cc b/src/lib/types.cc
index 6ab4d56f2..694c34cc0 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -18,6 +18,7 @@
 */
 
 #include "types.h"
+#include "dcpomatic_assert.h"
 #include "raw_convert.h"
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
diff --git a/src/lib/types.h b/src/lib/types.h
index adb2268e3..d0f4ec1f8 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -20,7 +20,6 @@
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_H
 
-#include "dcpomatic_time.h"
 #include "position.h"
 #include "rect.h"
 #include <dcp/util.h>
@@ -33,7 +32,6 @@ class VideoContent;
 class AudioContent;
 class SubtitleContent;
 class FFmpegContent;
-class AudioBuffers;
 
 namespace cxml {
 	class Node;
diff --git a/src/lib/util.cc b/src/lib/util.cc
index bccc368da..c9a530aaf 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -42,6 +42,7 @@
 #include <dcp/subtitle_asset.h>
 extern "C" {
 #include <libavfilter/avfilter.h>
+#include <libavcodec/avcodec.h>
 }
 #include <curl/curl.h>
 #include <glib.h>
diff --git a/src/lib/util.h b/src/lib/util.h
index 9e811f8ad..a0218fc39 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -27,9 +27,6 @@
 #include "types.h"
 #include "dcpomatic_time.h"
 #include <dcp/util.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
@@ -41,7 +38,6 @@ extern "C" {
 namespace dcp {
 	class PictureAsset;
 	class SoundAsset;
-	class SubtitleAsset;
 }
 
 /** The maximum number of audio channels that we can have in a DCP */
diff --git a/src/lib/writer.h b/src/lib/writer.h
index 486d7d672..3455bfd83 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,7 +21,6 @@
  *  @brief Writer class.
  */
 
-#include "exceptions.h"
 #include "types.h"
 #include "player_subtitles.h"
 #include "data.h"
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 159239345..a1d412b62 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -31,6 +31,7 @@
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
 #include "lib/dcp_content.h"
+#include "lib/ffmpeg_content.h"
 #include <wx/wx.h>
 #include <wx/dirdlg.h>
 
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index cf8d3da18..c88b3bb31 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -17,10 +17,10 @@
 
 */
 
+#include "table_dialog.h"
+#include <dcp/certificate.h>
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
-#include <dcp/certificate.h>
-#include "table_dialog.h"
 
 class Progress;
 
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 4f0eef0e1..9a9dfc26d 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -17,12 +17,6 @@
 
 */
 
-#include <list>
-#include <wx/graphics.h>
-#include <boost/weak_ptr.hpp>
-#include "lib/film.h"
-#include "lib/playlist.h"
-#include "lib/image_content.h"
 #include "film_editor.h"
 #include "timeline.h"
 #include "timeline_time_axis_view.h"
@@ -31,6 +25,14 @@
 #include "timeline_subtitle_content_view.h"
 #include "content_panel.h"
 #include "wx_util.h"
+#include "lib/film.h"
+#include "lib/playlist.h"
+#include "lib/image_content.h"
+#include "lib/audio_content.h"
+#include "lib/subtitle_content.h"
+#include <wx/graphics.h>
+#include <boost/weak_ptr.hpp>
+#include <list>
 
 using std::list;
 using std::cout;