8 files changed, 11 insertions, 15 deletions
diff --git a/src/include/dkimbase.h b/src/include/dkimbase.h
index 320deb9..ce8cf0a 100644
--- a/src/include/dkimbase.h
+++ b/src/include/dkimbase.h
@@ -25,10 +25,6 @@
 #include <list>
 #include <string>
 
-#include <openssl/err.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-
 #define BUFFER_ALLOC_INCREMENT 256
 
 class CDKIMBase {
diff --git a/src/include/dkimsign.h b/src/include/dkimsign.h
index ad3c9d7..3cc7be8 100644
--- a/src/include/dkimsign.h
+++ b/src/include/dkimsign.h
@@ -22,6 +22,8 @@
 #ifndef DKIMSIGN_H
 #define DKIMSIGN_H
 
+#include <openssl/evp.h>
+
 #include "dkim.h"
 #include "dkimbase.h"
 
diff --git a/src/include/dkimverify.h b/src/include/dkimverify.h
index e1d0a92..f5314b8 100644
--- a/src/include/dkimverify.h
+++ b/src/include/dkimverify.h
@@ -25,6 +25,8 @@
 #include <list>
 #include <vector>
 
+#include <openssl/evp.h>
+
 #include "dkim.h"
 #include "dkimbase.h"
 
diff --git a/src/include/global.h b/src/include/global.h
index a35999c..1b1ef16 100644
--- a/src/include/global.h
+++ b/src/include/global.h
@@ -1,7 +1,5 @@
 /* GLOBAL.H - RSAREF types and constants */
 
-#include <string.h>
-
 #include "uint_t.h"
 
 /* Copyright (C) RSA Laboratories, a division of RSA Data Security,
@@ -43,7 +41,7 @@ typedef unsigned long int UINT4;
 
   /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
    If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it
-     returns an empty list.  
+     returns an empty list.
  */
   #if PROTOTYPES
     #define PROTO_LIST(list) list
diff --git a/src/include/headerbody.h b/src/include/headerbody.h
index eec505f..9420164 100644
--- a/src/include/headerbody.h
+++ b/src/include/headerbody.h
@@ -4,6 +4,7 @@
 #include "buffer.h"
 #include "stralloc.h"
 
-extern int headerbody(buffer *b, void (*dohf)(stralloc *), void (*hdone)(void), void (*dobl)(stralloc *));
+extern int headerbody(
+    buffer *b, void (*dohf)(stralloc *), void (*hdone)(void), void (*dobl)(stralloc *));
 
 #endif
diff --git a/src/include/maildir.h b/src/include/maildir.h
index 9659989..359764d 100644
--- a/src/include/maildir.h
+++ b/src/include/maildir.h
@@ -1,7 +1,6 @@
 #ifndef MAILDIR_H
 #define MAILDIR_H
 
-#include "logmsg.h"
 #include "stralloc.h"
 
 #include "prioq.h"
diff --git a/src/include/sha256.h b/src/include/sha256.h
index 80ee0ab..d53600c 100644
--- a/src/include/sha256.h
+++ b/src/include/sha256.h
@@ -11,10 +11,10 @@ typedef struct {
   uint32_t state[8];
 } sha256_ctx;
 
-static void sha256_init(sha256_ctx *ctx);
-static void sha256_transform(sha256_ctx *ctx, uint8_t *data);
-static void sha256_update(sha256_ctx *ctx, uint8_t *data, uint32_t len);
-static void sha256_final(uint8_t *hash, sha256_ctx *ctx);
+extern void sha256_init(sha256_ctx *ctx);
+extern void sha256_transform(sha256_ctx *ctx, uint8_t *data);
+extern void sha256_update(sha256_ctx *ctx, uint8_t *data, uint32_t len);
+extern void sha256_final(uint8_t *hash, sha256_ctx *ctx);
 extern void sha256_hash(char *hash, const char *data, size_t len);
 
 #endif
diff --git a/src/include/spf.h b/src/include/spf.h
index 0b8b0fc..a7441dd 100644
--- a/src/include/spf.h
+++ b/src/include/spf.h
@@ -3,8 +3,6 @@
 
 #include "stralloc.h"
 
-#include "ipalloc.h"
-
 /* (Internal) Processing codes */
 
 #define SPF_INIT    -1