Some include tidying.

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index a218cb3400d563354b751101eeb349bf87f81b59..bde9d0d403fae5723e48950adec02ff8eb676bd7 100644 (file)
--- a/src/lib/analyse_audio_job.h
+++ b/src/lib/analyse_audio_job.h
@@ -24,7 +24,6 @@
 #include "job.h"
 #include "audio_analysis.h"
 #include "types.h"
-#include "dcpomatic_time.h"
 
 class AudioBuffers;
 class AudioContent;

diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index b91a1cf5123d3c43c3a1b40418e279ff273b4630..865d647816e00ebcb6a8dac6c617db936ddd2329 100644 (file)
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -24,9 +24,8 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <vector>
-#include <list>
 #include <boost/filesystem.hpp>
+#include <vector>
 
 /** @class AudioPoint
  *  @brief A single point of an audio analysis for one portion of one channel.

diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index 9fc69daadb23574158e6b298d7b0140a23071716..b44175cbcd78704d670ef9cbe2094adcb83f1faa 100644 (file)
--- a/src/lib/audio_filter.h
+++ b/src/lib/audio_filter.h
@@ -17,8 +17,8 @@
 
 */
 
-#include <vector>
 #include <boost/shared_ptr.hpp>
+#include <vector>
 
 class AudioBuffers;
 class audio_filter_impulse_kernel_test;

diff --git a/src/lib/audio_mapping.h b/src/lib/audio_mapping.h
index a76d83a370f703dceded47e1d5aff6e90cd472e3..fdb23df8bc3d1f039b69a2830f2c0f5e3193d067 100644 (file)
--- a/src/lib/audio_mapping.h
+++ b/src/lib/audio_mapping.h
@@ -24,10 +24,10 @@
 #ifndef DCPOMATIC_AUDIO_MAPPING_H
 #define DCPOMATIC_AUDIO_MAPPING_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <dcp/types.h>
 #include <libcxml/cxml.h>
+#include <dcp/types.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace xmlpp {
        class Node;

diff --git a/src/lib/audio_processor.h b/src/lib/audio_processor.h
index 9b332e7fec50c955d7bc62a6bb27a49d0a440b34..610e973a0cbd729681e6aaf0c9b3e6ee4e5e53c5 100644 (file)
--- a/src/lib/audio_processor.h
+++ b/src/lib/audio_processor.h
@@ -20,10 +20,10 @@
 #ifndef DCPOMATIC_AUDIO_PROCESSOR_H
 #define DCPOMATIC_AUDIO_PROCESSOR_H
 
+#include "channel_count.h"
+#include <boost/shared_ptr.hpp>
 #include <list>
 #include <string>
-#include <boost/shared_ptr.hpp>
-#include "channel_count.h"
 
 class AudioBuffers;
 

diff --git a/src/lib/cinema.h b/src/lib/cinema.h
index 8421f468751f72548560c9705f27cefa9bb8fcaa..5c0386837098f1fd668749a57cafeee078ced081 100644 (file)
--- a/src/lib/cinema.h
+++ b/src/lib/cinema.h
@@ -21,9 +21,9 @@
  *  @brief Screen and Cinema classes.
  */
 
-#include <boost/enable_shared_from_this.hpp>
-#include <dcp/certificates.h>
 #include <libcxml/cxml.h>
+#include <dcp/certificates.h>
+#include <boost/enable_shared_from_this.hpp>
 
 class Cinema;
 

diff --git a/src/lib/cinema_sound_processor.h b/src/lib/cinema_sound_processor.h
index f735b12277d0c3984a19803cd4941e0e23dd9c34..30ab7d5a5a90492b1b0f9fdd68ccfdf80c439edf 100644 (file)
--- a/src/lib/cinema_sound_processor.h
+++ b/src/lib/cinema_sound_processor.h
@@ -24,9 +24,9 @@
 #ifndef DCPOMATIC_CINEMA_SOUND_PROCESSOR_H
 #define DCPOMATIC_CINEMA_SOUND_PROCESSOR_H
 
+#include <boost/utility.hpp>
 #include <string>
 #include <vector>
