Include tidying src/lib/a-j*.h

55 files changed, 87 insertions, 86 deletions

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 234424bb3..c255d9caa 100644
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -22,10 +22,10 @@
  */
 
 #include "job.h"
-#include "audio_analysis.h"
 #include "types.h"
 
 class AudioBuffers;
+class AudioAnalysis;
 class Playlist;
 
 /** @class AnalyseAudioJob
diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index 478b0e532..6c0be6987 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -20,12 +20,15 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <vector>
-#include <list>
-#include <boost/filesystem.hpp>
-#include <boost/optional.hpp>
+#include "dcpomatic_time.h"
 #include <libcxml/cxml.h>
-#include "types.h"
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
+
+namespace xmlpp {
+	class Element;
+}
 
 class AudioPoint
 {
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 5e14fb232..39d93d375 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -25,6 +25,7 @@
 #include "raw_convert.h"
 #include "compose.hpp"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 2ecb51205..82c95a513 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -28,10 +28,6 @@
 #include "audio_stream.h"
 #include "audio_mapping.h"
 
-namespace cxml {
-	class Node;
-}
-
 /** @class AudioContentProperty
  *  @brief Names for properties of AudioContent.
  */
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index 20c8ea1ea..0d5591072 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -20,6 +20,7 @@
 #include "audio_decoder.h"
 #include "audio_buffers.h"
 #include "audio_decoder_stream.h"
+#include "audio_content.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 387b1ad7f..6cdaeeecf 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -25,12 +25,12 @@
 #define DCPOMATIC_AUDIO_DECODER_H
 
 #include "decoder.h"
-#include "content.h"
-#include "audio_content.h"
 #include "content_audio.h"
+#include "audio_stream.h"
 #include <boost/enable_shared_from_this.hpp>
 
 class AudioBuffers;
+class AudioContent;
 class AudioDecoderStream;
 
 /** @class AudioDecoder.
diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index ca9b9847f..6c7d67203 100644
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -25,18 +25,12 @@
 #define DCPOMATIC_AUDIO_MAPPING_H
 
 #include <libcxml/cxml.h>
-#include <dcp/types.h>
-#include <boost/shared_ptr.hpp>
 #include <vector>
 
 namespace xmlpp {
 	class Node;
 }
 
-namespace cxml {
-	class Node;
-}
-
 /** @class AudioMapping.
  *  @brief A many-to-many mapping of audio channels.
  */
diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 8d4473fb1..3bf958d82 100644
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -22,9 +22,12 @@
  */
 
 #include <libcxml/cxml.h>
-#include <dcp/certificate.h>
 #include <boost/enable_shared_from_this.hpp>
 
+namespace xmlpp {
+	class Element;
+}
+
 class Screen;
 
 /** @class Cinema
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index eaf43f592..580374623 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -27,7 +27,6 @@
 
 #include <dcp/colour_conversion.h>
 #include <libcxml/cxml.h>
-#include <boost/utility.hpp>
 
 namespace xmlpp {
 	class Node;
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 6a3734dcc..cec054aaa 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -34,6 +34,7 @@
 #include <dcp/certificate_chain.h>
 #include <libcxml/cxml.h>
 #include <glib.h>
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
diff --git a/src/lib/config.h b/src/lib/config.h
index 0839ea994..9d583ff6d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -25,18 +25,13 @@
 #define DCPOMATIC_CONFIG_H
 
 #include "isdcf_metadata.h"
-#include "video_content.h"
-#include <dcp/metadata.h>
-#include <dcp/certificate.h>
+#include "types.h"
 #include <dcp/certificate_chain.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 #include <boost/filesystem.hpp>
 #include <vector>
 
-class ServerDescription;
-class Scaler;
-class Filter;
 class CinemaSoundProcessor;
 class DCPContentType;
 class Ratio;
diff --git a/src/lib/content.h b/src/lib/content.h
index b7f7987ef..14fa3c36a 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -27,13 +27,16 @@
 #include "types.h"
 #include "signaller.h"
 #include "dcpomatic_time.h"
-#include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
+namespace xmlpp {
+	class Node;
+}
+
 namespace cxml {
 	class Node;
 }
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 57c103e03..f0f1e321a 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -25,6 +25,7 @@
 #include "compose.hpp"
 #include <dcp/dcp.h>
 #include <dcp/exceptions.h>
+#include <libxml++/libxml++.h>
 #include <iterator>
 
 #include "i18n.h"
diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index d7a29c6ed..b4aebc45e 100644
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -29,7 +29,6 @@
 #include "subtitle_content.h"
 #include <libcxml/cxml.h>
 #include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
 
 class DCPContentProperty
 {
diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h
index c370fef4d..ff10933e0 100644
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
 #define DCPOMATIC_DCP_CONTENT_TYPE_H
 
-/** @file src/content_type.h
- *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
+/** @file src/dcp_content_type.h
+ *  @brief DCPContentType class.
  */
 
 #include <dcp/dcp.h>
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 9cd327a52..ec1f02d3d 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -23,6 +23,7 @@
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/mono_picture_asset.h>
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index d735ca6a5..f23b5b82d 100644
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -30,7 +30,6 @@ namespace dcp {
 }
 
 class DCPContent;
