propagate from branch 'net.randombit.botan' (head 744dccf92270cf16b80b50ee2759424c9866b256)

            to branch 'net.randombit.botan.c++0x' (head 2aa1acac1d05e8ea9991fe39015b1db9abc3b24e)

6 files changed, 12 insertions, 9 deletions

diff --git a/src/asn1/asn1_alt.cpp b/src/asn1/asn1_alt.cpp
index 401eb54e9..de3fb7549 100644
--- a/src/asn1/asn1_alt.cpp
+++ b/src/asn1/asn1_alt.cpp
@@ -10,10 +10,10 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/oids.h>
-#include <botan/stl_util.h>
+#include <botan/internal/stl_util.h>
 #include <botan/charset.h>
 #include <botan/parsing.h>
-#include <botan/loadstor.h>
+#include <botan/internal/loadstor.h>
 
 namespace Botan {
 
diff --git a/src/asn1/asn1_dn.cpp b/src/asn1/asn1_dn.cpp
index d86edcd84..e474458b3 100644
--- a/src/asn1/asn1_dn.cpp
+++ b/src/asn1/asn1_dn.cpp
@@ -9,7 +9,7 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/parsing.h>
-#include <botan/stl_util.h>
+#include <botan/internal/stl_util.h>
 #include <botan/oids.h>
 
 namespace Botan {
diff --git a/src/asn1/asn1_oid.cpp b/src/asn1/asn1_oid.cpp
index c72ee7a1a..425df645c 100644
--- a/src/asn1/asn1_oid.cpp
+++ b/src/asn1/asn1_oid.cpp
@@ -8,7 +8,7 @@
 #include <botan/asn1_oid.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
-#include <botan/bit_ops.h>
+#include <botan/internal/bit_ops.h>
 #include <botan/parsing.h>
 
 namespace Botan {
diff --git a/src/asn1/ber_dec.cpp b/src/asn1/ber_dec.cpp
index b34bf8ca2..a61bbf00a 100644
--- a/src/asn1/ber_dec.cpp
+++ b/src/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>
 
 namespace Botan {
 
diff --git a/src/asn1/der_enc.cpp b/src/asn1/der_enc.cpp
index 1863e400d..baf3fa043 100644
--- a/src/asn1/der_enc.cpp
+++ b/src/asn1/der_enc.cpp
@@ -8,8 +8,8 @@
 #include <botan/der_enc.h>
 #include <botan/asn1_int.h>
 #include <botan/bigint.h>
-#include <botan/loadstor.h>
-#include <botan/bit_ops.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/bit_ops.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/asn1/info.txt b/src/asn1/info.txt
index d836b4c0b..7ed025e68 100644
--- a/src/asn1/info.txt
+++ b/src/asn1/info.txt
@@ -2,7 +2,7 @@ define ASN1
 
 load_on auto
 
-<add>
+<source>
 alg_id.cpp
 asn1_alt.cpp
 asn1_att.cpp
@@ -13,13 +13,16 @@ asn1_str.cpp
 asn1_tm.cpp
 ber_dec.cpp
 der_enc.cpp
+</source>
+
+<header:public>
 alg_id.h
 asn1_int.h
 asn1_obj.h
 asn1_oid.h
 ber_dec.h
 der_enc.h
-</add>
+</header:public>
 
 <requires>
 alloc