9 files changed, 50 insertions, 29 deletions
diff --git a/src/math/bigint/info.txt b/src/math/bigint/info.txt
index 908304c9f..9c8e1fa17 100644
--- a/src/math/bigint/info.txt
+++ b/src/math/bigint/info.txt
@@ -4,14 +4,6 @@ load_on auto
 
 define BIGINT
 
-<requires>
-hex
-rng
-mp_amd64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic
-monty_generic
-mulop_generic
-</requires>
-
 <add>
 bigint.h
 divide.h
@@ -30,3 +22,10 @@ mp_karat.cpp
 mp_misc.cpp
 mp_shift.cpp
 </add>
+
+<requires>
+hex
+mp_ia32
+mp_ia32_msvc
+rng
+</requires>
diff --git a/src/math/bigint/monty_amd64/info.txt b/src/math/bigint/monty_amd64/info.txt
index 5f80a0b1e..dff74c611 100644
--- a/src/math/bigint/monty_amd64/info.txt
+++ b/src/math/bigint/monty_amd64/info.txt
@@ -8,10 +8,6 @@ load_on never
 mp_monty.S
 </add>
 
-<requires>
-asm_amd64
-</requires>
-
 <arch>
 amd64
 </arch>
@@ -29,3 +25,7 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+</requires>
diff --git a/src/math/bigint/monty_generic/info.txt b/src/math/bigint/monty_generic/info.txt
index 6f5f0e722..e99e5e083 100644
--- a/src/math/bigint/monty_generic/info.txt
+++ b/src/math/bigint/monty_generic/info.txt
@@ -5,3 +5,8 @@ load_on dep
 <add>
 mp_monty.cpp
 </add>
+
+<requires>
+mp_ia32
+mp_ia32_msvc
+</requires>
diff --git a/src/math/bigint/mp_ia32_msvc/info.txt b/src/math/bigint/mp_ia32_msvc/info.txt
index 9c7ac9b43..9ca22a2da 100644
--- a/src/math/bigint/mp_ia32_msvc/info.txt
+++ b/src/math/bigint/mp_ia32_msvc/info.txt
@@ -16,3 +16,7 @@ ia32
 <cc>
 msvc
 </cc>
+
+<requires>
+mp_ia32
+</requires>
diff --git a/src/math/bigint/mulop_amd64/info.txt b/src/math/bigint/mulop_amd64/info.txt
index 15bde7bf3..0f512251c 100644
--- a/src/math/bigint/mulop_amd64/info.txt
+++ b/src/math/bigint/mulop_amd64/info.txt
@@ -8,10 +8,6 @@ load_on never
 mp_mulop_amd64.S
 </add>
 
-<requires>
-asm_amd64
-</requires>
-
 <arch>
 amd64
 </arch>
@@ -29,3 +25,9 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+mp_ia32
+mp_ia32_msvc
+</requires>
diff --git a/src/math/bigint/mulop_generic/info.txt b/src/math/bigint/mulop_generic/info.txt
index 28ebe41eb..8700e9332 100644
--- a/src/math/bigint/mulop_generic/info.txt
+++ b/src/math/bigint/mulop_generic/info.txt
@@ -5,3 +5,8 @@ load_on dep
 <add>
 mp_mulop.cpp
 </add>
+
+<requires>
+mp_ia32
+mp_ia32_msvc
+</requires>
diff --git a/src/math/bigint/mulop_ia32/info.txt b/src/math/bigint/mulop_ia32/info.txt
index 1c89e95c1..a7b525bfb 100644
--- a/src/math/bigint/mulop_ia32/info.txt
+++ b/src/math/bigint/mulop_ia32/info.txt
@@ -10,10 +10,6 @@ load_on request
 mp_mulop.S
 </add>
 
-<requires>
-asm_ia32
-</requires>
-
 <arch>
 ia32
 </arch>
@@ -31,3 +27,7 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+</requires>
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
index e90569d26..0fadcc819 100644
--- a/src/math/gfpmath/info.txt
+++ b/src/math/gfpmath/info.txt
@@ -6,11 +6,6 @@ load_on auto
 
 define BIGINT_GFP
 
-<requires>
-bigint
-numbertheory
-</requires>
-
 <add>
 curve_gfp.cpp
 curve_gfp.h
@@ -20,3 +15,10 @@ gfp_modulus.h
 point_gfp.cpp
 point_gfp.h
 </add>
+
+<requires>
+bigint
+mp_ia32
+mp_ia32_msvc
+numbertheory
+</requires>
diff --git a/src/math/numbertheory/info.txt b/src/math/numbertheory/info.txt
index 6ce3583c8..1595c7305 100644
--- a/src/math/numbertheory/info.txt
+++ b/src/math/numbertheory/info.txt
@@ -4,10 +4,6 @@ load_on auto
 
 define BIGINT_MATH
 
-<requires>
-bigint
-</requires>
-
 <add>
 blinding.cpp
 blinding.h
@@ -27,3 +23,11 @@ reducer.cpp
 reducer.h
 ressol.cpp
 </add>
+
+<requires>
+algo_factory
+bigint
+hash
+libstate
+rng
+</requires>