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

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index 234424bb38c567e1d71a6c96e61a1b299554d5ad..c255d9caab09fb6b83bbb2efe5ba265a06e74f58 100644 (file)
--- 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 478b0e532f0dab46ad263ac7ce5249269c8ec892..6c0be69873f2b2b1bcd7d81bca83498e4a54d424 100644 (file)
--- 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 5e14fb232234be625e78dfae349fe9ae49df8a14..39d93d375cb741217b24601b4933689505aa04ee 100644 (file)
--- 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 2ecb512055cb5836590a32a706d4be0d1a4711bb..82c95a513a3ca475d7d3312551fed1255000aeba 100644 (file)
--- 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 20c8ea1ea812c60b7b33fd62a8d1300fe8c3958d..0d5591072b69d2c121c992c1bcb18c8cbab5171b 100644 (file)
--- 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 387b1ad7ff74e396a6e85978ec6731a8c3af60d9..6cdaeeecf69dcd317d8ce739196c087596c20444 100644 (file)
--- 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 ca9b9847fe8f9bc7002ca268014273b934f48800..6c7d67203781d14986dfe5406212ad62f643cf14 100644 (file)
--- 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 8d4473fb140cdd14b9117a48641a494ba285dafc..3bf958d82b451d5f49e0183730c5ef2a22d864dd 100644 (file)
--- 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 eaf43f59218bb701e5b7f68b5324da8223f7e275..580374623cf9d29f5b2fb4a3c6f10178f3f4270d 100644 (file)
--- 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 6a3734dcc7091171290d070a8ffba0c8e0823c54..cec054aaaece0d304b6e4f5bda99a5fd0277fd7f 100644 (file)
--- 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 0839ea994d1dc0a8449d6e3e0ffdd5d3e71bacf7..9d583ff6dbd39d46ea7f22dc00d39808b9a614ff 100644 (file)
--- 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 b7f7987ef4fa0d79783df8a56d869f52fedfabf8..14fa3c36a933b3f0389bb84917a1b90363567aa1 100644 (file)
--- 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 57c103e03113f931ae8c56249ab3d7b44329b705..f0f1e321a1f322396f3eb7af4484a304edf8da5d 100644 (file)
--- 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 d7a29c6ed97c49f89ea0207730c92c10d2d59a8f..b4aebc45eb5b83ae0bd1e4ada68e079c41a016b1 100644 (file)
--- 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 c370fef4d52fa3229e7f677bc87eb24efdcb5d70..ff10933e0bedd88b376e1f2baaecf53519478670 100644 (file)
--- 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 9cd327a525ff1f0cd56c457bea9a9c5df8ea5db1..ec1f02d3d12bbe3de540e0ca48698b5c39282857 100644 (file)
--- 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 d735ca6a5515b65f34ad713cb9cf58b401d336d4..f23b5b82d1e1983f0b58c9a54c9d825b0a78822b 100644 (file)
--- 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 5da4a50023cad0d6f5b6138376115f889fa39e34..ce5ccf478480a75a71fdd2f4ba91b741328f2077 100644 (file)
--- 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 4b4d4c92a9822f19ac31c7e91e5ea5c8e53b918c..9d6076f8284be813bcb20ac08f5c3577e9a5bfce 100644 (file)
--- 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 8b09b6fee1628671403895879868f1fe150c582f..8e24cb4c660d43f28ed2e07e1fa68df43eecc512 100644 (file)
--- 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 848a5393ce5c9a28195416298dbcad2ea6ef5418..82206c045e63bdaf38e0bd570574e5b6f9747bd6 100644 (file)
--- 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 4c771419244d3dc00bf39ce82134787bb149c5a1..cb38cd542db16471aa2580325ff7c4b659b47e60 100644 (file)
--- 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 ba3c8fcad106186ca07947726e7065bbe2acbf10..792eb2c97cb9c793762a701d4a1cd5c32606ab51 100644 (file)
--- 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 c93069882af4b1d01c5f0d371b7ab92c74f96aa1..8378373c6e0e29c8c4ed45943a30a6817651ed2e 100644 (file)
--- 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 e9daab52151bb9a2efcabe287f1e2ea14f35b193..12f1e15ffe87b5d1d94cf9d19bdd8cab143fb8dc 100644 (file)
--- 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 b97e7823d6b99b808e18c0ddd0ab6fbbd4ba5096..4b813bca4bbab1ade3888e19507d8ba269725015 100644 (file)
--- 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 268e8c36d200771d84e291ccd90e8f215da54c29..12342b3042748bb64da100da429fe18d7da6803b 100644 (file)
--- 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 84882e89c89c3a9f1057368c35da603b1d708edb..5e782ac1a97e1e451eb2b7fbc332f83157259835 100644 (file)
--- 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 4e49e12548f7dfb7c11720a37695c21f0f95a4de..53982db10f6068478ec6b9395a89f48366cd6ab0 100644 (file)
--- 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 09f8ed5587b0ede63b7cd9e0385093d33e9d66ac..3159abfd190b1ea30929e75b9e83d4299ca0accf 100644 (file)
--- 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 f1df5714243787859f6d95ff5e63590c296d45e9..a9a3979834eaadc941960a88c363b0c58fd9d30a 100644 (file)
--- 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 45caef82082e5013574d29e06f1d44df1af0107b..6a520300b22af2c23b891dde36eb09b56a36b551 100644 (file)
--- 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 fabcb5675f676bafa0cfcb5b7d83062297e11de3..7c5f50a622f9b9c07aaaf8b465387088c06b2f59 100644 (file)
--- 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 87aa1d66d65ee21f215a97d011172dcc374f32e6..37aa7cbc1953017107b8403f95a611713fc6bb99 100644 (file)
--- 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 4a8d91bdbdd95638dfd8fec468b218faecfd900b..67ea466dfb146f79537d58d5c64aeccdc90b2444 100644 (file)
--- 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 ed5ce65a7d31be7e6df986b23316223382dfbd61..4d96306a89c63775121f4e243da36ce2aa507372 100644 (file)
--- 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 f159e38f98a270d6fbce7a90af74862cba105405..792c7b4ebe84a73367f99a60a3f8f884732d34fb 100644 (file)
--- 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 1f19a4160b312ce436994ba8aec6ecb53273c02d..d6b3f878e74a5179483a67d843d9f69a47e9693d 100644 (file)
--- 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 4a0e57d275721bede5a5063c7824e890d3573124..f201844ca7210dcdbf922fc26cb6195aff1a2497 100644 (file)
--- 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 0e904238df62ba96c19f28cc3391a2d76d2e307a..cf4ad34bcf3d92e4ec7e9dcec6636ebaa9a4f837 100644 (file)
--- 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 9914887738bc5859eba5a21eec55e88f15ee56db..f809c5b3546db4672f79c8e7b68fba71f69c3ee6 100644 (file)
--- 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 191d759db8d5453746a72b15691188992b9987e2..666bcf9dd5cf632af969b333377f1f948007628e 100644 (file)
--- 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 41aede6130d420b63dcc29ae843b9850dc55ce94..6b1436918e21b286b39b5b3e9018dea010751f0d 100644 (file)
--- 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 d22789eda7d04db3dbdeb167ceea2976ffc0b62e..6e94492ad5f13b33c919a04576dc42f4881070cf 100644 (file)
--- 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 018f04737acec4df8a050b086aff84be1fbe5659..38374fae3552e03c99cca1bd51253cabe82ff2ee 100644 (file)
--- 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 4e46fdbdffb885778b99e373cd5d38a679c81e73..89421097cd26829647ebf079e3805dcd4916a08d 100644 (file)
--- 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 c9a76e85a2d6da0e06fa198edef22bba40a14974..a7c77ce6c6406e9168503384b92535fafd4c305b 100644 (file)
--- 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 e7e2a3c5715c7e17b684d5a9dd696b93c8123f6e..f9f91417848bd010112ffb4d1abee49089a63ec5 100644 (file)
--- 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 b0a1a538e70f0bd68a322c175cd661393ac3a9bf..35d2df35601d5f01297e0fd3a14b99896f4639a6 100644 (file)
--- 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 3bb0e03f9de103d498c35637d40c355f3b64e107..400cabe0e93532f970fbe43dfe19a472bcff5675 100644 (file)
--- 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 38623422d15e8e18f3b58224bfb48a6ada0cdbf1..617989d207efbbddcb0e2a782f0b1efa6daf2acc 100644 (file)
--- 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 a93650b6d548e7888831b5d6da8acfe0c9d4f6fb..2d6330485569856d1454774bd9239c0a5b578302 100644 (file)
--- 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 7ab13c2c3cf8f80a7f87542443d266cc7203910d..ac982c9ed17457be8df058e72a61e47d14142581 100644 (file)
--- 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 29c610d8364f94209f18a97ff24a274bd588f415..2aa982e168e8209fec388933ba291dbf0ff8b983 100644 (file)
--- 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 1c0bc5a60d045f758a17cf1948decf3dc1aa71c5..fa039380a4da3b474e5ac9792285c0e514172f25 100644 (file)
--- 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"

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index f16087a484e028916bf6bdaa9b63034b7b0b65dc..1ab316fec73a055ae83c2b0354b1220a9dfc0fa3 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -39,6 +39,7 @@
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/util.h"
+#include "lib/video_content.h"
 #include "lib/version.h"
 #include "lib/signal_manager.h"
 #include "lib/log.h"

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 2659b61bb4136c75410a8a2ed0856b6dd4a4b9d6..af148b2fab25e97037c2b7e0cfb7302bbcef92fd 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -30,6 +30,7 @@
 #include "lib/server_finder.h"
 #include "lib/json_server.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "lib/audio_content.h"
 #include <dcp/version.h>
 #include <boost/foreach.hpp>

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 0130b518305802cfde764b8d4c6f191d94b0e488..e3feacb549c12fabc55fea8eba0474ec94984270 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -27,6 +27,7 @@
 #include "lib/dcp_content_type.h"
 #include "lib/ratio.h"
 #include "lib/image_content.h"
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <getopt.h>
 #include <string>

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 17d50ef693a1dd4e713d96876eacb3bf86db3699..a14498359078bc901fcfd5b8228bdb51137f1769 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -25,6 +25,7 @@
 #include "lib/analyse_audio_job.h"
 #include "lib/audio_content.h"
 #include "lib/job_manager.h"
