Full working amalgamation build, plus internal-only headers concept.

30 files changed, 63 insertions, 57 deletions

diff --git a/src/math/bigint/big_ops2.cpp b/src/math/bigint/big_ops2.cpp
index 488eca909..863e5bde4 100644
--- a/src/math/bigint/big_ops2.cpp
+++ b/src/math/bigint/big_ops2.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/bigint.h>
-#include <botan/mp_core.h>
+#include <botan/internal/mp_core.h>
 #include <botan/bit_ops.h>
 #include <algorithm>
 
diff --git a/src/math/bigint/big_ops3.cpp b/src/math/bigint/big_ops3.cpp
index ad8b7bbd0..8f7861003 100644
--- a/src/math/bigint/big_ops3.cpp
+++ b/src/math/bigint/big_ops3.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/bigint.h>
 #include <botan/divide.h>
-#include <botan/mp_core.h>
+#include <botan/internal/mp_core.h>
 #include <botan/bit_ops.h>
 #include <algorithm>
 
diff --git a/src/math/bigint/bigint.cpp b/src/math/bigint/bigint.cpp
index 7592ec439..dba4f6204 100644
--- a/src/math/bigint/bigint.cpp
+++ b/src/math/bigint/bigint.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/bigint.h>
-#include <botan/mp_core.h>
+#include <botan/internal/mp_core.h>
 #include <botan/loadstor.h>
 #include <botan/parsing.h>
 #include <botan/rounding.h>
diff --git a/src/math/bigint/divide.cpp b/src/math/bigint/divide.cpp
index 45d31350d..a5f2462d8 100644
--- a/src/math/bigint/divide.cpp
+++ b/src/math/bigint/divide.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/divide.h>
-#include <botan/mp_core.h>
+#include <botan/internal/mp_core.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/info.txt b/src/math/bigint/info.txt
index 30018b795..d5741943f 100644
--- a/src/math/bigint/info.txt
+++ b/src/math/bigint/info.txt
@@ -2,11 +2,17 @@ load_on auto
 
 define BIGINT
 
-<add>
+<header:public>
 bigint.h
 divide.h
-mp_core.h
 mp_types.h
+</header:public>
+
+<header:internal>
+mp_core.h
+</header:internal>
+
+<source>
 big_code.cpp
 big_io.cpp
 big_ops2.cpp
@@ -19,7 +25,7 @@ mp_comba.cpp
 mp_karat.cpp
 mp_misc.cpp
 mp_shift.cpp
-</add>
+</source>
 
 <requires>
 alloc
diff --git a/src/math/bigint/monty_amd64/info.txt b/src/math/bigint/monty_amd64/info.txt
index 657cd0353..bb16dbe8f 100644
--- a/src/math/bigint/monty_amd64/info.txt
+++ b/src/math/bigint/monty_amd64/info.txt
@@ -2,9 +2,9 @@ mp_bits 64
 
 load_on never
 
-<add>
+<source>
 mp_monty.S
-</add>
+</source>
 
 <arch>
 amd64
diff --git a/src/math/bigint/monty_amd64/mp_monty.S b/src/math/bigint/monty_amd64/mp_monty.S
index fa493aaa2..9eab9f766 100644
--- a/src/math/bigint/monty_amd64/mp_monty.S
+++ b/src/math/bigint/monty_amd64/mp_monty.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_amd64.h>
+#include <botan/internal/asm_macr_amd64.h>
 
 START_LISTING(mp_monty.S)
 
diff --git a/src/math/bigint/monty_generic/info.txt b/src/math/bigint/monty_generic/info.txt
index c709229e6..cd05ccdc0 100644
--- a/src/math/bigint/monty_generic/info.txt
+++ b/src/math/bigint/monty_generic/info.txt
@@ -1,5 +1,5 @@
 load_on dep
 
-<add>
+<source>
 mp_monty.cpp