-class Log;
 struct dcp_subtitle_within_dcp_test;
 
 class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 5da4a5002..ce5ccf478 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -23,6 +23,7 @@
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
+#include <dcp/decrypted_kdm.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
diff --git a/src/lib/dcp_subtitle.h b/src/lib/dcp_subtitle.h
index 4b4d4c92a..9d6076f82 100644
--- a/src/lib/dcp_subtitle.h
+++ b/src/lib/dcp_subtitle.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DCPOMATIC_SRC_LIB_DCP_SUBTITLE_H
-#define DCPOMATIC_SRC_LIB_DCP_SUBTITLE_H
+#ifndef DCPOMATIC_DCP_SUBTITLE_H
+#define DCPOMATIC_DCP_SUBTITLE_H
 
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 8b09b6fee..8e24cb4c6 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -23,6 +23,7 @@
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 848a5393c..82206c045 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -44,7 +44,9 @@
 #include <dcp/openjpeg_image.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/colour_matrix.h>
+#include <libxml++/libxml++.h>
 #include <boost/asio.hpp>
+#include <boost/thread.hpp>
 #include <stdint.h>
 #include <iomanip>
 #include <iostream>
diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 4c7714192..cb38cd542 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,21 +18,17 @@
 
 */
 
-#include "util.h"
-#include <dcp/picture_asset_writer.h>
+#include "types.h"
+#include "data.h"
+#include "server_description.h"
 #include <libcxml/cxml.h>
 
 /** @file  src/dcp_video_frame.h
  *  @brief A single frame of video destined for a DCP.
  */
 
-class ServerDescription;
-class Scaler;
-class Image;
 class Log;
-class Subtitle;
 class PlayerVideo;
-class Data;
 
 /** @class DCPVideo
  *  @brief A single frame of video destined for a DCP.
diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index ba3c8fcad..792eb2c97 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -30,7 +30,6 @@
 #include <stdint.h>
 #include <cmath>
 #include <ostream>
-#include <sstream>
 #include <iomanip>
 
 class dcpomatic_round_up_test;
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index c93069882..8378373c6 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -26,8 +26,6 @@
 
 #include "types.h"
 #include "dcpomatic_time.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
 
 class Decoded;
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index e9daab521..12f1e15ff 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -35,8 +35,6 @@
 #include <list>
 #include <stdint.h>
 
-class Image;
-class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideo;
diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index b97e7823d..4b813bca4 100644
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -21,7 +21,6 @@
 #include <boost/shared_ptr.hpp>
 
 class Content;
-class Log;
 
 class ExamineContentJob : public Job
 {
diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 268e8c36d..12342b304 100644
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -24,12 +24,12 @@
 #ifndef DCPOMATIC_EXCEPTIONS_H
 #define DCPOMATIC_EXCEPTIONS_H
 
-#include <boost/thread.hpp>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <boost/exception/all.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/thread/mutex.hpp>
 #include <stdexcept>
 #include <cstring>
 
diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index 84882e89c..5e782ac1a 100644
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -18,7 +18,6 @@
 */
 
 #include "ffmpeg_stream.h"
