Include rearrangement.

23 files changed, 115 insertions, 76 deletions

diff --git a/hacks/check_includes b/hacks/check_includes
new file mode 100755
index 000000000..bd0ea636f
--- /dev/null
+++ b/hacks/check_includes
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+
+import sys
+
+for a in sys.argv[1:]:
+    includes = []
+    for line in open(a, 'r'):
+        if line.startswith('#include'):
+            includes.append(line.strip()[9:])
+
+    std = ['<cstdio>', '<unistd.h>', '<stdexcept>', '<iostream>', '<algorithm>', '<fstream>', '<cstdlib>', '<iomanip>', '<stdint.h>', '<cmath>', '<cassert>', '<cstring>', '<mntent.h>', '<windows.h>', '<shlwapi.h>', '<sys/sysctl.h>', '<mach-o/dyld.h>', '<IOKit/pwr_mgt/IOPMLib.h>', '<sys/types.h>', '<ifaddrs.h>', '<netinet/in.h>', '<arpa/inet.h>']
+
+    current_group = 0
+    for i in includes:
+        if i == '"i18n.h"':
+            continue
+
+        if i in std:
+            group = 5
+        elif i.find("<boost/") != -1:
+            group = 4
+        elif i.find("<libxml++/") != -1 or i == '<glib.h>':
+            group = 3
+        elif i.find("<libcxml/") != -1 or i.find("<dcp/") != -1:
+            group = 2
+        elif i.find("\"wx/") != -1:
+            group = 1
+        else:
+            group = 0
+
+        print '%s: %d' % (i, group)
+
+        if group < current_group:
+            print '%s: first wrong order is %s' % (a, i)
+            sys.exit(1)
+
+        current_group = group
+
+
+
diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 9f92bdb50..681917fcf 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -17,14 +17,14 @@
 
 */
 
+#include "audio_analysis.h"
+#include "cross.h"
+#include <boost/filesystem.hpp>
 #include <stdint.h>
 #include <cmath>
 #include <cassert>
 #include <cstdio>
 #include <iostream>
-#include <boost/filesystem.hpp>
-#include "audio_analysis.h"
-#include "cross.h"
 
 using std::ostream;
 using std::istream;
diff --git a/src/lib/audio_buffers.cc b/src/lib/audio_buffers.cc
index 56ca7a94b..d1003cc8c 100644
--- a/src/lib/audio_buffers.cc
+++ b/src/lib/audio_buffers.cc
@@ -17,11 +17,11 @@
 
 */
 
+#include "audio_buffers.h"
 #include <cassert>
 #include <cstring>
 #include <cmath>
 #include <stdexcept>
-#include "audio_buffers.h"
 
 using std::bad_alloc;
 using boost::shared_ptr;
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 8458e3314..c0e99b24c 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -17,8 +17,6 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "audio_content.h"
 #include "analyse_audio_job.h"
 #include "job_manager.h"
@@ -27,6 +25,8 @@
 #include "config.h"
 #include "frame_rate_change.h"
 #include "audio_processor.h"
+#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/audio_decoder.cc b/src/lib/audio_decoder.cc
index f3251f306..31dcf2ef9 100644
--- a/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@ -17,12 +17,12 @@
 
 */
 
-#include <iostream>
 #include "audio_decoder.h"
 #include "audio_buffers.h"
 #include "audio_processor.h"
 #include "resampler.h"
 #include "util.h"
+#include <iostream>
 
 #include "i18n.h"
 
diff --git a/src/lib/audio_filter.cc b/src/lib/audio_filter.cc
index 59b5684ea..dbef25201 100644
--- a/src/lib/audio_filter.cc
+++ b/src/lib/audio_filter.cc
@@ -17,9 +17,9 @@
 
 */
 
-#include <cmath>
 #include "audio_filter.h"
 #include "audio_buffers.h"
+#include <cmath>
 
 using std::vector;
 using std::min;
diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index e86e2e2ac..5b3e36f25 100644
--- a/src/lib/audio_mapping.cc
+++ b/src/lib/audio_mapping.cc
@@ -17,12 +17,12 @@
 
 */
 
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "audio_mapping.h"
 #include "util.h"
 #include "md5_digester.h"
