Include modinv32/64 like other internal modules

And also sort the _impl.h includes.

Author: real-or-random

src/field_10x26_impl.h

@@ -10,7 +10,7 @@
 #include "checkmem.h"
 #include "util.h"
 #include "field.h"
-#include "modinv32_impl.h"
+#include "modinv32.h"
 
 #ifdef VERIFY
 static void secp256k1_fe_impl_verify(const secp256k1_fe *a) {

src/field_5x52_impl.h

@@ -10,7 +10,7 @@
 #include "checkmem.h"
 #include "util.h"
 #include "field.h"
-#include "modinv64_impl.h"
+#include "modinv64.h"
 
 #include "field_5x52_int128_impl.h"
 

src/precompute_ecmult.c

@@ -16,6 +16,12 @@
 #include "field_impl.h"
 #include "group_impl.h"
 #include "int128_impl.h"
+#include "modinv32_impl.h"
+#ifdef SECP256K1_WIDEMUL_INT128
+/* modinv64 is only available if we have an int128 implementation. */
+#include "modinv64_impl.h"
+#endif
+
 #include "ecmult.h"
 #include "ecmult_compute_table_impl.h"
 

src/precompute_ecmult_gen.c

@@ -15,6 +15,12 @@
 
 #include "group.h"
 #include "int128_impl.h"
+#include "modinv32_impl.h"
+#ifdef SECP256K1_WIDEMUL_INT128
+/* modinv64 is only available if we have an int128 implementation. */
+#include "modinv64_impl.h"
+#endif
+
 #include "ecmult_gen.h"
 #include "ecmult_gen_compute_table_impl.h"
 

src/secp256k1.c

@@ -26,19 +26,24 @@
 #include "checkmem.h"
 #include "util.h"
 
-#include "field_impl.h"
-#include "scalar_impl.h"
-#include "group_impl.h"
-#include "ecmult_impl.h"
-#include "ecmult_const_impl.h"
-#include "ecmult_gen_impl.h"
 #include "ecdsa_impl.h"
 #include "eckey_impl.h"
+#include "ecmult_const_impl.h"
+#include "ecmult_gen_impl.h"
+#include "ecmult_impl.h"
+#include "field_impl.h"
+#include "group_impl.h"
 #include "hash_impl.h"
+#include "hsort_impl.h"
 #include "int128_impl.h"
+#include "modinv32_impl.h"
+#ifdef SECP256K1_WIDEMUL_INT128
+/* modinv64 is only available if we have an int128 implementation. */
+#include "modinv64_impl.h"
+#endif
+#include "scalar_impl.h"
 #include "scratch_impl.h"
 #include "selftest.h"
-#include "hsort_impl.h"
 
 #ifdef SECP256K1_NO_BUILD
 # error "secp256k1.h processed without SECP256K1_BUILD defined while building secp256k1.c"

src/tests.c

@@ -27,12 +27,6 @@
 #include "../contrib/lax_der_parsing.c"
 #include "../contrib/lax_der_privatekey_parsing.c"
 
-#include "modinv32_impl.h"
-#ifdef SECP256K1_WIDEMUL_INT128
-#include "modinv64_impl.h"
-#include "int128_impl.h"
-#endif
-
 #define CONDITIONAL_TEST(cnt, nam) if (COUNT < (cnt)) { printf("Skipping %s (iteration count too low)\n", nam); } else
 
 static int COUNT = 16;