Post-merge fixes

10 files changed, 10 insertions, 27 deletions

diff --git a/src/algo_factory/algo_cache.h b/src/algo_factory/algo_cache.h
index 09bbc4b5a..bafea45e9 100644
--- a/src/algo_factory/algo_cache.h
+++ b/src/algo_factory/algo_cache.h
@@ -9,7 +9,7 @@
 #define BOTAN_ALGORITHM_CACHE_TEMPLATE_H__
 
 #include <botan/types.h>
-#include <botan/stl_util.h>
+#include <botan/internal/stl_util.h>
 #include <mutex>
 #include <string>
 #include <vector>
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index 06b05276f..1ca9415e5 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -9,9 +9,9 @@
 #include <botan/init.h>
 #include <botan/selftest.h>
 #include <botan/engine.h>
-#include <botan/stl_util.h>
+#include <botan/internal/stl_util.h>
 #include <botan/charset.h>
-#include <botan/defalloc.h>
+#include <botan/internal/defalloc.h>
 #include <botan/def_eng.h>
 #include <algorithm>
 
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
index 55ae8b5e6..b7b430805 100644
--- a/src/math/gfpmath/info.txt
+++ b/src/math/gfpmath/info.txt
@@ -7,15 +7,7 @@ gfp_modulus.h
 point_gfp.h
 </header:public>
 
-<<<<<<< variant A
 <source>
->>>>>>> variant B
-<add>
-####### Ancestor
-define BIGINT_GFP
-
-<add>
-======= end
 curve_gfp.cpp
 gfp_element.cpp
 point_gfp.cpp
diff --git a/src/pubkey/dsa/dsa_op.cpp b/src/pubkey/dsa/dsa_op.cpp
index 03eaebfb0..5eb9e92be 100644
--- a/src/pubkey/dsa/dsa_op.cpp
+++ b/src/pubkey/dsa/dsa_op.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/dsa_op.h>
-#include <botan/async.h>
+#include <botan/internal/async.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/elgamal/elg_op.cpp b/src/pubkey/elgamal/elg_op.cpp
index db828a300..49db44251 100644
--- a/src/pubkey/elgamal/elg_op.cpp
+++ b/src/pubkey/elgamal/elg_op.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/elg_op.h>
-#include <botan/async.h>
+#include <botan/internal/async.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/if_algo/if_op.cpp b/src/pubkey/if_algo/if_op.cpp
index 7974bf4f0..58618775b 100644
--- a/src/pubkey/if_algo/if_op.cpp
+++ b/src/pubkey/if_algo/if_op.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/if_op.h>
 #include <botan/numthry.h>
-#include <botan/async.h>
+#include <botan/internal/async.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/nr/nr_op.cpp b/src/pubkey/nr/nr_op.cpp
index 49aa9fc00..da104802d 100644
--- a/src/pubkey/nr/nr_op.cpp
+++ b/src/pubkey/nr/nr_op.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/nr_op.h>
-#include <botan/async.h>
+#include <botan/internal/async.h>
 
 namespace Botan {
 
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp
index 00a3a27d0..84cd647b7 100644
--- a/src/rng/hmac_rng/hmac_rng.cpp
+++ b/src/rng/hmac_rng/hmac_rng.cpp
@@ -6,18 +6,8 @@
 */
 
 #include <botan/hmac_rng.h>
-<<<<<<< variant A
 #include <botan/internal/loadstor.h>
 #include <botan/internal/xor_buf.h>
-#include <botan/internal/stl_util.h>
->>>>>>> variant B
-#include <botan/loadstor.h>
-#include <botan/xor_buf.h>
-####### Ancestor
-#include <botan/loadstor.h>
-#include <botan/xor_buf.h>
-#include <botan/stl_util.h>
-======= end
 #include <algorithm>
 
 namespace Botan {
diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index 18a3b49a0..015cac491 100644
--- a/src/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
@@ -6,8 +6,8 @@
 */
 
 #include <botan/randpool.h>
-#include <botan/loadstor.h>
-#include <botan/xor_buf.h>
+#include <botan/internal/loadstor.h>
+#include <botan/internal/xor_buf.h>
 #include <algorithm>
 #include <chrono>
 
diff --git a/src/utils/info.txt b/src/utils/info.txt
index edeeb1cf9..bbfcd34be 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -14,6 +14,7 @@ version.cpp
 </source>
 
 <header:internal>
+async.h
 bit_ops.h
 bswap.h
 loadstor.h