10 files changed, 14 insertions, 62 deletions
diff --git a/src/lib/asn1/alg_id.h b/src/lib/asn1/alg_id.h
deleted file mode 100644
index 88e54466d..000000000
--- a/src/lib/asn1/alg_id.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* Algorithm Identifier
-* (C) 1999-2007 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_ALGORITHM_IDENTIFIER_H_
-#define BOTAN_ALGORITHM_IDENTIFIER_H_
-
-#include <botan/asn1_obj.h>
-BOTAN_DEPRECATED_HEADER(alg_id.h)
-
-#endif
diff --git a/src/lib/asn1/asn1_oid.cpp b/src/lib/asn1/asn1_oid.cpp
index 7338886f6..f9a5e3b8c 100644
--- a/src/lib/asn1/asn1_oid.cpp
+++ b/src/lib/asn1/asn1_oid.cpp
@@ -9,7 +9,7 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/internal/bit_ops.h>
-#include <botan/parsing.h>
+#include <botan/internal/parsing.h>
 #include <botan/oids.h>
 #include <algorithm>
 #include <sstream>
diff --git a/src/lib/asn1/asn1_oid.h b/src/lib/asn1/asn1_oid.h
deleted file mode 100644
index 91c5da9d8..000000000
--- a/src/lib/asn1/asn1_oid.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* ASN.1 OID
-* (C) 1999-2007,2019 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_ASN1_OID_H_
-#define BOTAN_ASN1_OID_H_
-
-#include <botan/asn1_obj.h>
-BOTAN_DEPRECATED_HEADER(asn1_oid.h)
-
-#endif
diff --git a/src/lib/asn1/asn1_str.cpp b/src/lib/asn1/asn1_str.cpp
index 6a31c5bb2..227a73fce 100644
--- a/src/lib/asn1/asn1_str.cpp
+++ b/src/lib/asn1/asn1_str.cpp
@@ -8,7 +8,7 @@
 #include <botan/asn1_obj.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
-#include <botan/charset.h>
+#include <botan/internal/charset.h>
 
 namespace Botan {
 
diff --git a/src/lib/asn1/asn1_str.h b/src/lib/asn1/asn1_str.h
deleted file mode 100644
index fed4950cc..000000000
--- a/src/lib/asn1/asn1_str.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* ASN.1 string type
-* (C) 1999-2010 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_ASN1_STRING_H_
-#define BOTAN_ASN1_STRING_H_
-
-#include <botan/asn1_obj.h>
-BOTAN_DEPRECATED_HEADER(asn1_str.h)
-
-#endif
diff --git a/src/lib/asn1/asn1_time.cpp b/src/lib/asn1/asn1_time.cpp
index 004be27b9..719e79277 100644
--- a/src/lib/asn1/asn1_time.cpp
+++ b/src/lib/asn1/asn1_time.cpp
@@ -9,8 +9,8 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/exceptn.h>
-#include <botan/parsing.h>
-#include <botan/calendar.h>
+#include <botan/internal/parsing.h>
+#include <botan/internal/calendar.h>
 #include <sstream>
 #include <iomanip>
 
diff --git a/src/lib/asn1/asn1_time.h b/src/lib/asn1/asn1_time.h
deleted file mode 100644
index 55ef82e05..000000000
--- a/src/lib/asn1/asn1_time.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-* ASN.1 Time Representation
-* (C) 1999-2007,2012 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_ASN1_TIME_H_
-#define BOTAN_ASN1_TIME_H_
-
-#include <botan/asn1_obj.h>
-BOTAN_DEPRECATED_HEADER(asn1_time.h)
-
-#endif
diff --git a/src/lib/asn1/ber_dec.cpp b/src/lib/asn1/ber_dec.cpp
index c5af2f933..8ccd80c2a 100644
--- a/src/lib/asn1/ber_dec.cpp
+++ b/src/lib/asn1/ber_dec.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/ber_dec.h>
 #include <botan/bigint.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/internal/safeint.h>
 
 namespace Botan {
diff --git a/src/lib/asn1/der_enc.cpp b/src/lib/asn1/der_enc.cpp
index 056766f43..88534efef 100644
--- a/src/lib/asn1/der_enc.cpp
+++ b/src/lib/asn1/der_enc.cpp
@@ -8,7 +8,7 @@
 #include <botan/der_enc.h>
 #include <botan/asn1_obj.h>
 #include <botan/bigint.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 #include <botan/internal/bit_ops.h>
 #include <algorithm>
 
diff --git a/src/lib/asn1/info.txt b/src/lib/asn1/info.txt
index 4772e1ca7..b7ba9c70b 100644
--- a/src/lib/asn1/info.txt
+++ b/src/lib/asn1/info.txt
@@ -5,3 +5,11 @@ ASN1 -> 20171109
 <requires>
 bigint
 </requires>
+
+<header:public>
+asn1_print.h
+asn1_obj.h
+der_enc.h
+oids.h
+ber_dec.h
+</header:public>