+#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
+#include <libxml++/libxml++.h>
 
 using std::list;
 using std::cout;
diff --git a/src/lib/cinema.cc b/src/lib/cinema.cc
index 620236186..282f5427f 100644
--- a/src/lib/cinema.cc
+++ b/src/lib/cinema.cc
@@ -17,9 +17,9 @@
 
 */
 
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
 #include "cinema.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 using std::list;
 using boost::shared_ptr;
diff --git a/src/lib/cinema_sound_processor.cc b/src/lib/cinema_sound_processor.cc
index 6a7905114..485af3fd6 100644
--- a/src/lib/cinema_sound_processor.cc
+++ b/src/lib/cinema_sound_processor.cc
@@ -21,10 +21,10 @@
  *  @brief CinemaSoundProcessor class.
  */
 
-#include <iostream>
-#include <cassert>
 #include "cinema_sound_processor.h"
 #include "dolby_cp750.h"
+#include <iostream>
+#include <cassert>
 
 using namespace std;
 
diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 5ecbf4021..6dd4ab876 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -17,14 +17,14 @@
 
 */
 
-#include <libxml++/libxml++.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
-#include <libcxml/cxml.h>
 #include "config.h"
 #include "colour_conversion.h"
 #include "util.h"
 #include "md5_digester.h"
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 5f48262fb..a15825dc7 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -17,16 +17,6 @@
 
 */
 
-#include <cstdlib>
-#include <fstream>
-#include <glib.h>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
-#include <dcp/signer.h>
-#include <dcp/certificate_chain.h>
-#include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"
 #include "scaler.h"
@@ -38,6 +28,16 @@
 #include "cinema.h"
 #include "util.h"
 #include "cross.h"
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <dcp/signer.h>
+#include <dcp/certificate_chain.h>
+#include <libcxml/cxml.h>
+#include <glib.h>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include <cstdlib>
+#include <fstream>
 
 #include "i18n.h"
 
diff --git a/src/lib/content.cc b/src/lib/content.cc
index ec16b9610..bcfedb1f9 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -21,10 +21,6 @@
  *  @brief Content class.
  */
 
-#include <boost/thread/mutex.hpp>
-#include <libxml++/libxml++.h>
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
 #include "content.h"
 #include "util.h"
 #include "content_factory.h"
@@ -33,6 +29,10 @@
 #include "film.h"
 #include "safe_stringstream.h"
 #include "job.h"
+#include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
+#include <libxml++/libxml++.h>
+#include <boost/thread/mutex.hpp>
 
 #include "i18n.h"
 
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 16340adb4..de940d025 100644
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -21,7 +21,6 @@
  *  @brief Methods to create content objects.
  */
 
-#include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
 #include "image_content.h"
 #include "sndfile_content.h"
@@ -29,6 +28,7 @@
 #include "dcp_content.h"
 #include "dcp_subtitle_content.h"
 #include "util.h"
+#include <libcxml/cxml.h>
 
 using std::string;
 using std::list;
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index d84c17c55..e189222fa 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -17,11 +17,11 @@
 
 */
 
-#include <fstream>
-#include <boost/algorithm/string.hpp>
 #include "cross.h"
 #include "compose.hpp"
 #include "log.h"
+#include "exceptions.h"
+#include <boost/algorithm/string.hpp>
 #ifdef DCPOMATIC_LINUX
 #include <unistd.h>
 #include <mntent.h>
@@ -42,7 +42,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
-#include "exceptions.h"
+#include <fstream>
 
 #include "i18n.h"
 
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 28b7ac862..cd82ee6e9 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -17,14 +17,14 @@
 
 */
 
-#include <dcp/dcp.h>
-#include <dcp/exceptions.h>
 #include "dcp_content.h"
 #include "dcp_examiner.h"
 #include "job.h"
 #include "film.h"
 #include "config.h"
 #include "compose.hpp"
+#include <dcp/dcp.h>
+#include <dcp/exceptions.h>
 
 #include "i18n.h"
 
diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc
index e5466e139..e659a9b88 100644
--- a/src/lib/dcp_content_type.cc
+++ b/src/lib/dcp_content_type.cc
@@ -21,8 +21,8 @@
  *  @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
  */
 
-#include <cassert>
 #include "dcp_content_type.h"
+#include <cassert>
 
 #include "i18n.h"
 
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index adeadd98a..74affe857 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -17,6 +17,11 @@
 
 */
 
+#include "dcp_decoder.h"
+#include "dcp_content.h"
+#include "j2k_image_proxy.h"
+#include "image.h"
+#include "config.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -27,11 +32,6 @@
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_frame.h>
-#include "dcp_decoder.h"
-#include "dcp_content.h"
-#include "j2k_image_proxy.h"
-#include "image.h"
-#include "config.h"
 
 using std::list;
 using std::cout;
diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 1e4cc899d..052c8bd76 100644
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -17,6 +17,11 @@
 
 */
 
+#include "dcp_examiner.h"
+#include "dcp_content.h"
+#include "exceptions.h"
+#include "image.h"
+#include "config.h"
 #include <dcp/dcp.h>
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
@@ -27,11 +32,6 @@
 #include <dcp/stereo_picture_mxf.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/sound_mxf.h>
-#include "dcp_examiner.h"
-#include "dcp_content.h"
-#include "exceptions.h"
-#include "image.h"
-#include "config.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 1935a874f..7be96ceeb 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -17,9 +17,9 @@
 
 */
 
+#include "dcp_subtitle_content.h"
 #include <dcp/subtitle_content.h>
 #include <dcp/raw_convert.h>
-#include "dcp_subtitle_content.h"
 
 #include "i18n.h"
 
diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 20a9f32fe..f61c69a7b 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -17,9 +17,9 @@
 
 */
 
-#include <dcp/subtitle_content.h>
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
+#include <dcp/subtitle_content.h>
 
 using std::list;
 using std::cout;
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index cacba190f..62340a468 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -28,26 +28,6 @@
  *  of images that require encoding.
  */
 
-#include <stdint.h>
-#include <cstring>
-#include <cstdlib>
-#include <stdexcept>
-#include <cstdio>
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <unistd.h>
-#include <errno.h>
-#include <boost/array.hpp>
-#include <boost/asio.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
-#include <dcp/gamma_lut.h>
-#include <dcp/xyz_frame.h>
-#include <dcp/rgb_xyz.h>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
-#include <libcxml/cxml.h>
 #include "film.h"
 #include "dcp_video.h"
 #include "config.h"
@@ -60,6 +40,26 @@
 #include "cross.h"
 #include "player_video.h"
 #include "encoded_data.h"
+#include <libcxml/cxml.h>
+#include <dcp/gamma_lut.h>
+#include <dcp/xyz_frame.h>
+#include <dcp/rgb_xyz.h>
+#include <dcp/colour_matrix.h>
+#include <dcp/raw_convert.h>
+#include <boost/array.hpp>
+#include <boost/asio.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
+#include <stdint.h>
+#include <cstring>
+#include <cstdlib>
+#include <stdexcept>
+#include <cstdio>
+#include <iomanip>
+#include <iostream>
+#include <fstream>
+#include <unistd.h>
+#include <errno.h>
 
 #define LOG_GENERAL(...) _log->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 96fda7cc2..da6c96905 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -21,9 +21,6 @@
  *  @brief Parent class for classes which can encode video and audio frames.
  */
 
-#include <iostream>
-#include <boost/lambda/lambda.hpp>
-#include <libcxml/cxml.h>
 #include "encoder.h"
 #include "util.h"
 #include "film.h"
@@ -36,6 +33,9 @@
 #include "server_finder.h"
 #include "player.h"
 #include "player_video.h"
+#include <libcxml/cxml.h>
+#include <boost/lambda/lambda.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
diff --git a/src/lib/film.cc b/src/lib/film.cc
index f0ddd14a8..cc75a0558 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -56,7 +56,6 @@
 #include <cstdlib>
 #include <iomanip>
 
-
 #include "i18n.h"
 
 using std::string;