Include trimming.

diff --git a/src/cpl.cc b/src/cpl.cc
index fd7056809009efb30ab5c9265f09ed336f49b046..025303570be956110c9058620fd7c0d7f16912fd 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -27,6 +27,7 @@
 #include "parse/asset_map.h"
 #include "reel.h"
 #include "metadata.h"
+#include "exceptions.h"
 
 using std::string;
 using std::stringstream;

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index ca91e2c7991fad20478ced70fb3989579ac16001..2a244a27cff6b75067b78e8362c5d32480ee7924 100644 (file)
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -21,6 +21,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include "subtitle_asset.h"
+#include "parse/subtitle.h"
 #include "util.h"
 #include "xml.h"
 

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 2da1ce7b8f9b7ae6f0c3090428a4b6351bdd027d..a76a307697d40997adb63e01927c0e6f268ed564 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -17,14 +17,21 @@
 
 */
 
+#include <libcxml/cxml.h>
 #include "asset.h"
-#include "xml.h"
 #include "dcp_time.h"
-#include "parse/subtitle.h"
 
 namespace libdcp
 {
 
+namespace parse
+{
+       class Font;
+       class Text;
+       class Subtitle;
+       class LoadFont;
+}
+
 class Subtitle
 {
 public:

diff --git a/src/wscript b/src/wscript
index 67fc2539c8acb1b5ec5cc71283281bc4e83c3dec..37151e516cbd6ee950f41c07ac9fc9c81136bae3 100644 (file)
--- a/src/wscript
+++ b/src/wscript
@@ -51,7 +51,6 @@ def build(bld):
               types.h
               util.h
               version.h
-              xml.h
               """
 
     bld.install_files('${PREFIX}/include/libdcp', headers)

diff --git a/test/rewrite_subs.cc b/test/rewrite_subs.cc
index adb9f6b4da5b29083a4123cf50020124c22cdd2d..8c055d9eab7dcc3d179f3415830918835a896522 100644 (file)
--- a/test/rewrite_subs.cc
+++ b/test/rewrite_subs.cc
@@ -3,6 +3,7 @@
 #include "cpl.h"
 #include "reel.h"
 #include "subtitle_asset.h"
+#include "exceptions.h"
 
 using std::cout;
 using std::cerr;