From c7042472e8a38c1ac744aa1b65c2ca231e0547ad Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <d.kasatkin@samsung.com>
Date: Fri, 14 Feb 2014 19:16:19 +0200
Subject: [PATCH] Limit includes in imaevm.h

Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com>
---
 src/evmctl.c    | 10 ++++++++--
 src/imaevm.h    | 15 +--------------
 src/libimaevm.c | 12 ++++++++++++
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/evmctl.c b/src/evmctl.c
index 209f663..eb6bf19 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -27,22 +27,28 @@
  */
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/param.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
+#include <dirent.h>
 #include <attr/xattr.h>
 #include <getopt.h>
-#include <signal.h>
 #include <keyutils.h>
 #include <asm/byteorder.h>
 #include <ctype.h>
 
+#include <openssl/sha.h>
+#include <openssl/pem.h>
+#include <openssl/hmac.h>
+#include <openssl/err.h>
+#include <openssl/rsa.h>
+
 #define USE_FPRINTF
 
 #include "imaevm.h"
diff --git a/src/imaevm.h b/src/imaevm.h
index 4789e43..c565731 100644
--- a/src/imaevm.h
+++ b/src/imaevm.h
@@ -1,25 +1,12 @@
 #ifndef _LIBIMAEVM_H
 #define _LIBIMAEVM_H
 
-#include <sys/types.h>
 #include <stdint.h>
-#include <unistd.h>
 #include <syslog.h>
-
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <dirent.h>
-#include <string.h>
 #include <stdbool.h>
+#include <errno.h>
 
-#include <openssl/sha.h>
 #include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/hmac.h>
-#include <openssl/engine.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include <openssl/x509.h>
 
 #ifdef USE_FPRINTF
 #define do_log(level, fmt, args...)	({ if (level <= params.verbose) fprintf(stderr, fmt, ##args); })
diff --git a/src/libimaevm.c b/src/libimaevm.c
index 3d780c6..2e1ef2c 100644
--- a/src/libimaevm.c
+++ b/src/libimaevm.c
@@ -26,6 +26,18 @@
 /* should we use logger instead for library? */
 #define USE_FPRINTF
 
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <openssl/pem.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+
 #include "imaevm.h"
 
 const char *const pkey_hash_algo[PKEY_HASH__LAST] = {