diff --git a/keystore/include/keystore/ExportResult.h b/keystore/include/keystore/ExportResult.h
index c85f5ab..b548942 100644
--- a/keystore/include/keystore/ExportResult.h
+++ b/keystore/include/keystore/ExportResult.h
@@ -15,16 +15,9 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_EXPORTRESULT_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_EXPORTRESULT_H_
 
-#include <stdint.h>
-
-#include <memory>
-#include <vector>
-
 #include <binder/Parcelable.h>
-#include <hardware/keymaster_defs.h>
 
 #include "keystore_return_types.h"
-#include "utils.h"
 
 namespace android {
 namespace security {
diff --git a/keystore/include/keystore/KeyAttestationApplicationId.h b/keystore/include/keystore/KeyAttestationApplicationId.h
index 550a7e1..c612929 100644
--- a/keystore/include/keystore/KeyAttestationApplicationId.h
+++ b/keystore/include/keystore/KeyAttestationApplicationId.h
@@ -15,11 +15,11 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_KEYATTESTATIONAPPLICATIONID_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYATTESTATIONAPPLICATIONID_H_
 
-#include "utils.h"
-#include <binder/Parcelable.h>
 #include <memory>
 #include <vector>
 
+#include <binder/Parcelable.h>
+
 #include "KeyAttestationPackageInfo.h"
 
 namespace android {
diff --git a/keystore/include/keystore/KeyAttestationPackageInfo.h b/keystore/include/keystore/KeyAttestationPackageInfo.h
index 5ca6c8c..efc33a6 100644
--- a/keystore/include/keystore/KeyAttestationPackageInfo.h
+++ b/keystore/include/keystore/KeyAttestationPackageInfo.h
@@ -15,12 +15,15 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_KEYATTESTATIONPACKAGEINFO_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYATTESTATIONPACKAGEINFO_H_
 
+#include <stdint.h>
+
+#include <memory>
+#include <vector>
+
+#include <binder/Parcelable.h>
+
 #include "Signature.h"
 #include "utils.h"
-#include <binder/Parcelable.h>
-#include <memory>
-#include <stdint.h>
-#include <vector>
 
 namespace android {
 namespace security {
diff --git a/keystore/include/keystore/KeyCharacteristics.h b/keystore/include/keystore/KeyCharacteristics.h
index c1bffb2..ddb1208 100644
--- a/keystore/include/keystore/KeyCharacteristics.h
+++ b/keystore/include/keystore/KeyCharacteristics.h
@@ -16,7 +16,6 @@
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYCHARACTERISTICS_H_
 
 #include <binder/Parcelable.h>
-#include <hardware/keymaster_defs.h>
 
 #include "KeymasterArguments.h"
 
diff --git a/keystore/include/keystore/KeymasterArguments.h b/keystore/include/keystore/KeymasterArguments.h
index 0e7e64d..3f35a91 100644
--- a/keystore/include/keystore/KeymasterArguments.h
+++ b/keystore/include/keystore/KeymasterArguments.h
@@ -15,9 +15,10 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_KEYMASTERARGUMENTS_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYMASTERARGUMENTS_H_
 
-#include "authorization_set.h"
 #include <binder/Parcelable.h>
 
+#include "keymaster_tags.h"
+
 namespace android {
 namespace security {
 namespace keymaster {
diff --git a/keystore/include/keystore/KeymasterBlob.h b/keystore/include/keystore/KeymasterBlob.h
index 47cb7ee..fc849bd 100644
--- a/keystore/include/keystore/KeymasterBlob.h
+++ b/keystore/include/keystore/KeymasterBlob.h
@@ -15,9 +15,7 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_KEYMASTERBLOB_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYMASTERBLOB_H_
 
-#include "authorization_set.h"
 #include <binder/Parcelable.h>
-#include <hardware/keymaster_defs.h>
 
 namespace android {
 namespace security {
diff --git a/keystore/include/keystore/KeymasterCertificateChain.h b/keystore/include/keystore/KeymasterCertificateChain.h
index 8c0a6fc..132862c 100644
--- a/keystore/include/keystore/KeymasterCertificateChain.h
+++ b/keystore/include/keystore/KeymasterCertificateChain.h
@@ -15,9 +15,7 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_KEYMASTERCERTIFICATECHAIN_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYMASTERCERTIFICATECHAIN_H_
 
-#include "authorization_set.h"
 #include <binder/Parcelable.h>
-#include <hardware/keymaster_defs.h>
 
 namespace android {
 namespace security {
diff --git a/keystore/include/keystore/KeystoreArg.h b/keystore/include/keystore/KeystoreArg.h
index 31496f0..a5e68f2 100644
--- a/keystore/include/keystore/KeystoreArg.h
+++ b/keystore/include/keystore/KeystoreArg.h
@@ -17,16 +17,8 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_KEYSTOREARG_H
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYSTOREARG_H
 
-#include <vector>
-
-#include <binder/IInterface.h>
-#include <binder/Parcel.h>
-#include <keystore/keymaster_tags.h>
 #include <utils/RefBase.h>
 
-#include "keystore.h"
-#include "keystore_return_types.h"
-
 namespace android {
 namespace security {
 
diff --git a/keystore/include/keystore/KeystoreArguments.h b/keystore/include/keystore/KeystoreArguments.h
index a54a6d2..8c2e336 100644
--- a/keystore/include/keystore/KeystoreArguments.h
+++ b/keystore/include/keystore/KeystoreArguments.h
@@ -15,10 +15,12 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_KEYSTOREARGUMENTS_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_KEYSTOREARGUMENTS_H_
 
-#include "KeystoreArg.h"
 #include <binder/Parcelable.h>
 #include <utils/RefBase.h>
 
+#include "KeystoreArg.h"
+#include "keystore_return_types.h"
+
 namespace android {
 namespace security {
 
diff --git a/keystore/include/keystore/OperationResult.h b/keystore/include/keystore/OperationResult.h
index ada88fe..6dd5aef 100644
--- a/keystore/include/keystore/OperationResult.h
+++ b/keystore/include/keystore/OperationResult.h
@@ -15,10 +15,11 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_OPERATIONRESULT_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_OPERATIONRESULT_H_
 
-#include "KeymasterArguments.h"
-#include "keystore_return_types.h"
-#include <binder/Parcelable.h>
 #include <binder/Parcel.h>
+#include <binder/Parcelable.h>
+
+#include "keymaster_tags.h"
+#include "keystore_return_types.h"
 
 namespace android {
 namespace security {
diff --git a/keystore/include/keystore/Signature.h b/keystore/include/keystore/Signature.h
index 59b77bf..3c996bb 100644
--- a/keystore/include/keystore/Signature.h
+++ b/keystore/include/keystore/Signature.h
@@ -15,10 +15,10 @@
 #ifndef KEYSTORE_INCLUDE_KEYSTORE_SIGNATURE_H_
 #define KEYSTORE_INCLUDE_KEYSTORE_SIGNATURE_H_
 
-#include <binder/Parcelable.h>
-#include <stdint.h>
 #include <vector>
 
+#include <binder/Parcelable.h>
+
 namespace android {
 namespace content {
 namespace pm {