From d4270052ecfd3f75314fc8ea0e22c20384ff8b3c Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 25 Jul 2023 15:38:50 +0200
Subject: [PATCH] Include trimming.

---
 src/asset.h                       | 1 -
 src/asset_map.h                   | 1 -
 src/asset_writer.h                | 1 -
 src/atmos_asset_writer.h          | 1 -
 src/cpl.h                         | 1 -
 src/dcp.h                         | 1 -
 src/decrypted_kdm.h               | 1 -
 src/mono_picture_frame.h          | 1 -
 src/openjpeg_image.h              | 1 +
 src/picture_asset_writer.h        | 1 -
 src/pkl.h                         | 1 -
 src/reel.h                        | 1 -
 src/rgb_xyz.h                     | 1 -
 src/sound_asset.h                 | 1 -
 src/sound_asset_writer.h          | 1 -
 src/stereo_picture_asset_writer.h | 1 -
 src/stereo_picture_frame.h        | 1 -
 src/subtitle_asset_internal.h     | 1 -
 src/subtitle_image.h              | 1 -
 src/subtitle_string.h             | 1 -
 src/util.h                        | 7 ++++++-
 test/colour_test.cc               | 5 ++++-
 22 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/asset.h b/src/asset.h
index 06e12936..29cd69eb 100644
--- 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 dcd0f961..d2a94f77 100644
--- 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 c1fc1900..d4003fc9 100644
--- 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 eebb0d6c..ac3d3701 100644
--- 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 2a2fc827..25c294eb 100644
--- 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 5c72040d..21cc3aac 100644
--- 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 9d589e41..7db2937a 100644
--- 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 3ca16bf2..43575864 100644
--- 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 31d1df05..6163bc2f 100644
--- 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 698d02af..0caa8815 100644
--- 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 daab4b26..d0a11188 100644
--- 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 d011ec4b..52f41bfa 100644
--- 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 f0623940..d6fb4d35 100644
--- 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 125fe94b..e69c3988 100644
--- 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 495a4582..ee3c9324 100644
--- 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 287e7ecd..1cee1202 100644
--- 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 09d684c4..b0c0f0c8 100644
--- 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 7fe142fc..8ecd9fd5 100644
--- 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 11fd3915..ae733fe4 100644
--- 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 e59ed7c2..7e241516 100644
--- 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 8338e7cc..fe662dd4 100644
--- 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 d1ca62a1..34fc6bf5 100644
--- 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)
 {
-- 
2.30.2