-</add>
+</source>
diff --git a/src/math/bigint/monty_generic/mp_monty.cpp b/src/math/bigint/monty_generic/mp_monty.cpp
index 5409e2569..ba1071e21 100644
--- a/src/math/bigint/monty_generic/mp_monty.cpp
+++ b/src/math/bigint/monty_generic/mp_monty.cpp
@@ -6,9 +6,9 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_core.h>
-#include <botan/mp_asm.h>
-#include <botan/mp_asmi.h>
+#include <botan/internal/mp_core.h>
+#include <botan/internal/mp_asm.h>
+#include <botan/internal/mp_asmi.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_amd64/info.txt b/src/math/bigint/mp_amd64/info.txt
index a7da8806e..616fb2840 100644
--- a/src/math/bigint/mp_amd64/info.txt
+++ b/src/math/bigint/mp_amd64/info.txt
@@ -1,11 +1,11 @@
-mp_bits 64
-
 load_on dep
 
-<add>
+mp_bits 64
+
+<header:internal>
 mp_asm.h
 mp_asmi.h
-</add>
+</header:internal>
 
 <arch>
 amd64
diff --git a/src/math/bigint/mp_amd64/mp_asmi.h b/src/math/bigint/mp_amd64/mp_asmi.h
index 1a3ac1aaa..d8f681d77 100644
--- a/src/math/bigint/mp_amd64/mp_asmi.h
+++ b/src/math/bigint/mp_amd64/mp_asmi.h
@@ -9,7 +9,7 @@
 #ifndef BOTAN_MP_ASM_INTERNAL_H__
 #define BOTAN_MP_ASM_INTERNAL_H__
 
