Tidy includes to make many headers self-contained

Author: real-or-random

src/ecdsa.h

@@ -12,6 +12,7 @@
 #include "scalar.h"
 #include "group.h"
 #include "ecmult.h"
+#include "ecmult_gen.h"
 
 static int secp256k1_ecdsa_sig_parse(secp256k1_scalar *r, secp256k1_scalar *s, const unsigned char *sig, size_t size);
 static int secp256k1_ecdsa_sig_serialize(unsigned char *sig, size_t *size, const secp256k1_scalar *r, const secp256k1_scalar *s);

src/ecmult_compute_table.h

@@ -7,6 +7,8 @@
 #ifndef SECP256K1_ECMULT_COMPUTE_TABLE_H
 #define SECP256K1_ECMULT_COMPUTE_TABLE_H
 
+#include "group.h"
+
 /* Construct table of all odd multiples of gen in range 1..(2**(window_g-1)-1). */
 static void secp256k1_ecmult_compute_table(secp256k1_ge_storage* table, int window_g, const secp256k1_gej* gen);
 

src/hsort_impl.h

@@ -8,6 +8,7 @@
 #define SECP256K1_HSORT_IMPL_H
 
 #include "hsort.h"
+#include "util.h"
 
 /* An array is a heap when, for all non-zero indexes i, the element at index i
  * compares as less than or equal to the element at index parent(i) = (i-1)/2.

src/modinv64.h

@@ -9,6 +9,8 @@
 
 #include "util.h"
 
+#include <stdint.h>
+
 #ifndef SECP256K1_WIDEMUL_INT128
 #error "modinv64 requires 128-bit wide multiplication support"
 #endif

src/scalar_4x64_impl.h

@@ -9,7 +9,9 @@
 
 #include "checkmem.h"
 #include "int128.h"
-#include "modinv64_impl.h"
+#include "modinv64.h"
+#include "scalar.h"
+#include "scalar_4x64.h"
 #include "util.h"
 
 /* Limbs of the secp256k1 order. */

src/scalar_8x32_impl.h

@@ -8,7 +8,9 @@
 #define SECP256K1_SCALAR_REPR_IMPL_H
 
 #include "checkmem.h"
-#include "modinv32_impl.h"
+#include "modinv32.h"
+#include "scalar.h"
+#include "scalar_8x32.h"
 #include "util.h"
 
 /* Limbs of the secp256k1 order. */

src/scratch.h

@@ -7,6 +7,10 @@
 #ifndef SECP256K1_SCRATCH_H
 #define SECP256K1_SCRATCH_H
 
+#include "secp256k1_internal.h"
+
+#include <stdlib.h>
+
 /* The typedef is used internally; the struct name is used in the public API
  * (where it is exposed as a different typedef) */
 typedef struct secp256k1_scratch_space_struct {

src/selftest.h

@@ -8,6 +8,7 @@
 #define SECP256K1_SELFTEST_H
 
 #include "hash.h"
+#include "util.h"
 
 #include <string.h>
 

src/testrand_impl.h

@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
 #include "testrand.h"
 #include "hash.h"

src/tests.c

@@ -8,8 +8,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <time.h>
-
 #ifdef USE_EXTERNAL_DEFAULT_CALLBACKS
     #pragma message("Ignoring USE_EXTERNAL_CALLBACKS in tests.")
     #undef USE_EXTERNAL_DEFAULT_CALLBACKS