Revert "system/extra: include more of what you use."

This reverts commit aa24bc89b78a5981df7618bdef78b7b49ffad14d.

Change-Id: If55eb0effc582f1cfa329bab8d7504ad4964f67e
diff --git a/verity/generate_verity_key.c b/verity/generate_verity_key.c
index 0da978f..a55600c 100644
--- a/verity/generate_verity_key.c
+++ b/verity/generate_verity_key.c
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-#define _GNU_SOURCE  /* needed for asprintf */
-
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 /* HACK: we need the RSAPublicKey struct
diff --git a/verity/verify_boot_signature.c b/verity/verify_boot_signature.c
index cf4cfac..55591aa 100644
--- a/verity/verify_boot_signature.c
+++ b/verity/verify_boot_signature.c
@@ -19,7 +19,6 @@
 #include <endian.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -31,7 +30,6 @@
 #include <openssl/asn1t.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/mem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>