Some include tidying.

65 files changed, 201 insertions, 203 deletions

diff --git a/src/lib/analyse_audio_job.h b/src/lib/analyse_audio_job.h
index a218cb340..bde9d0d40 100644
--- 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 b91a1cf51..865d64781 100644
--- 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 9fc69daad..b44175cbc 100644
--- 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 a76d83a37..fdb23df8b 100644
--- 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 9b332e7fe..610e973a0 100644
--- 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 8421f4687..5c0386837 100644
--- 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 f735b1227..30ab7d5a5 100644
--- 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 706e51fe8..dbc6c9d9d 100644
--- 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 28b1dbd1d..45a9e282b 100644
--- 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 c2841b64e..e383f9ff0 100644
--- 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 8868618ad..36bc22b13 100644
--- 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 c206fa55d..6a77aaa18 100644
--- 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 d6fe8c820..82f5a8089 100644
--- 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 ebfe09518..34398009b 100644
--- 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 d517a8f02..051333c45 100644
--- 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 9c74c516b..2408bff81 100644
--- 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 583a92636..c1b859865 100644
--- 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 232ed6e8a..245a888dd 100644
--- 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 51df0176b..1da5d1c96 100644
--- 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 f0d9eae93..e59dba0b8 100644
--- 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 90a0abfc7..05c66df3a 100644
--- 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 8aaa54f84..6dd9da0dc 100644
--- 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 fca3bf8be..8203b7ac1 100644
--- 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 9f85c2dca..60c777d8d 100644
--- 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 4378e241b..1ef7e3ba9 100644
--- 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 6bbcd0b01..6479bd70d 100644
--- 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 5a65de96f..9c67afbce 100644
--- 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 22dc0ca90..f0ddd14a8 100644
--- 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 1906de91b..8628d8b38 100644
--- 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 258e74991..66ecc4308 100644
--- 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 172250eb1..8ca6aae09 100644
--- 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 6b70d5789..8c50fd8a8 100644
--- 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 79b2bf4e8..e2d86b8a7 100644
--- 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 e63f290e4..62c821d82 100644
--- 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 299180f50..7790f617b 100644
--- 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 b7dfc5891..28c12a3dc 100644
--- 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 f0673df15..9d8620cbb 100644
--- 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 cee1ce495..300df743b 100644
--- 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 d5b6a9c4c..981334e28 100644
--- 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 385296585..5d2273a44 100644
--- 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 46994ea3b..d0a3b4f65 100644
--- 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 f1d0543d7..935690a08 100644
--- 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 9e3dbb6df..91051e9c4 100644
--- 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 f1a180d8f..360fb2340 100644
--- 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 d83dc119a..218b866e9 100644
--- 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 4ee11a7f0..21ef412de 100644
--- 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 14077ff1d..0f0bcb1aa 100644
--- 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 af84a13af..8d9f9b008 100644
--- 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 d77eec544..c40011d0c 100644
--- 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 e2e1d46ec..1dc3b7b4e 100644
--- 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 202bee8f9..6f02042ce 100644
--- 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 cb255fd74..1fff01f60 100644
--- 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 41d5faf08..5ebe1da7b 100644
--- 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 646fc1f7a..6fd0bdf74 100644
--- 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 142cfa42b..3d4f90ad9 100644
--- 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 4a5aa12de..8c4b046bf 100644
--- 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 9128206d2..97a7d49f2 100644
--- 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 9a6a30b86..c069944fe 100644
--- 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 c86adb873..f3a0ffc36 100644
--- 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 886e2a61c..b6817f883 100644
--- 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 d457d82f1..f5d97fd97 100644
--- 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 24ee7f4e5..f37d4b1ad 100644
--- 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 55b27ac94..2dcacfc34 100644
--- 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 66fe98ec7..2fcae3deb 100644
--- 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 b0df7b32c..0c82898aa 100644
--- 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;