(oops) Apologies all, that last header-cleanup commit was from the wrong

tree. This further reduces header interdependencies, and makes some
associated cleanups.

crypto/ec/ectest.c

@@ -92,6 +92,7 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 #include <openssl/objects.h>
+#include <openssl/rand.h>
 
 #define ABORT do { \
 	fflush(stdout); \