-#include "audio_mapping.h"
 #include "audio_stream.h"
 #include "dcpomatic_time.h"
 
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 4e49e1254..53982db10 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -36,6 +36,7 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavutil/pixdesc.h>
 }
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 09f8ed558..3159abfd1 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -23,9 +23,6 @@
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
-#include "audio_mapping.h"
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
diff --git a/src/lib/film.h b/src/lib/film.h
index f1df57142..a9a397983 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -30,7 +30,6 @@
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
-#include "ratio.h"
 #include <dcp/key.h>
 #include <dcp/encrypted_kdm.h>
 #include <boost/signals2.hpp>
@@ -40,6 +39,10 @@
 #include <vector>
 #include <inttypes.h>
 
+namespace xmlpp {
+	class Document;
+}
+
 class DCPContentType;
 class Log;
 class Content;
@@ -49,6 +52,7 @@ class AudioContent;
 class Screen;
 class AudioProcessor;
 class AudioMapping;
+class Ratio;
 struct isdcf_name_test;
 
 /** @class Film
diff --git a/src/lib/filter_graph.h b/src/lib/filter_graph.h
index 45caef820..6a520300b 100644
--- a/src/lib/filter_graph.h
+++ b/src/lib/filter_graph.h
@@ -28,7 +28,6 @@
 
 struct AVFilterContext;
 class Image;
-class VideoFilter;
 class FFmpegContent;
 
 /** @class FilterGraph
diff --git a/src/lib/image.h b/src/lib/image.h
index fabcb5675..7c5f50a62 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -28,14 +28,9 @@
 #include "position_image.h"
 #include "types.h"
 #include <dcp/colour_conversion.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavfilter/avfilter.h>
-}
 #include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-#include <string>
 
+struct AVFrame;
 class Socket;
 
 class Image
diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 87aa1d66d..37aa7cbc1 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
 #include "compose.hpp"
@@ -26,6 +25,8 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 4a8d91bdb..67ea466df 100644
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -21,11 +21,6 @@
 #define DCPOMATIC_IMAGE_CONTENT_H
 
 #include "video_content.h"
-#include <boost/enable_shared_from_this.hpp>
-
-namespace cxml {
-	class Node;
-}
 
 class ImageContent : public VideoContent
 {
diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h
index ed5ce65a7..4d96306a8 100644
--- a/src/lib/image_decoder.h
+++ b/src/lib/image_decoder.h
@@ -19,10 +19,6 @@
 
 #include "video_decoder.h"
 
-namespace Magick {
-	class Image;
-}
-
 class ImageContent;
 
 class ImageDecoder : public VideoDecoder
diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index f159e38f9..792c7b4eb 100644
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -19,10 +19,6 @@
 
 #include "video_examiner.h"
 
-namespace Magick {
-	class Image;
-}
-
 class ImageContent;
 
 class ImageExaminer : public VideoExaminer
diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 1f19a4160..d6b3f878e 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -25,22 +25,19 @@
  */
 
 #include <dcp/types.h>
-#include <Magick++.h>
-#include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include <boost/utility.hpp>
 
 class Image;
 class Socket;
 
