Remove asdcp prefix from includes.

37 files changed, 61 insertions, 61 deletions

diff --git a/src/asset_reader.h b/src/asset_reader.h
index 8478b51f..6642a872 100644
--- a/src/asset_reader.h
+++ b/src/asset_reader.h
@@ -44,7 +44,7 @@
 #include "asset.h"
 #include "crypto_context.h"
 #include "dcp_assert.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 #include <memory>
 
 
diff --git a/src/asset_writer.cc b/src/asset_writer.cc
index 05d0aa23..e0bfeeff 100644
--- a/src/asset_writer.cc
+++ b/src/asset_writer.cc
@@ -41,8 +41,8 @@
 #include "crypto_context.h"
 #include "dcp_assert.h"
 #include "mxf.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_prng.h>
+#include <AS_DCP.h>
+#include <KM_prng.h>
 
 
 using namespace dcp;
diff --git a/src/atmos_asset.cc b/src/atmos_asset.cc
index ae381737..39f48845 100644
--- a/src/atmos_asset.cc
+++ b/src/atmos_asset.cc
@@ -41,7 +41,7 @@
 #include "atmos_asset_reader.h"
 #include "atmos_asset_writer.h"
 #include "exceptions.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 
 
 using std::string;
diff --git a/src/atmos_asset_writer.cc b/src/atmos_asset_writer.cc
index 957bd4cb..dfca3e2e 100644
--- a/src/atmos_asset_writer.cc
+++ b/src/atmos_asset_writer.cc
@@ -43,7 +43,7 @@
 #include "dcp_assert.h"
 #include "compose.hpp"
 #include "crypto_context.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 
 
 using std::min;
diff --git a/src/certificate.cc b/src/certificate.cc
index 1e7714a3..e665bc72 100644
--- a/src/certificate.cc
+++ b/src/certificate.cc
@@ -42,7 +42,7 @@
 #include "exceptions.h"
 #include "util.h"
 #include "dcp_assert.h"
-#include <asdcp/KM_util.h>
+#include <KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
diff --git a/src/certificate_chain.cc b/src/certificate_chain.cc
index 84478dc1..b1c2f35d 100644
--- a/src/certificate_chain.cc
+++ b/src/certificate_chain.cc
@@ -43,7 +43,7 @@
 #include "exceptions.h"
 #include "util.h"
 #include "warnings.h"
-#include <asdcp/KM_util.h>
+#include <KM_util.h>
 #include <libcxml/cxml.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
diff --git a/src/cpl.cc b/src/cpl.cc
index 74f6f0bd..54f6c2f2 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -54,7 +54,7 @@
 #include "warnings.h"
 #include "xml.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/Metadata.h>
+#include <Metadata.h>
 LIBDCP_ENABLE_WARNINGS
 #include <libxml/parser.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/src/crypto_context.h b/src/crypto_context.h
index 6020ea88..560ae23c 100644
--- a/src/crypto_context.h
+++ b/src/crypto_context.h
@@ -44,8 +44,8 @@
 #include "key.h"
 #include "types.h"
 #include "exceptions.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_prng.h>
+#include <AS_DCP.h>
+#include <KM_prng.h>
 #include <boost/optional.hpp>
 
 
diff --git a/src/dcp.cc b/src/dcp.cc
index df5c89b4..98bba200 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -63,7 +63,7 @@
 #include "verify.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 LIBDCP_ENABLE_WARNINGS
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/app.h>
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index 592ab717..339de20c 100644
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -48,8 +48,8 @@
 #include "reel_asset.h"
 #include "reel_file_asset.h"
 #include "util.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_util.h>
+#include <AS_DCP.h>
+#include <KM_util.h>
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
diff --git a/src/frame.h b/src/frame.h
index 01dfe8b4..c36cb75e 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -43,8 +43,8 @@
 
 #include "crypto_context.h"
 #include "exceptions.h"
