9 files changed, 12 insertions, 11 deletions
diff --git a/src/math/bigint/bigint.cpp b/src/math/bigint/bigint.cpp
index a11960aca..70bb11a83 100644
--- a/src/math/bigint/bigint.cpp
+++ b/src/math/bigint/bigint.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/bigint.h>
 #include <botan/internal/mp_core.h>
-#include <botan/internal/loadstor.h>
+#include <botan/loadstor.h>
 #include <botan/parsing.h>
 #include <botan/internal/rounding.h>
 
diff --git a/src/math/gfpmath/gfp_element.cpp b/src/math/gfpmath/gfp_element.cpp
index ebba236d5..233f2e4cd 100644
--- a/src/math/gfpmath/gfp_element.cpp
+++ b/src/math/gfpmath/gfp_element.cpp
@@ -8,7 +8,7 @@
 
 #include <botan/gfp_element.h>
 #include <botan/numthry.h>
-#include <botan/def_powm.h>
+#include <botan/internal/def_powm.h>
 #include <botan/internal/mp_asm.h>
 #include <botan/internal/mp_asmi.h>
 #include <ostream>
diff --git a/src/math/numbertheory/def_powm.h b/src/math/numbertheory/def_powm.h
index 472c865c3..5b8a5a591 100644
--- a/src/math/numbertheory/def_powm.h
+++ b/src/math/numbertheory/def_powm.h
@@ -17,7 +17,7 @@ namespace Botan {
 /*
 * Fixed Window Exponentiator
 */
-class BOTAN_DLL Fixed_Window_Exponentiator : public Modular_Exponentiator
+class Fixed_Window_Exponentiator : public Modular_Exponentiator
    {
    public:
       void set_exponent(const BigInt&);
@@ -39,7 +39,7 @@ class BOTAN_DLL Fixed_Window_Exponentiator : public Modular_Exponentiator
 /*
 * Montgomery Exponentiator
 */
-class BOTAN_DLL Montgomery_Exponentiator : public Modular_Exponentiator
+class Montgomery_Exponentiator : public Modular_Exponentiator
    {
    public:
       void set_exponent(const BigInt&);
diff --git a/src/math/numbertheory/info.txt b/src/math/numbertheory/info.txt
index 4a3e3436b..19abfaaa0 100644
--- a/src/math/numbertheory/info.txt
+++ b/src/math/numbertheory/info.txt
@@ -4,12 +4,15 @@ define BIGINT_MATH
 
 <header:public>
 blinding.h
-def_powm.h
 numthry.h
 pow_mod.h
 reducer.h
 </header:public>
 
+<header:internal>
+def_powm.h
+</header:internal>
+
 <source>
 blinding.cpp
 dsa_gen.cpp
diff --git a/src/math/numbertheory/numthry.cpp b/src/math/numbertheory/numthry.cpp
index ab51b75a3..0740ea21b 100644
--- a/src/math/numbertheory/numthry.cpp
+++ b/src/math/numbertheory/numthry.cpp
@@ -76,8 +76,6 @@ u32bit miller_rabin_test_iterations(u32bit bits, bool verify)
 */
 u32bit low_zero_bits(const BigInt& n)
    {
-   if(n.is_negative() || n.is_zero()) return 0;
-
    u32bit low_zero = 0;
 
    if(n.is_positive() && n.is_nonzero())
diff --git a/src/math/numbertheory/numthry.h b/src/math/numbertheory/numthry.h
index e4c043799..ae2c219fc 100644
--- a/src/math/numbertheory/numthry.h
+++ b/src/math/numbertheory/numthry.h
@@ -41,7 +41,7 @@ BigInt BOTAN_DLL power_mod(const BigInt&, const BigInt&, const BigInt&);
 * Compute the square root of x modulo a prime
 * using the Shanks-Tonnelli algorithm
 */
-BigInt ressol(const BigInt& x, const BigInt& p);
+BigInt BOTAN_DLL ressol(const BigInt& x, const BigInt& p);
 
 /*
 * Utility Functions
diff --git a/src/math/numbertheory/pow_mod.cpp b/src/math/numbertheory/pow_mod.cpp
index fd9b8e921..8d6bac699 100644
--- a/src/math/numbertheory/pow_mod.cpp
+++ b/src/math/numbertheory/pow_mod.cpp
@@ -6,7 +6,7 @@
 */
 
 #include <botan/pow_mod.h>
-#include <botan/pk_engine.h>
+#include <botan/internal/pk_engine.h>
 
 namespace Botan {
 
diff --git a/src/math/numbertheory/powm_fw.cpp b/src/math/numbertheory/powm_fw.cpp
index 8f39830a7..1cfcdcd66 100644
--- a/src/math/numbertheory/powm_fw.cpp
+++ b/src/math/numbertheory/powm_fw.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/def_powm.h>
+#include <botan/internal/def_powm.h>
 #include <botan/numthry.h>
 #include <vector>
 
diff --git a/src/math/numbertheory/powm_mnt.cpp b/src/math/numbertheory/powm_mnt.cpp
index d18081c6a..e356387c0 100644
--- a/src/math/numbertheory/powm_mnt.cpp
+++ b/src/math/numbertheory/powm_mnt.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/def_powm.h>
+#include <botan/internal/def_powm.h>
 #include <botan/numthry.h>
 #include <botan/internal/mp_core.h>