-#include <boost/utility.hpp>
 
 /** @class CinemaSoundProcessor
  *  @brief Class to describe a cimema's sound processor.

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index 706e51fe8cd60ef1f731024d179989f922d5cd19..dbc6c9d9d970ac11f22e5a7ab4744d8f0e26f5f4 100644 (file)
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -25,10 +25,10 @@
 #undef check
 #endif
 
+#include <libcxml/cxml.h>
 #include <boost/utility.hpp>
 #include <boost/optional.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
-#include <libcxml/cxml.h>
 
 namespace xmlpp {
        class Node;

diff --git a/src/lib/config.h b/src/lib/config.h
index 28b1dbd1dab2c318c36d548bbbe645d2807c22e3..45a9e282b7aed6ea638c540d264defd3df26b21a 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -24,16 +24,16 @@
 #ifndef DCPOMATIC_CONFIG_H
 #define DCPOMATIC_CONFIG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/signals2.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/metadata.h>
-#include <dcp/certificates.h>
-#include <dcp/signer.h>
 #include "isdcf_metadata.h"
 #include "colour_conversion.h"
 #include "video_content.h"
+#include <dcp/metadata.h>
+#include <dcp/certificates.h>
+#include <dcp/signer.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+#include <boost/filesystem.hpp>
+#include <vector>
 
 class ServerDescription;
 class Scaler;

diff --git a/src/lib/content.h b/src/lib/content.h
index c2841b64ee3f02ec28439312f93d4833b09aad52..e383f9ff0a599e52e5ba6a97a4083f7cec773ea3 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -24,15 +24,14 @@
 #ifndef DCPOMATIC_CONTENT_H
 #define DCPOMATIC_CONTENT_H
 
-#include <set>
+#include "types.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>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include "types.h"
-#include "dcpomatic_time.h"
 
 namespace cxml {
        class Node;

diff --git a/src/lib/content_subtitle.h b/src/lib/content_subtitle.h
index 8868618ada940ccf883f552dbf075ab449fab3bb..36bc22b13e5e5f04d7bd9243f264784eb67ac7cb 100644 (file)
--- a/src/lib/content_subtitle.h
+++ b/src/lib/content_subtitle.h
@@ -20,11 +20,11 @@
 #ifndef DCPOMATIC_CONTENT_SUBTITLE_H
 #define DCPOMATIC_CONTENT_SUBTITLE_H
 
-#include <list>
-#include <dcp/subtitle_string.h>
 #include "dcpomatic_time.h"
 #include "rect.h"
 #include "image_subtitle.h"
+#include <dcp/subtitle_string.h>
+#include <list>
 
 class Image;
 

diff --git a/src/lib/cross.h b/src/lib/cross.h
index c206fa55dbf3064cf17bcf68e719a45bb1765e2d..6a77aaa18d8127e972c261d7c7ce200baa3e5008 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -24,10 +24,10 @@
 #ifndef DCPOMATIC_CROSS_H
 #define DCPOMATIC_CROSS_H
 
-#include <boost/filesystem.hpp>
 #ifdef DCPOMATIC_OSX
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #endif
+#include <boost/filesystem.hpp>
 
 #ifdef DCPOMATIC_WINDOWS
 #define WEXITSTATUS(w) (w)

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index d6fe8c8207a237223a07e8d708d66d68c8613d7a..82f5a8089be69ff40bf753169213358d92dfc64b 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -24,12 +24,12 @@
  *  @brief DCPContent class.
  */
 
-#include <libcxml/cxml.h>
-#include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
 #include "video_content.h"
 #include "single_stream_audio_content.h"
 #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 ebfe09518a5577189e745d05d0a37bfd6d1ce04c..34398009bcaa24fb00bd4fe7e47d82fe6ac8af28 100644 (file)
--- a/src/lib/dcp_content_type.h
+++ b/src/lib/dcp_content_type.h
@@ -24,9 +24,9 @@
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
  */
 
+#include <dcp/dcp.h>
 #include <string>
 #include <vector>
-#include <dcp/dcp.h>
 
 /** @class DCPContentType
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)

diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index d517a8f0258ab47b3f5c1b1a0a3e6e7910c2b034..051333c45727b11f73b29d9797cdf57079382791 100644 (file)
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -18,8 +18,8 @@
 
 */
 
-#include <dcp/picture_mxf_writer.h>
 #include "util.h"
+#include <dcp/picture_mxf_writer.h>
 
 /** @file  src/dcp_video_frame.h
  *  @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 9c74c516b2334fdd4b6f5d6638b83cac1a958284..2408bff812991dd8da237499eeb6509c9ba76fa2 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -20,13 +20,13 @@
 #ifndef DCPOMATIC_TIME_H
 #define DCPOMATIC_TIME_H
 
+#include "frame_rate_change.h"
+#include "safe_stringstream.h"
+#include <stdint.h>
 #include <cmath>
 #include <ostream>
 #include <sstream>
 #include <iomanip>
-#include <stdint.h>
-#include "frame_rate_change.h"
-#include "safe_stringstream.h"
 
 class dcpomatic_round_up_test;
 

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 583a92636443ba7cd1bd650eb3cf61144017394c..c1b8598650357b6a9978efdbcc28eb495ba69511 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -24,11 +24,11 @@
 #ifndef DCPOMATIC_DECODER_H
 #define DCPOMATIC_DECODER_H
 
+#include "types.h"
+#include "dcpomatic_time.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 #include <boost/utility.hpp>
-#include "types.h"
-#include "dcpomatic_time.h"
 
 class Decoded;
 

diff --git a/src/lib/encoded_data.h b/src/lib/encoded_data.h
index 232ed6e8a4aaedc0871f7d3a1f6318129b80d7f4..245a888ddf531a51a8fcd66eb867545caa5a3816 100644 (file)
--- a/src/lib/encoded_data.h
+++ b/src/lib/encoded_data.h
@@ -17,10 +17,10 @@
 
 */
 