-namespace cxml {
+namespace xmlpp {
 	class Node;
 }
 
-namespace dcp {
-	class MonoPictureFrame;
-	class StereoPictureFrame;
+namespace cxml {
+	class Node;
 }
 
 /** @class ImageProxy
diff --git a/src/lib/isdcf_metadata.cc b/src/lib/isdcf_metadata.cc
index 4a0e57d27..f201844ca 100644
--- a/src/lib/isdcf_metadata.cc
+++ b/src/lib/isdcf_metadata.cc
@@ -20,6 +20,7 @@
 #include "isdcf_metadata.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <iostream>
 
 #include "i18n.h"
diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h
index 0e904238d..cf4ad34bc 100644
--- a/src/lib/isdcf_metadata.h
+++ b/src/lib/isdcf_metadata.h
@@ -21,9 +21,12 @@
 #define DCPOMATIC_ISDCF_METADATA_H
 
 #include <libcxml/cxml.h>
-#include <libxml++/libxml++.h>
 #include <string>
 
+namespace xmlpp {
+	class Node;
+}
+
 class ISDCFMetadata
 {
 public:
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 991488773..f809c5b35 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -28,6 +28,7 @@
 #include <dcp/colour_conversion.h>
 #include <dcp/rgb_xyz.h>
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 191d759db..666bcf9dd 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -21,6 +21,11 @@
 #include "data.h"
 #include <dcp/util.h>
 
+namespace dcp {
+	class MonoPictureFrame;
+	class StereoPictureFrame;
+}
+
 class Data;
 
 class J2KImageProxy : public ImageProxy
diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index 41aede613..6b1436918 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -17,13 +17,14 @@
 
 */
 
-#include <Magick++.h>
 #include "magick_image_proxy.h"
 #include "cross.h"
 #include "exceptions.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "compose.hpp"
+#include <Magick++.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
index d22789eda..6e94492ad 100644
--- a/src/lib/magick_image_proxy.h
+++ b/src/lib/magick_image_proxy.h
@@ -18,7 +18,9 @@
 */
 
 #include "image_proxy.h"
+#include <Magick++.h>
 #include <boost/thread/mutex.hpp>
+#include <boost/filesystem.hpp>
 
 class MagickImageProxy : public ImageProxy
 {
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 018f04737..38374fae3 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -23,6 +23,7 @@
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
 
 using std::string;
 using std::cout;
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 4e46fdbdf..89421097c 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -17,8 +17,6 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <boost/shared_ptr.hpp>
 #include "playlist.h"
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
@@ -31,6 +29,9 @@
 #include "config.h"
 #include "util.h"
 #include "md5_digester.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <boost/shared_ptr.hpp>
 
 #include "i18n.h"
 
diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index c9a76e85a..a7c77ce6c 100644
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -21,10 +21,11 @@
 #include "image.h"
 #include "raw_convert.h"
 #include <dcp/util.h>
+#include <libcxml/cxml.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/server.cc b/src/lib/server.cc
index e7e2a3c57..f9f914178 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -23,6 +23,7 @@
  */
 
 #include "server.h"
+#include "util.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "dcp_video.h"
@@ -35,6 +36,7 @@
 #include "compose.hpp"
 #include "log.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/scoped_array.hpp>
 #include <string>
diff --git a/src/lib/server_description.h b/src/lib/server_description.h
index b0a1a538e..35d2df356 100644
--- a/src/lib/server_description.h
+++ b/src/lib/server_description.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef DCPOMATIC_SERVER_DESCRIPTION_H
+#define DCPOMATIC_SERVER_DESCRIPTION_H
+
 /** @class ServerDescription
  *  @brief Class to describe a server to which we can send encoding work.
  */
@@ -62,3 +65,5 @@ private:
 	/** number of threads to use on the server */
 	int _threads;
 };
+
+#endif
diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index 3bb0e03f9..400cabe0e 100644
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -17,10 +17,13 @@
 
 */
 
-#include "server.h"
 #include "signaller.h"
+#include "server_description.h"
 #include "config.h"
 #include <boost/signals2.hpp>
+#include <boost/thread/condition.hpp>
+
+class Socket;
 
 class ServerFinder : public Signaller, public ExceptionStore
 {
diff --git a/src/lib/single_stream_audio_content.cc b/src/lib/single_stream_audio_content.cc
index 38623422d..617989d20 100644
--- a/src/lib/single_stream_audio_content.cc
+++ b/src/lib/single_stream_audio_content.cc
@@ -21,6 +21,7 @@
 #include "audio_examiner.h"
 #include "film.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index a93650b6d..2d6330485 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -27,6 +27,7 @@
 #include "safe_stringstream.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc
index 7ab13c2c3..ac982c9ed 100644
--- a/src/lib/subrip_content.cc
+++ b/src/lib/subrip_content.cc
@@ -23,6 +23,7 @@
 #include "film.h"
 #include "font.h"
 #include "raw_convert.h"
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index 29c610d83..2aa982e16 100644
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -24,6 +24,7 @@
 #include "font.h"
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
 
 #include "i18n.h"
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1c0bc5a60..fa039380a 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -32,6 +32,7 @@
 #include "raw_convert.h"
 #include <libcxml/cxml.h>
 #include <dcp/colour_matrix.h>
+#include <libxml++/libxml++.h>
 #include <iomanip>
 
 #include "i18n.h"