+#include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 
 using std::cout;

diff --git a/test/srt_subtitle_test.cc b/test/srt_subtitle_test.cc
index 4bf2e59ea248a774918b8575e1deffdee34b7087..4920f0be570d8bf4725704a7964ad45402070c22 100644 (file)
--- a/test/srt_subtitle_test.cc
+++ b/test/srt_subtitle_test.cc
@@ -25,6 +25,7 @@
 #include "lib/subrip_content.h"
 #include "lib/dcp_content_type.h"
 #include "lib/font.h"
+#include "lib/ratio.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
 #include <boost/algorithm/string.hpp>

diff --git a/test/test.cc b/test/test.cc
index b86796bbd1b6bd7ad19862eb1bc5d920c769f90b..060386089387c527c31376566cf2681aed8115fd 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -21,12 +21,6 @@
  *  @brief Overall test stuff and useful methods for tests.
  */
 
-#include <vector>
-#include <list>
-#include <Magick++.h>
-#include <sndfile.h>
-#include <libxml++/libxml++.h>
-#include <dcp/dcp.h>
 #include "lib/config.h"
 #include "lib/util.h"
 #include "lib/signal_manager.h"
@@ -36,9 +30,16 @@
 #include "lib/cross.h"
 #include "lib/server_finder.h"
 #include "lib/image.h"
+#include "lib/ratio.h"
+#include <dcp/dcp.h>
+#include <sndfile.h>
+#include <libxml++/libxml++.h>
+#include <Magick++.h>
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
+#include <list>
+#include <vector>
 
 using std::string;
 using std::vector;