-#include <botan/mp_asm.h>
+#include <botan/internal/mp_asm.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_asm.cpp b/src/math/bigint/mp_asm.cpp
index ea9738d30..9827bff06 100644
--- a/src/math/bigint/mp_asm.cpp
+++ b/src/math/bigint/mp_asm.cpp
@@ -6,9 +6,9 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_asm.h>
-#include <botan/mp_asmi.h>
-#include <botan/mp_core.h>
+#include <botan/internal/mp_asm.h>
+#include <botan/internal/mp_asmi.h>
+#include <botan/internal/mp_core.h>
 #include <botan/mem_ops.h>
 
 namespace Botan {
diff --git a/src/math/bigint/mp_asm64/info.txt b/src/math/bigint/mp_asm64/info.txt
index 7bdbffb2c..fd0242a7a 100644
--- a/src/math/bigint/mp_asm64/info.txt
+++ b/src/math/bigint/mp_asm64/info.txt
@@ -2,10 +2,10 @@ mp_bits 64
 
 load_on dep
 
-<add>
+<header:internal>
 mp_asm.h
 mp_generic:mp_asmi.h
-</add>
+</header:internal>
 
 <arch>
 #amd64
diff --git a/src/math/bigint/mp_comba.cpp b/src/math/bigint/mp_comba.cpp
index 218038d8a..2770d3f0a 100644
--- a/src/math/bigint/mp_comba.cpp
+++ b/src/math/bigint/mp_comba.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_core.h>
-#include <botan/mp_asmi.h>
+#include <botan/internal/mp_core.h>
+#include <botan/internal/mp_asmi.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_generic/info.txt b/src/math/bigint/mp_generic/info.txt
index 28f258ebb..ab4d7406a 100644
--- a/src/math/bigint/mp_generic/info.txt
+++ b/src/math/bigint/mp_generic/info.txt
@@ -1,6 +1,6 @@
 load_on dep
 
-<add>
+<header:internal>
 mp_asm.h
 mp_asmi.h
-</add>
+</header:internal>
diff --git a/src/math/bigint/mp_generic/mp_asmi.h b/src/math/bigint/mp_generic/mp_asmi.h
index 21c4db248..9913c6ba9 100644
--- a/src/math/bigint/mp_generic/mp_asmi.h
+++ b/src/math/bigint/mp_generic/mp_asmi.h
@@ -9,7 +9,7 @@
 #ifndef BOTAN_MP_ASM_INTERNAL_H__
 #define BOTAN_MP_ASM_INTERNAL_H__
 
-#include <botan/mp_asm.h>
+#include <botan/internal/mp_asm.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_ia32/info.txt b/src/math/bigint/mp_ia32/info.txt
index 6e093a7e5..182f34eb7 100644
--- a/src/math/bigint/mp_ia32/info.txt
+++ b/src/math/bigint/mp_ia32/info.txt
@@ -1,11 +1,11 @@
-mp_bits 32
+load_on dep
 
-load_on asm_ok
+mp_bits 32
 
-<add>
+<header:internal>
 mp_asm.h
 mp_asmi.h
-</add>
+</header:internal>
 
 <arch>
 ia32
diff --git a/src/math/bigint/mp_ia32/mp_asmi.h b/src/math/bigint/mp_ia32/mp_asmi.h
index 46bf302d5..0b8708e53 100644
--- a/src/math/bigint/mp_ia32/mp_asmi.h
+++ b/src/math/bigint/mp_ia32/mp_asmi.h
@@ -9,7 +9,7 @@
 #ifndef BOTAN_MP_ASM_INTERNAL_H__
 #define BOTAN_MP_ASM_INTERNAL_H__
 
-#include <botan/mp_asm.h>
+#include <botan/internal/mp_asm.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_ia32_msvc/info.txt b/src/math/bigint/mp_ia32_msvc/info.txt
index 52839d89b..55a42c310 100644
--- a/src/math/bigint/mp_ia32_msvc/info.txt
+++ b/src/math/bigint/mp_ia32_msvc/info.txt
@@ -2,10 +2,10 @@ mp_bits 32
 
 load_on dep
 
-<add>
+<header:internal>
 mp_generic:mp_asm.h
 mp_asmi.h
-</add>
+</header:internal>
 
 <arch>
 ia32
diff --git a/src/math/bigint/mp_ia32_msvc/mp_asmi.h b/src/math/bigint/mp_ia32_msvc/mp_asmi.h
index 33ce6eb3d..4c3027fde 100644
--- a/src/math/bigint/mp_ia32_msvc/mp_asmi.h
+++ b/src/math/bigint/mp_ia32_msvc/mp_asmi.h
@@ -9,7 +9,7 @@
 #ifndef BOTAN_MP_ASM_INTERNAL_H__
 #define BOTAN_MP_ASM_INTERNAL_H__
 
-#include <botan/mp_asm.h>
+#include <botan/internal/mp_asm.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_karat.cpp b/src/math/bigint/mp_karat.cpp
index f30d418cc..a50e4ee0c 100644
--- a/src/math/bigint/mp_karat.cpp
+++ b/src/math/bigint/mp_karat.cpp
@@ -5,9 +5,9 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_core.h>
+#include <botan/internal/mp_core.h>
 #include <botan/mem_ops.h>
-#include <botan/mp_asmi.h>
+#include <botan/internal/mp_asmi.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_misc.cpp b/src/math/bigint/mp_misc.cpp
index 6b7fc651b..86d5f3d50 100644
--- a/src/math/bigint/mp_misc.cpp
+++ b/src/math/bigint/mp_misc.cpp
@@ -5,8 +5,8 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_core.h>
-#include <botan/mp_asm.h>
+#include <botan/internal/mp_core.h>
+#include <botan/internal/mp_asm.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/mp_shift.cpp b/src/math/bigint/mp_shift.cpp
index a7de79c77..f1d609bfb 100644
--- a/src/math/bigint/mp_shift.cpp
+++ b/src/math/bigint/mp_shift.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_core.h>
+#include <botan/internal/mp_core.h>
 #include <botan/mem_ops.h>
 
 namespace Botan {
diff --git a/src/math/bigint/mulop_amd64/info.txt b/src/math/bigint/mulop_amd64/info.txt
index 704e4dad8..4a82ff5be 100644
--- a/src/math/bigint/mulop_amd64/info.txt
+++ b/src/math/bigint/mulop_amd64/info.txt
@@ -2,9 +2,9 @@ mp_bits 64
 
 load_on never
 
-<add>
+<source>
 mp_mulop_amd64.S
-</add>
+</source>
 
 <arch>
 amd64
diff --git a/src/math/bigint/mulop_amd64/mp_mulop.cpp b/src/math/bigint/mulop_amd64/mp_mulop.cpp
index cbd723e28..e2f38a104 100644
--- a/src/math/bigint/mulop_amd64/mp_mulop.cpp
+++ b/src/math/bigint/mulop_amd64/mp_mulop.cpp
@@ -5,9 +5,9 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_asm.h>
-#include <botan/mp_asmi.h>
-#include <botan/mp_core.h>
+#include <botan/internal/mp_asm.h>
+#include <botan/internal/mp_asmi.h>
+#include <botan/internal/mp_core.h>
 #include <botan/mem_ops.h>
 
 namespace Botan {
diff --git a/src/math/bigint/mulop_amd64/mp_mulop_amd64.S b/src/math/bigint/mulop_amd64/mp_mulop_amd64.S
index dd794bccd..d0bb3325f 100644
--- a/src/math/bigint/mulop_amd64/mp_mulop_amd64.S
+++ b/src/math/bigint/mulop_amd64/mp_mulop_amd64.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_amd64.h>
+#include <botan/internal/asm_macr_amd64.h>
 
 START_LISTING(mp_mulop.S)
 
diff --git a/src/math/bigint/mulop_generic/info.txt b/src/math/bigint/mulop_generic/info.txt
index 8fa2a40c9..548d0f44b 100644
--- a/src/math/bigint/mulop_generic/info.txt
+++ b/src/math/bigint/mulop_generic/info.txt
@@ -1,5 +1,5 @@
 load_on dep
 
-<add>
+<source>
 mp_mulop.cpp
-</add>
+</source>
diff --git a/src/math/bigint/mulop_generic/mp_mulop.cpp b/src/math/bigint/mulop_generic/mp_mulop.cpp
index 4647d00d5..33ee2af32 100644
--- a/src/math/bigint/mulop_generic/mp_mulop.cpp
+++ b/src/math/bigint/mulop_generic/mp_mulop.cpp
@@ -5,9 +5,9 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/mp_asm.h>
-#include <botan/mp_asmi.h>
-#include <botan/mp_core.h>
+#include <botan/internal/mp_asm.h>
+#include <botan/internal/mp_asmi.h>
+#include <botan/internal/mp_core.h>
 #include <botan/mem_ops.h>
 
 namespace Botan {
diff --git a/src/math/bigint/mulop_ia32/info.txt b/src/math/bigint/mulop_ia32/info.txt
index dd554773f..7afa2ca2f 100644
--- a/src/math/bigint/mulop_ia32/info.txt
+++ b/src/math/bigint/mulop_ia32/info.txt
@@ -4,9 +4,9 @@ mp_bits 32
 
 load_on request
 
-<add>
+<source>
 mp_mulop.S
-</add>
+</source>
 
 <arch>
 ia32
diff --git a/src/math/bigint/mulop_ia32/mp_mulop.S b/src/math/bigint/mulop_ia32/mp_mulop.S
index 0ca559659..34cd58112 100644
--- a/src/math/bigint/mulop_ia32/mp_mulop.S
+++ b/src/math/bigint/mulop_ia32/mp_mulop.S
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/asm_macr_ia32.h>
+#include <botan/internal/asm_macr_ia32.h>
 
 START_LISTING(mp_muladd.S)