+#include "types.h"
+#include <dcp/picture_mxf_writer.h>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
-#include <dcp/picture_mxf_writer.h>
-#include "types.h"
 
 class Socket;
 class Film;

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 51df0176b575267a50ec75e5596059655811ec9e..1da5d1c96b6a67d0bc7714fcbdfd29dd9bc89bc3 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -24,6 +24,14 @@
  *  @brief Encoder to J2K and WAV for DCP.
  */
 
+#include "util.h"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
+extern "C" {
+#include <libavutil/samplefmt.h>
+#include <libswresample/swresample.h>
+}
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
@@ -31,14 +39,6 @@
 #include <boost/optional.hpp>
 #include <list>
 #include <stdint.h>
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
-#include "util.h"
-#include "config.h"
-#include "cross.h"
-#include "exceptions.h"
 
 class Image;
 class AudioBuffers;

diff --git a/src/lib/examine_content_job.h b/src/lib/examine_content_job.h
index f0d9eae930c9ce6d8ef7ef6ac8d876240ca793d0..e59dba0b8fa2796b2f7ae73d94bc6649abf5b90c 100644 (file)
--- a/src/lib/examine_content_job.h
+++ b/src/lib/examine_content_job.h
@@ -17,8 +17,8 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
 #include "job.h"
+#include <boost/shared_ptr.hpp>
 
 class Content;
 class Log;

diff --git a/src/lib/exceptions.h b/src/lib/exceptions.h
index 90a0abfc717d46cfa697b92fef0dccba62795620..05c66df3a66e57bc2ed3c236b1f6e637bdfd81ee 100644 (file)
--- a/src/lib/exceptions.h
+++ b/src/lib/exceptions.h
@@ -24,14 +24,14 @@
 #ifndef DCPOMATIC_EXCEPTIONS_H
 #define DCPOMATIC_EXCEPTIONS_H
 
-#include <stdexcept>
-#include <cstring>
-#include <boost/exception/all.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
+#include <boost/exception/all.hpp>
+#include <boost/filesystem.hpp>
+#include <stdexcept>
+#include <cstring>
 
 /** @class StringError
  *  @brief A parent class for exceptions using messages held in a std::string

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 8aaa54f84afab6973938e83eb138a60d6a2fa9c3..6dd9da0dc4efb9f571ec76629ed7c6953ebd2d6d 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -20,13 +20,13 @@
 #ifndef DCPOMATIC_FFMPEG_H
 #define DCPOMATIC_FFMPEG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include "file_group.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <vector>
 
 struct AVFilterGraph;
 struct AVCodecContext;

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index fca3bf8beb3e52afff2494b0b5addbdfd198c2fd..8203b7ac18d01b4303629ccb7c6f888c18d81ecf 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -20,12 +20,12 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 #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/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 9f85c2dca8e5e2d9fc66045cd694dab07c12fb90..60c777d8d04717875c126748f5cfabefa89e8bf5 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -21,21 +21,21 @@
  *  @brief A decoder using FFmpeg to decode content.
  */
 
-#include <vector>
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-#include <boost/thread/mutex.hpp>
-extern "C" {
-#include <libavcodec/avcodec.h>
-}
 #include "util.h"
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
+extern "C" {
+#include <libavcodec/avcodec.h>
+}
+#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <boost/thread/mutex.hpp>
+#include <stdint.h>
+#include <vector>
+#include <string>
 
 class Log;
 class FilterGraph;

diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h
index 4378e241b973e53aa541d46da6afda1491e0e5f5..1ef7e3ba90f00f6dc04dfa2c9fe029e1a108fe87 100644 (file)
--- a/src/lib/ffmpeg_examiner.h
+++ b/src/lib/ffmpeg_examiner.h
@@ -17,9 +17,9 @@
 
 */
 
-#include <boost/optional.hpp>
 #include "ffmpeg.h"
 #include "video_examiner.h"
+#include <boost/optional.hpp>
 
 class FFmpegAudioStream;
 class FFmpegSubtitleStream;

diff --git a/src/lib/ffmpeg_stream.h b/src/lib/ffmpeg_stream.h
index 6bbcd0b0131d441af5d469edf65031bdc5010d93..6479bd70d96a817c73cf91e39cea41e0c70adea9 100644 (file)
--- a/src/lib/ffmpeg_stream.h
+++ b/src/lib/ffmpeg_stream.h
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_FFMPEG_STREAM_H
 #define DCPOMATIC_FFMPEG_STREAM_H
 
