Include trimming.

diff --git a/src/asset.h b/src/asset.h
index 06e129368a7e2f16a8951b05a32fd48a414fe086..29cd69ebbac2d97d5c9d072869e098afba902da7 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -42,7 +42,6 @@
 
 
 #include "object.h"
-#include "types.h"
 #include "pkl.h"
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>

diff --git a/src/asset_map.h b/src/asset_map.h
index dcd0f961124836769e54919a0196f54c542c5265..d2a94f77aae9b2ee69f3a2762f61cc85aa8c1e56 100644 (file)
--- a/src/asset_map.h
+++ b/src/asset_map.h
@@ -34,7 +34,6 @@
 
 #include "asset_list.h"
 #include "object.h"
-#include "types.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>

diff --git a/src/asset_writer.h b/src/asset_writer.h
index c1fc1900dead828841280a88fce74dc4cfe09cd2..d4003fc9d4466278c5f0938ed9424b162b24e006 100644 (file)
--- a/src/asset_writer.h
+++ b/src/asset_writer.h
@@ -41,7 +41,6 @@
 #define LIBDCP_ASSET_WRITER_H
 
 
-#include "types.h"
 #include "crypto_context.h"
 #include <boost/filesystem.hpp>
 

diff --git a/src/atmos_asset_writer.h b/src/atmos_asset_writer.h
index eebb0d6c28120fa03a129b28f24239994e483fdd..ac3d37012b6f942b2236c91c27d9bb90a1bd9485 100644 (file)
--- a/src/atmos_asset_writer.h
+++ b/src/atmos_asset_writer.h
@@ -42,7 +42,6 @@
 
 
 #include "asset_writer.h"
-#include "types.h"
 #include "atmos_frame.h"
 #include <memory>
 #include <boost/filesystem.hpp>

diff --git a/src/cpl.h b/src/cpl.h
index 2a2fc827e3acaac6eed0f8e530e9ce666af1d173..25c294ebd58c7e9aa990a3b6f3d087d27bae4d4a 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -47,7 +47,6 @@
 #include "key.h"
 #include "language_tag.h"
 #include "rating.h"
-#include "types.h"
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>
 #include <boost/optional.hpp>

diff --git a/src/dcp.h b/src/dcp.h
index 5c72040de133f8efe114c67ccb405519fd112d5f..21cc3aac822ab9165949066c3081327ecc379cfe 100644 (file)
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -46,7 +46,6 @@
 #include "compose.hpp"
 #include "metadata.h"
 #include "name_format.h"
-#include "types.h"
 #include "util.h"
 #include "verify.h"
 #include "version.h"

diff --git a/src/decrypted_kdm.h b/src/decrypted_kdm.h
index 9d589e416099c24667f46598bb2606c5551db338..7db2937a0910e86cb128734b1a784d0dcdcdd0c2 100644 (file)
--- a/src/decrypted_kdm.h
+++ b/src/decrypted_kdm.h
@@ -44,7 +44,6 @@
 #include "key.h"
 #include "local_time.h"
 #include "decrypted_kdm_key.h"
-#include "types.h"
 #include "certificate.h"
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>

diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h
index 3ca16bf2bd6a65c6c2a88014c365babe21e2d893..435758649fa2451a14db7b75540559b3f04108f2 100644 (file)
--- a/src/mono_picture_frame.h
+++ b/src/mono_picture_frame.h
@@ -42,7 +42,6 @@
 
 
 #include "asset_reader.h"
-#include "types.h"
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
 #include <memory>

diff --git a/src/openjpeg_image.h b/src/openjpeg_image.h
index 31d1df05c7473c0625d01e52ea03d1572e8d7437..6163bc2f329122bad4a549e5f96430e73726e440 100644 (file)
--- a/src/openjpeg_image.h
+++ b/src/openjpeg_image.h
@@ -41,6 +41,7 @@
  */
 
 
+#include "types.h"
 #include "util.h"
 
 

diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index 698d02af82d427a9573b0a57802c6bd17ca5a08c..0caa88158f85cb85c6bed37b42f69cac83da196c 100644 (file)
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -43,7 +43,6 @@
 
 #include "asset_writer.h"
 #include "metadata.h"
-#include "types.h"
 #include <boost/utility.hpp>
 #include <memory>
 #include <stdint.h>

diff --git a/src/pkl.h b/src/pkl.h
index daab4b2607c7dbdfacf4ddd9c7559b26c0476ef5..d0a111887394478fcff17b0c60a0585fbb28ff95 100644 (file)
--- a/src/pkl.h
+++ b/src/pkl.h
@@ -43,7 +43,6 @@
 
 #include "asset_list.h"
 #include "object.h"
-#include "types.h"
 #include "util.h"
 #include "certificate_chain.h"
 #include <libcxml/cxml.h>

diff --git a/src/reel.h b/src/reel.h
index d011ec4bbb1891b783d1ec08a7c8e93d1bb9c3f2..52f41bfaa5c670c83565650c1e98057587dce37f 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -44,7 +44,6 @@
 #include "decrypted_kdm.h"
 #include "key.h"
 #include "ref.h"