-#include <asdcp/KM_fileio.h>
-#include <asdcp/AS_DCP.h>
+#include <KM_fileio.h>
+#include <AS_DCP.h>
 
 
 namespace dcp {
diff --git a/src/key.cc b/src/key.cc
index a5e92aac..fc1635ea 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -39,9 +39,9 @@
 
 #include "key.h"
 #include "dcp_assert.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_prng.h>
-#include <asdcp/KM_util.h>
+#include <AS_DCP.h>
+#include <KM_prng.h>
+#include <KM_util.h>
 #include <string>
 #include <iomanip>
 
diff --git a/src/key.h b/src/key.h
index b0f33d0d..59d0f7d8 100644
--- a/src/key.h
+++ b/src/key.h
@@ -43,7 +43,7 @@
 
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 LIBDCP_ENABLE_WARNINGS
 #include <stdint.h>
 #include <string>
diff --git a/src/metadata.cc b/src/metadata.cc
index 750143d1..a921ad65 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -40,7 +40,7 @@
 #include "metadata.h"
 #include "util.h"
 #include "local_time.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 #include <iomanip>
 #include <time.h>
 
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 5aba95d2..98e2fd55 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -44,8 +44,8 @@
 #include "dcp_assert.h"
 #include "mono_picture_frame.h"
 #include "compose.hpp"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_fileio.h>
+#include <AS_DCP.h>
+#include <KM_fileio.h>
 
 
 using std::string;
diff --git a/src/mono_picture_asset_writer.cc b/src/mono_picture_asset_writer.cc
index dd29c19a..c8f17cbc 100644
--- a/src/mono_picture_asset_writer.cc
+++ b/src/mono_picture_asset_writer.cc
@@ -44,8 +44,8 @@
 #include "picture_asset.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_fileio.h>
+#include <AS_DCP.h>
+#include <KM_fileio.h>
 LIBDCP_ENABLE_WARNINGS
 
 
diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index ddaed983..3faffbed 100644
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -46,8 +46,8 @@
 #include "mono_picture_frame.h"
 #include "rgb_xyz.h"
 #include "util.h"
-#include <asdcp/KM_fileio.h>
-#include <asdcp/AS_DCP.h>
+#include <KM_fileio.h>
+#include <AS_DCP.h>
 
 
 using std::make_shared;
diff --git a/src/mxf.cc b/src/mxf.cc
index 1154b80d..4750537f 100644
--- a/src/mxf.cc
+++ b/src/mxf.cc
@@ -44,9 +44,9 @@
 #include "exceptions.h"
 #include "dcp_assert.h"
 #include "compose.hpp"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_prng.h>
-#include <asdcp/KM_util.h>
+#include <AS_DCP.h>
+#include <KM_prng.h>
+#include <KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index f77ce820..302b8a6b 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -45,8 +45,8 @@
 #include "dcp_assert.h"
 #include "compose.hpp"
 #include "j2k_transcode.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_fileio.h>
+#include <AS_DCP.h>
+#include <KM_fileio.h>
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
 #include <list>
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index c30be1bc..2c32e255 100644
--- a/src/picture_asset_writer.cc
+++ b/src/picture_asset_writer.cc
@@ -40,8 +40,8 @@
 #include "picture_asset_writer.h"
 #include "exceptions.h"
 #include "picture_asset.h"
-#include <asdcp/KM_fileio.h>
-#include <asdcp/AS_DCP.h>
+#include <KM_fileio.h>
+#include <AS_DCP.h>
 #include <inttypes.h>
 #include <stdint.h>
 
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 9d728cc6..999c6eb2 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -49,9 +49,9 @@
 #include "warnings.h"
 #include "xml.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_util.h>
-#include <asdcp/KM_log.h>
+#include <AS_DCP.h>
+#include <KM_util.h>
+#include <KM_log.h>
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 0eaa8fb5..8fcd35c4 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -47,9 +47,9 @@
 #include "util.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_fileio.h>
-#include <asdcp/Metadata.h>
+#include <AS_DCP.h>
+#include <KM_fileio.h>
+#include <Metadata.h>
 LIBDCP_ENABLE_WARNINGS
 #include <libxml++/nodes/element.h>
 #include <boost/filesystem.hpp>
diff --git a/src/sound_asset_writer.cc b/src/sound_asset_writer.cc
index ff14407d..d6294e25 100644
--- a/src/sound_asset_writer.cc
+++ b/src/sound_asset_writer.cc
@@ -46,8 +46,8 @@
 #include "sound_asset_writer.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/AS_DCP.h>
-#include <asdcp/Metadata.h>
+#include <AS_DCP.h>
+#include <Metadata.h>
 LIBDCP_ENABLE_WARNINGS
 #include <iostream>
 
diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index 25845d88..592d57ae 100644
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -38,7 +38,7 @@
 
 
 #include "sound_frame.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 #include <iostream>
 
 
diff --git a/src/sound_frame.h b/src/sound_frame.h
index 0f5021e2..025e526c 100644
--- a/src/sound_frame.h
+++ b/src/sound_frame.h
@@ -42,7 +42,7 @@
 
 
 #include "frame.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 
 
 namespace dcp {
diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc
index 7e3f6f63..aba8ce0b 100644
--- a/src/stereo_picture_asset.cc
+++ b/src/stereo_picture_asset.cc
@@ -43,7 +43,7 @@
 #include "stereo_picture_asset_writer.h"
 #include "stereo_picture_asset_reader.h"
 #include "dcp_assert.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 
 
 using std::string;
diff --git a/src/stereo_picture_asset_writer.cc b/src/stereo_picture_asset_writer.cc
index b9120cd9..872c59cf 100644
--- a/src/stereo_picture_asset_writer.cc
+++ b/src/stereo_picture_asset_writer.cc
@@ -42,8 +42,8 @@
 #include "dcp_assert.h"
 #include "picture_asset.h"
 #include "crypto_context.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_fileio.h>
+#include <AS_DCP.h>
+#include <KM_fileio.h>
 
 
 #include "picture_asset_writer_common.cc"
diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index 8d3a2757..9a9867e0 100644
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -45,8 +45,8 @@
 #include "rgb_xyz.h"
 #include "stereo_picture_frame.h"
 #include "util.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_fileio.h>
+#include <AS_DCP.h>
+#include <KM_fileio.h>
 
 
 using std::string;
diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index f707c665..80ea599a 100644
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -48,8 +48,8 @@
 #include "dcp_assert.h"
 #include "load_font_node.h"
 #include "reel_asset.h"
-#include <asdcp/AS_DCP.h>
-#include <asdcp/KM_util.h>
+#include <AS_DCP.h>
+#include <KM_util.h>
 #include <libxml++/nodes/element.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/src/types.h b/src/types.h
index a60193a4..32ea6e5f 100644
--- a/src/types.h
+++ b/src/types.h
@@ -44,7 +44,7 @@
 #include "warnings.h"
 #include <libcxml/cxml.h>
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/KLV.h>
+#include <KLV.h>
 LIBDCP_ENABLE_WARNINGS
 #include <memory>
 #include <boost/function.hpp>
diff --git a/src/util.cc b/src/util.cc
index 6ae69387..1e40a645 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -48,9 +48,9 @@
 #include "types.h"
 #include "util.h"
 #include <openjpeg.h>
-#include <asdcp/KM_util.h>
-#include <asdcp/KM_fileio.h>
-#include <asdcp/AS_DCP.h>
+#include <KM_util.h>
+#include <KM_fileio.h>
+#include <AS_DCP.h>
 #include <xmlsec/xmldsig.h>
 #include <xmlsec/dl.h>
 #include <xmlsec/app.h>
diff --git a/src/util.h b/src/util.h
index 451957d8..2ea88192 100644
--- a/src/util.h
+++ b/src/util.h
@@ -45,7 +45,7 @@
 #include "local_time.h"
 #include "types.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/KM_log.h>
+#include <KM_log.h>
 LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <boost/function.hpp>
diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index 7618f2ee..fbe17f01 100644
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -48,7 +48,7 @@
 #include "reel_sound_asset.h"
 #include "reel_atmos_asset.h"
 #include "reel_markers_asset.h"
-#include <asdcp/KM_util.h>
+#include <KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/encryption_test.cc b/test/encryption_test.cc
index 93cea8dc..649200c1 100644
--- a/test/encryption_test.cc
+++ b/test/encryption_test.cc
@@ -47,7 +47,7 @@
 #include "reel_sound_asset.h"
 #include "encrypted_kdm.h"
 #include "decrypted_kdm.h"
-#include <asdcp/KM_util.h>
+#include <KM_util.h>
 #include <sndfile.h>
 #include <boost/test/unit_test.hpp>
 #include <memory>
diff --git a/test/recovery_test.cc b/test/recovery_test.cc
index 43e5b93d..94d5e0b8 100644
--- a/test/recovery_test.cc
+++ b/test/recovery_test.cc
@@ -35,7 +35,7 @@
 #include "mono_picture_asset_writer.h"
 #include "mono_picture_asset.h"
 #include "test.h"
-#include <asdcp/KM_util.h>
+#include <KM_util.h>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/test.cc b/test/test.cc
index 450ff514..5d0da302 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -61,8 +61,8 @@
 #include "util.h"
 #include "warnings.h"
 LIBDCP_DISABLE_WARNINGS
-#include <asdcp/KM_util.h>
-#include <asdcp/KM_prng.h>
+#include <KM_util.h>
+#include <KM_prng.h>
 LIBDCP_ENABLE_WARNINGS
 #include <sndfile.h>
 LIBDCP_DISABLE_WARNINGS
diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc
index 4c615f99..6fefa94c 100644
--- a/tools/dcpdecryptmxf.cc
+++ b/tools/dcpdecryptmxf.cc
@@ -44,7 +44,7 @@
 #include "mono_picture_asset.h"
 #include "mono_picture_asset_writer.h"
 #include "util.h"
-#include <asdcp/AS_DCP.h>
+#include <AS_DCP.h>
 #include <getopt.h>
 #include <iostream>
 #include <string>