-#include <boost/lexical_cast.hpp>
 #include <libcxml/cxml.h>
+#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;

diff --git a/src/lib/file_group.h b/src/lib/file_group.h
index 5a65de96f7584e3afdab1ad71fd928f5df3b3005..9c67afbce8201f80d5b636a3e988c0ea7ee833e9 100644 (file)
--- a/src/lib/file_group.h
+++ b/src/lib/file_group.h
@@ -24,8 +24,8 @@
 #ifndef DCPOMATIC_FILE_GROUP_H
 #define DCPOMATIC_FILE_GROUP_H
 
-#include <vector>
 #include <boost/filesystem.hpp>
+#include <vector>
 
 /** @class FileGroup
  *  @brief A class to make a list of files behave like they were concatenated.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 22dc0ca90ef2e176d6bc9672d6baa608e16824f4..f0ddd14a8a941810e06dc8c8905fd39b2e975fb4 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -17,23 +17,6 @@
 
 */
 
-#include <stdexcept>
-#include <iostream>
-#include <algorithm>
-#include <fstream>
-#include <cstdlib>
-#include <iomanip>
-#include <unistd.h>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include <dcp/cpl.h>
-#include <dcp/signer.h>
-#include <dcp/util.h>
-#include <dcp/local_time.h>
-#include <dcp/raw_convert.h>
 #include "film.h"
 #include "job.h"
 #include "util.h"
@@ -54,6 +37,25 @@
 #include "cross.h"
 #include "cinema.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <dcp/cpl.h>
+#include <dcp/signer.h>
+#include <dcp/util.h>
+#include <dcp/local_time.h>
+#include <dcp/raw_convert.h>
+#include <dcp/decrypted_kdm.h>
+#include <libxml++/libxml++.h>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+#include <unistd.h>
+#include <stdexcept>
+#include <iostream>
+#include <algorithm>
+#include <fstream>
+#include <cstdlib>
+#include <iomanip>
+
 
 #include "i18n.h"
 

diff --git a/src/lib/film.h b/src/lib/film.h
index 1906de91b19bc94674c86b6b5e0612687791046d..8628d8b38e64276710d72c48e5adb9ef83d5add4 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -25,19 +25,18 @@
 #ifndef DCPOMATIC_FILM_H
 #define DCPOMATIC_FILM_H
 
-#include <string>
-#include <vector>
-#include <inttypes.h>
-#include <boost/signals2.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/key.h>
-#include <dcp/decrypted_kdm.h>
-#include <dcp/encrypted_kdm.h>
 #include "util.h"
 #include "types.h"
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
+#include <dcp/key.h>
+#include <dcp/encrypted_kdm.h>
+#include <boost/signals2.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/filesystem.hpp>
+#include <string>
+#include <vector>
+#include <inttypes.h>
 
 class DCPContentType;
 class Log;

diff --git a/src/lib/filter.h b/src/lib/filter.h
index 258e7499126f370b8fa617ed5c1e654c99b537d0..66ecc4308355ba19c55cd4fa91a2ffbc8d4619d7 100644 (file)
--- a/src/lib/filter.h
+++ b/src/lib/filter.h
@@ -24,9 +24,9 @@
 #ifndef DCPOMATIC_FILTER_H
 #define DCPOMATIC_FILTER_H
 
+#include <boost/utility.hpp>
 #include <string>
 #include <vector>
-#include <boost/utility.hpp>
 
 /** @class Filter
  *  @brief A class to describe one of FFmpeg's video filters.

diff --git a/src/lib/image.h b/src/lib/image.h
index 172250eb1bb253ffd6a87e9998951ca6b534a7c3..8ca6aae09b751a05512fd44038694e081ce946b5 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -24,17 +24,17 @@
 #ifndef DCPOMATIC_IMAGE_H
 #define DCPOMATIC_IMAGE_H
 
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
+#include "util.h"
+#include "position.h"
+#include "position_image.h"
+#include <dcp/image.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include <dcp/image.h>
-#include "util.h"
-#include "position.h"
-#include "position_image.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <string>
 
 class Scaler;
 

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index 6b70d578988eae42cf1ca5d0478f480af78eee54..8c50fd8a87f89cd0115d2a4e49b462d3af976448 100644 (file)
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.h
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_IMAGE_CONTENT_H
 #define DCPOMATIC_IMAGE_CONTENT_H
 
-#include <boost/enable_shared_from_this.hpp>
 #include "video_content.h"
+#include <boost/enable_shared_from_this.hpp>
 
 namespace cxml {
        class Node;

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index 79b2bf4e89270d53f3a9b69684c94ea8a6929fdd..e2d86b8a7ca05a31f3815f183d885c7c5f376730 100644 (file)
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -24,10 +24,10 @@
  *  @brief ImageProxy and subclasses.
  */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
 #include <Magick++.h>
 #include <libxml++/libxml++.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/filesystem.hpp>
 
 class Image;
 class Socket;

