Cleanup, reorganize includes

Signed-off-by: Dave Heller <hellerda@linux.vnet.ibm.com>

5 files changed, 61 insertions, 62 deletions

diff --git a/container.c b/container.c
index bb26deb..2493e4d 100644
--- a/container.c
+++ b/container.c
@@ -14,17 +14,14 @@
  * limitations under the License.
  */
 
-#include <config.h>
-
+#include "config.h"
 #include "container.h"
 
+#include <regex.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
-#include <unistd.h>
 #include <string.h>
-#include <regex.h>
-#include <sysexits.h>
 
 extern char *progname;
 
diff --git a/container.h b/container.h
index e31829e..5d53b73 100644
--- a/container.h
+++ b/container.h
@@ -17,11 +17,11 @@
 #ifndef __STB_CONTAINER_H
 #define __STB_CONTAINER_H
 
+#include <stddef.h>
 #include <stdint.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <ccan/endian/endian.h>
-#include <ccan/short_types/short_types.h>
+
+#include "ccan/endian/endian.h"
+#include "ccan/short_types/short_types.h"
 
 #define PASSED 1
 #define FAILED 0
diff --git a/create-container.c b/create-container.c
index 7cf1fda..ad60412 100644
--- a/create-container.c
+++ b/create-container.c
@@ -14,30 +14,31 @@
  * limitations under the License.
  */
 
-#include <config.h>
-
-#include "container.c"
-#include "container.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <string.h>
 #include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
 #include <fcntl.h>
-#include <regex.h>
-#include <sysexits.h>
-
+#include <getopt.h>
+#include <limits.h>
+#include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
+#include <openssl/evp.h>
+#include <openssl/opensslv.h>
+#include <openssl/ossl_typ.h>
 #include <openssl/pem.h>
 #include <openssl/sha.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sysexits.h>
+#include <unistd.h>
+
+#include "ccan/endian/endian.h"
+#include "container.c"
+#include "container.h"
 
 #define CONTAINER_HDR 0
 #define PREFIX_HDR 1
diff --git a/hashkeys.c b/hashkeys.c
index 17eda95..ade5324 100644
--- a/hashkeys.c
+++ b/hashkeys.c
@@ -14,28 +14,27 @@
  * limitations under the License.
  */
 
-#include <config.h>
-
-#include "container.c"
-#include "container.h"
-
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <limits.h>
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+#include <openssl/evp.h>
+#include <openssl/ossl_typ.h>
+#include <openssl/pem.h>
+#include <openssl/sha.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
-#include <getopt.h>
-#include <unistd.h>
 #include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/stat.h>
 #include <sys/mman.h>
-#include <fcntl.h>
+#include <sys/stat.h>
 #include <sysexits.h>
+#include <unistd.h>
 
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#include <openssl/pem.h>
-#include <openssl/sha.h>
+#include "container.c"
+#include "container.h"
 
 #define BINARY_OUT 0
 #define ASCII_OUT 1
diff --git a/print-container.c b/print-container.c
index 967f318..8a2fe13 100644
--- a/print-container.c
+++ b/print-container.c
@@ -14,30 +14,32 @@
  * limitations under the License.
  */
 
-#include <config.h>
-
-#include "container.c"
-#include "container.h"
-
+#include <alloca.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <limits.h>
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+#include <openssl/ecdsa.h>
+#include <openssl/obj_mac.h>
+#include <openssl/opensslv.h>
+#include <openssl/ossl_typ.h>
+#include <openssl/sha.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
-#include <getopt.h>
-#include <unistd.h>
 #include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/mman.h>
-#include <fcntl.h>
-#include <alloca.h>
+#include <sys/stat.h>
 #include <sysexits.h>
+#include <unistd.h>
 
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#include <openssl/sha.h>
-#include <openssl/obj_mac.h>
+#include "ccan/endian/endian.h"
+#include "container.c"
+#include "container.h"
 
 char *progname;