-#include "types.h"
 #include <boost/function.hpp>
 #include <memory>
 

diff --git a/src/rgb_xyz.h b/src/rgb_xyz.h
index f0623940475ffc7ca63dea565a4519ba2442adfb..d6fb4d35df559e2de60ac3d598e75621b7df5006 100644 (file)
--- a/src/rgb_xyz.h
+++ b/src/rgb_xyz.h
@@ -38,7 +38,6 @@
 
 
 #include "piecewise_lut.h"
-#include "types.h"
 #include <memory>
 #include <boost/optional.hpp>
 #include <stdint.h>

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 125fe94b67322111b1d12389ade37cf47485645f..e69c3988d3800919bebef29a6db2227889fde5d5 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -42,7 +42,6 @@
 
 
 #include "mxf.h"
-#include "types.h"
 #include "language_tag.h"
 #include "metadata.h"
 #include "sound_frame.h"

diff --git a/src/sound_asset_writer.h b/src/sound_asset_writer.h
index 495a45820009c0a427e7a3bde568b5e2509055e8..ee3c93245c0500503d592cc08eee548bf88e4c1a 100644 (file)
--- a/src/sound_asset_writer.h
+++ b/src/sound_asset_writer.h
@@ -40,7 +40,6 @@
 #include "asset_writer.h"
 #include "dcp_assert.h"
 #include "fsk.h"
-#include "types.h"
 #include "sound_asset.h"
 #include "sound_frame.h"
 #include <memory>

diff --git a/src/stereo_picture_asset_writer.h b/src/stereo_picture_asset_writer.h
index 287e7ecd786d87553ba76555a5a2e113b7986e4d..1cee12028ce4b00a652c8c65e5a64dbca77b2f33 100644 (file)
--- a/src/stereo_picture_asset_writer.h
+++ b/src/stereo_picture_asset_writer.h
@@ -38,7 +38,6 @@
 
 
 #include "picture_asset_writer.h"
-#include "types.h"
 #include <memory>
 #include <stdint.h>
 #include <string>

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 09d684c4e0bd0075b9abecf42f471ab52c4847be..b0c0f0c8ef830883c0a077f528beca1a121460ce 100644 (file)
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -41,7 +41,6 @@
 #define LIBDCP_STEREO_PICTURE_FRAME_H
 
 
-#include "types.h"
 #include "asset_reader.h"
 #include <memory>
 #include <boost/filesystem.hpp>

diff --git a/src/subtitle_asset_internal.h b/src/subtitle_asset_internal.h
index 7fe142fc18518c74e0768678460b0329e1710a77..8ecd9fd5d1781f3afc0b3b94818b62275285ce5a 100644 (file)
--- a/src/subtitle_asset_internal.h
+++ b/src/subtitle_asset_internal.h
@@ -44,7 +44,6 @@
 #include "array_data.h"
 #include "dcp_time.h"
 #include "raw_convert.h"
-#include "types.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>

diff --git a/src/subtitle_image.h b/src/subtitle_image.h
index 11fd3915a8e85cd7ffc0de09d85432b995059e59..ae733fe499e1ac2c4a4d7ea9d39f597388783fe3 100644 (file)
--- a/src/subtitle_image.h
+++ b/src/subtitle_image.h
@@ -42,7 +42,6 @@
 
 
 #include "array_data.h"
-#include "types.h"
 #include "subtitle.h"
 #include "dcp_time.h"
 #include <boost/optional.hpp>

diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index e59ed7c20466895464c721223fa26d25db214d6f..7e2415163014e51449de621462d174f0b043e0f2 100644 (file)
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -41,7 +41,6 @@
 #define LIBDCP_SUBTITLE_STRING_H
 
 
-#include "types.h"
 #include "subtitle.h"
 #include "dcp_time.h"
 #include <boost/optional.hpp>

diff --git a/src/util.h b/src/util.h
index 8338e7cc170d25e0994bb50871a775a4f410f5ea..fe662dd4766512f7f827df6521ff3aeea2d8ef71 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -43,7 +43,7 @@
 
 #include "array_data.h"
 #include "local_time.h"
-#include "types.h"
+#include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/KM_log.h>
 LIBDCP_ENABLE_WARNINGS
@@ -58,6 +58,11 @@ LIBDCP_ENABLE_WARNINGS
 #define LIBDCP_UNUSED(x) (void)(x)
 
 
+namespace ASDCP {
+       class Dictionary;
+}
+
+
 namespace xmlpp {
        class Element;
        class Node;

diff --git a/test/colour_test.cc b/test/colour_test.cc
index d1ca62a1c9aa01f7c97d4a929eaf2d96b2c44701..34fc6bf5144c7fd1f5a4c09f11175027f1e76251 100644 (file)
--- a/test/colour_test.cc
+++ b/test/colour_test.cc
@@ -31,10 +31,13 @@
     files in the program, then also delete it here.
 */
 
-#include "util.h"
+
 #include "exceptions.h"
+#include "types.h"
+#include "util.h"
 #include <boost/test/unit_test.hpp>
 
+
 /** Check that dcp::Colour works */
 BOOST_AUTO_TEST_CASE (colour)
 {