diff --git a/src/lib/isdcf_metadata.h b/src/lib/isdcf_metadata.h
index e63f290e47de854ed9347433739eafc57564015d..62c821d820c733dd591b32bba8554ec8045fbe34 100644 (file)
--- a/src/lib/isdcf_metadata.h
+++ b/src/lib/isdcf_metadata.h
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_ISDCF_METADATA_H
 #define DCPOMATIC_ISDCF_METADATA_H
 
-#include <string>
-#include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <string>
 
 class ISDCFMetadata
 {

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 299180f50ceda178ad286e4d015125eab77e6874..7790f617b0f95789d1e6275074e0617d28d76d27 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -17,8 +17,8 @@
 
 */
 
-#include <dcp/util.h>
 #include "image_proxy.h"
+#include <dcp/util.h>
 
 class EncodedData;
 

diff --git a/src/lib/job.h b/src/lib/job.h
index b7dfc589132669fcff375caa1e60231c20054bc8..28c12a3dcd308804f42b7fd3c23124b5c75bb288 100644 (file)
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -24,11 +24,11 @@
 #ifndef DCPOMATIC_JOB_H
 #define DCPOMATIC_JOB_H
 
-#include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
+#include <string>
 
 class Film;
 

diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index f0673df1531bd933d0ebb6662795e20e18cc9a84..9d8620cbb58165ef320d40497235a92736e325e6 100644 (file)
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -21,10 +21,10 @@
  *  @brief A simple scheduler for jobs.
  */
 
-#include <list>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
 #include <boost/signals2.hpp>
+#include <list>
 
 class Job;
 extern void wait_for_jobs ();

diff --git a/src/lib/log.h b/src/lib/log.h
index cee1ce495e1a3f2fc8e5dd3a3a2882fba0b552a6..300df743b9c7f4f790eafc4e465b45a7a1dfffe7 100644 (file)
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -24,10 +24,10 @@
  *  @brief A very simple logging class.
  */
 
-#include <string>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
+#include <string>
 
 /** @class Log
  *  @brief A very simple logging class.

diff --git a/src/lib/md5_digester.h b/src/lib/md5_digester.h
index d5b6a9c4c12a8c26850b80ff700bdcff5cb27daa..981334e28d1661ae61327daac67b98c7dbbb0761 100644 (file)
--- a/src/lib/md5_digester.h
+++ b/src/lib/md5_digester.h
@@ -17,10 +17,10 @@
 
 */
 
-#include <string>
+#include <openssl/md5.h>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
-#include <openssl/md5.h>
+#include <string>
 
 class MD5Digester : public boost::noncopyable
 {

diff --git a/src/lib/player.h b/src/lib/player.h
index 3852965853ed5ef17a0624a04018a4409352a0f3..5d2273a44018c04e50605fd71179f31176240f52 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -20,9 +20,6 @@
 #ifndef DCPOMATIC_PLAYER_H
 #define DCPOMATIC_PLAYER_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include "playlist.h"
 #include "content.h"
 #include "film.h"
@@ -34,6 +31,9 @@
 #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;

diff --git a/src/lib/player_subtitles.h b/src/lib/player_subtitles.h
index 46994ea3bd4f7924576f23b00c495ce1d23887ac..d0a3b4f657366b4e06af0a2c54e7441f471b8d91 100644 (file)
--- a/src/lib/player_subtitles.h
+++ b/src/lib/player_subtitles.h
@@ -20,8 +20,8 @@
 #ifndef DCPOMATIC_PLAYER_SUBTITLES_H
 #define DCPOMATIC_PLAYER_SUBTITLES_H
 
-#include <dcp/subtitle_string.h>
 #include "image_subtitle.h"
+#include <dcp/subtitle_string.h>
 
 class PlayerSubtitles
 {

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index f1d0543d7cc25879acb672ffc54bac20aeafb8e4..935690a08dea475057dd30d647743e6604e6060c 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -17,14 +17,14 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
-extern "C" {
-#include <libavutil/pixfmt.h>
-}
 #include "types.h"
 #include "position.h"
 #include "colour_conversion.h"
 #include "position_image.h"
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
+#include <boost/shared_ptr.hpp>
 
 class Image;
 class ImageProxy;

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 9e3dbb6dfbf39ccf2f6f6864d1ee2920983ff447..91051e9c4752353f6fe79a4793b69850dc6f81a3 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -20,13 +20,13 @@
 #ifndef DCPOMATIC_PLAYLIST_H
 #define DCPOMATIC_PLAYLIST_H
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
 #include "ffmpeg_content.h"
 #include "audio_mapping.h"
 #include "util.h"
 #include "frame_rate_change.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <list>
 
 class Content;
 class FFmpegContent;

diff --git a/src/lib/ratio.h b/src/lib/ratio.h
index f1a180d8f9d5ae2c8197ce25a17e59fe0fc18b2b..360fb2340639866c94276b09d2a5fd4f39f33b02 100644 (file)
--- a/src/lib/ratio.h
+++ b/src/lib/ratio.h
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_RATIO_H
 #define DCPOMATIC_RATIO_H
 
-#include <vector>
-#include <boost/utility.hpp>
 #include <dcp/util.h>
+#include <boost/utility.hpp>
+#include <vector>
 
 class Ratio : public boost::noncopyable
 {

diff --git a/src/lib/render_subtitles.h b/src/lib/render_subtitles.h
index d83dc119a0d0a27de01e69eb6e9c957e098d5759..218b866e95cd238bcc96307b5ed0720267d52d43 100644 (file)
--- a/src/lib/render_subtitles.h
+++ b/src/lib/render_subtitles.h
@@ -17,8 +17,8 @@
 
 */
 
+#include "position_image.h"
 #include <dcp/subtitle_string.h>
 #include <dcp/util.h>
-#include "position_image.h"
 
 PositionImage render_subtitles (std::list<dcp::SubtitleString>, dcp::Size);

diff --git a/src/lib/resampler.h b/src/lib/resampler.h
index 4ee11a7f0954958e69a99bf09be75196394838c3..21ef412deb02d9e79109203ef6e5ad7ea3f05b9f 100644 (file)
--- a/src/lib/resampler.h
+++ b/src/lib/resampler.h
@@ -17,13 +17,13 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/utility.hpp>
+#include "types.h"
+#include "audio_content.h"
 extern "C" {
 #include <libswresample/swresample.h>
 }
-#include "types.h"
-#include "audio_content.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/utility.hpp>
 
 class AudioBuffers;
 

diff --git a/src/lib/scaler.h b/src/lib/scaler.h
index 14077ff1dc803349c75b4faf3452f411531e007b..0f0bcb1aa14485a8846cf6b466e9e8c6c0a2bf04 100644 (file)
--- a/src/lib/scaler.h
+++ b/src/lib/scaler.h
@@ -24,9 +24,9 @@
 #ifndef DCPOMATIC_SCALER_H
 #define DCPOMATIC_SCALER_H
 
+#include <boost/utility.hpp>
 #include <string>
 #include <vector>
-#include <boost/utility.hpp>
 
 /** @class Scaler
  *  @brief Class to describe one of FFmpeg's software scalers

diff --git a/src/lib/send_kdm_email_job.h b/src/lib/send_kdm_email_job.h
index af84a13af2b959c034e342c3dd9d2b56448c8a12..8d9f9b008f721d2413e1b28930bda0eb47e89a0b 100644 (file)
--- a/src/lib/send_kdm_email_job.h
+++ b/src/lib/send_kdm_email_job.h
@@ -17,9 +17,9 @@
 
 */
 
-#include <boost/filesystem.hpp>
-#include <dcp/types.h>
 #include "job.h"
+#include <dcp/types.h>
+#include <boost/filesystem.hpp>
 
 class Screen;
 

diff --git a/src/lib/send_problem_report_job.h b/src/lib/send_problem_report_job.h
index d77eec5445ca347a8c621ef1ff39e33be4bfa4a9..c40011d0ce733696c09e0f343258e6071905aae7 100644 (file)
--- a/src/lib/send_problem_report_job.h
+++ b/src/lib/send_problem_report_job.h
@@ -17,9 +17,9 @@
 
 */
 
-#include <boost/filesystem.hpp>
-#include <dcp/types.h>
 #include "job.h"
+#include <dcp/types.h>
+#include <boost/filesystem.hpp>
 
 class SendProblemReportJob : public Job
 {

diff --git a/src/lib/server.h b/src/lib/server.h
index e2e1d46eca0f34f3748f708787b34437f1dc8402..1dc3b7b4edf92d1c3545458c30ea1c8185c67f1c 100644 (file)
--- a/src/lib/server.h
+++ b/src/lib/server.h
@@ -25,14 +25,14 @@
  *  encoding work, and a class to implement such a server.
  */
 
-#include <string>
+#include "log.h"
+#include "exceptions.h"
+#include <libxml++/libxml++.h>
 #include <boost/thread.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/optional.hpp>
-#include <libxml++/libxml++.h>
-#include "log.h"
-#include "exceptions.h"
+#include <string>
 
 class Socket;
 

diff --git a/src/lib/server_finder.h b/src/lib/server_finder.h
index 202bee8f920d9610bd82c50b6951ea701199ed25..6f02042cee6034827e4a6ad0d4b8ca9e0f0cc988 100644 (file)
--- a/src/lib/server_finder.h
+++ b/src/lib/server_finder.h
@@ -17,8 +17,8 @@
 
 */
 
-#include <boost/signals2.hpp>
 #include "server.h"
+#include <boost/signals2.hpp>
 
 class ServerFinder : public ExceptionStore
 {

diff --git a/src/lib/sndfile_content.h b/src/lib/sndfile_content.h
index cb255fd745a16fbd345e351ae4d8ecce91f7a22d..1fff01f602508e074e4502bdeb9074fe8b0910f9 100644 (file)
--- a/src/lib/sndfile_content.h
+++ b/src/lib/sndfile_content.h
@@ -20,10 +20,10 @@
 #ifndef DCPOMATIC_SNDFILE_CONTENT_H
 #define DCPOMATIC_SNDFILE_CONTENT_H
 
+#include "single_stream_audio_content.h"
 extern "C" {
 #include <libavutil/audioconvert.h>
 }
-#include "single_stream_audio_content.h"
 
 namespace cxml {
        class Node;

diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index 41d5faf082ec29c75b2c2e1059f528c59a26e0ff..5ebe1da7b251852ee523df1e24fc9597406570f2 100644 (file)
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -17,10 +17,10 @@
 
 */
 
-#include <sndfile.h>
 #include "decoder.h"
 #include "audio_decoder.h"
 #include "audio_examiner.h"
+#include <sndfile.h>
 
 class SndfileContent;
 

diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h
index 646fc1f7aaec53c330733bd5fa36c44c81ab5780..6fd0bdf74da490cab2fdbc63689e3a6ff35d7c11 100644 (file)
--- a/src/lib/subrip_subtitle.h
+++ b/src/lib/subrip_subtitle.h
@@ -20,10 +20,10 @@
 #ifndef DCPOMATIC_SUBRIP_SUBTITLE_H
 #define DCPOMATIC_SUBRIP_SUBTITLE_H
 
-#include <boost/optional.hpp>
-#include <dcp/types.h>
 #include "types.h"
 #include "dcpomatic_time.h"
+#include <dcp/types.h>
+#include <boost/optional.hpp>
 
 struct SubRipSubtitlePiece
 {

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 142cfa42b766b0813fb1570d530268d886beee2c..3d4f90ad9586fa3f438036c82c00607f414d6d9a 100644 (file)
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -20,11 +20,11 @@
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
 #include "content_subtitle.h"
+#include <dcp/subtitle_string.h>
 
 class Film;
 class DCPTimedSubtitle;

diff --git a/src/lib/timer.h b/src/lib/timer.h
index 4a5aa12de331c0fe5b024144bc18923e76ccc8eb..8c4b046bf7e761fc57bf2cde5d4d8496bdccdc03 100644 (file)
--- a/src/lib/timer.h
+++ b/src/lib/timer.h
@@ -25,9 +25,9 @@
 #ifndef DCPOMATIC_TIMER_H
 #define DCPOMATIC_TIMER_H
 
+#include <sys/time.h>
 #include <string>
 #include <map>
-#include <sys/time.h>
 
 /** @class PeriodTimer
  *  @brief A class to allow timing of a period within the caller.

diff --git a/src/lib/transcode_job.h b/src/lib/transcode_job.h
index 9128206d29dc9c9e42460cafecfa4748f0a1c0db..97a7d49f2c8efb4082513256ceb7cb84f401de96 100644 (file)
--- a/src/lib/transcode_job.h
+++ b/src/lib/transcode_job.h
@@ -21,8 +21,8 @@
  *  @brief A job which transcodes from one format to another.
  */
 
-#include <boost/shared_ptr.hpp>
 #include "job.h"
+#include <boost/shared_ptr.hpp>
 
 class Transcoder;
 

diff --git a/src/lib/types.h b/src/lib/types.h
index 9a6a30b861d45344325507186f5c08b2b200ea42..c069944fe35a07fba6236d7f4787134adc6bb519 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -20,12 +20,12 @@
 #ifndef DCPOMATIC_TYPES_H
 #define DCPOMATIC_TYPES_H
 
-#include <vector>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include <dcp/util.h>
 #include "dcpomatic_time.h"
 #include "position.h"
+#include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
+#include <stdint.h>
 
 class Content;
 class VideoContent;

diff --git a/src/lib/update.h b/src/lib/update.h
index c86adb8736adad074625f8b7a73dd47ae1eb666e..f3a0ffc36f55498dc1046f0268164641af1e09df 100644 (file)
--- a/src/lib/update.h
+++ b/src/lib/update.h
@@ -21,11 +21,11 @@
  *  @brief UpdateChecker class.
  */
 
+#include <curl/curl.h>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
-#include <curl/curl.h>
 
 /** Class to check for the existance of an update for DCP-o-matic on a remote server */
 class UpdateChecker

diff --git a/src/lib/util.h b/src/lib/util.h
index 886e2a61c7e5d3087c79fc759160e3f46c8106a0..b6817f8837c0d675d07b5f569afd2a3e19710a33 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -25,20 +25,20 @@
 #ifndef DCPOMATIC_UTIL_H
 #define DCPOMATIC_UTIL_H
 
-#include <string>
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/asio.hpp>
-#include <boost/optional.hpp>
-#include <boost/filesystem.hpp>
+#include "compose.hpp"
+#include "types.h"
+#include "video_content.h"
 #include <dcp/util.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
 }
-#include "compose.hpp"
-#include "types.h"
-#include "video_content.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/asio.hpp>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
+#include <string>
+#include <vector>
 
 #undef check
 

diff --git a/src/lib/video_content_scale.h b/src/lib/video_content_scale.h
index d457d82f155465257490093f6f1418e8a42be2ef..f5d97fd97e0dbde7a4456e94d67b84e6ba6079f4 100644 (file)
--- a/src/lib/video_content_scale.h
+++ b/src/lib/video_content_scale.h
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
 #define DCPOMATIC_VIDEO_CONTENT_SCALE_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
 #include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace cxml {
        class Node;

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 24ee7f4e5f1948bcbf6dd897fbb324570bd62199..f37d4b1ad8458f7b26176676e4c788a054e2d78d 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -24,12 +24,12 @@
 #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"
 #include "content_video.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 
 class VideoContent;
 class ImageProxy;

diff --git a/src/lib/video_examiner.h b/src/lib/video_examiner.h
index 55b27ac94832f42397b7a96425ee9dd22ba65d94..2dcacfc349fbeaa11b46219bf80867a6f682729e 100644 (file)
--- a/src/lib/video_examiner.h
+++ b/src/lib/video_examiner.h
@@ -21,9 +21,9 @@
  *  @brief VideoExaminer class.
  */
 
-#include <dcp/types.h>
 #include "types.h"
 #include "video_content.h"
+#include <dcp/types.h>
 
 /** @class VideoExaminer
  *  @brief Parent for classes which examine video sources and obtain information about them.

diff --git a/src/lib/writer.h b/src/lib/writer.h
index 66fe98ec734c914d3de27eeb4b4ccde15e6309b7..2fcae3deb53c1e71c357db45d45ae9bcb7605542 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -21,14 +21,14 @@
  *  @brief Writer class.
  */
 
-#include <list>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-#include <boost/thread/condition.hpp>
-#include <dcp/subtitle_content.h>
 #include "exceptions.h"
 #include "types.h"
 #include "player_subtitles.h"
+#include <dcp/subtitle_content.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <list>
 
 class Film;
 class EncodedData;

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index b0df7b32c9d5d7c52be5a2c38cb388457a6cf242..0c82898aa83999adf02cc2bee9ef3de8fececaca 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -17,20 +17,21 @@
 
 */
 
-#include <iostream>
-#include <fstream>
-#include <boost/filesystem.hpp>
-#ifdef __WXMSW__
-#include <shellapi.h>
-#endif
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-#include <wx/generic/aboutdlgg.h>
-#include <wx/stdpaths.h>
-#include <wx/cmdline.h>
-#include <wx/preferences.h>
-#include <dcp/exceptions.h>
+#include "lib/film.h"
+#include "lib/config.h"
+#include "lib/util.h"
+#include "lib/version.h"
+#include "lib/ui_signaller.h"
+#include "lib/log.h"
+#include "lib/job_manager.h"
+#include "lib/transcode_job.h"
+#include "lib/exceptions.h"
+#include "lib/cinema.h"
+#include "lib/kdm.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/server_finder.h"
+#include "lib/update.h"
+#include "lib/content_factory.h"
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
@@ -47,21 +48,20 @@
 #include "wx/update_dialog.h"
 #include "wx/content_panel.h"
 #include "wx/report_problem_dialog.h"
-#include "lib/film.h"
-#include "lib/config.h"
-#include "lib/util.h"
-#include "lib/version.h"
-#include "lib/ui_signaller.h"
-#include "lib/log.h"
-#include "lib/job_manager.h"
-#include "lib/transcode_job.h"
-#include "lib/exceptions.h"
-#include "lib/cinema.h"
-#include "lib/kdm.h"
-#include "lib/send_kdm_email_job.h"
-#include "lib/server_finder.h"
-#include "lib/update.h"
-#include "lib/content_factory.h"
+#include <dcp/exceptions.h>
+#include <wx/generic/aboutdlgg.h>
+#include <wx/stdpaths.h>
+#include <wx/cmdline.h>
+#include <wx/preferences.h>
+#ifdef __WXMSW__
+#include <shellapi.h>
+#endif
+#ifdef __WXOSX__
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+#include <boost/filesystem.hpp>
+#include <iostream>
+#include <fstream>
 
 using std::cout;
 using std::string;