combined patch for:

http://codereview.chromium.org/1574005
http://codereview.chromium.org/1604001

Review URL: http://codereview.chromium.org/1585007
diff --git a/utils/kernel_utility.cc b/utils/kernel_utility.cc
index 9a4f34b..9fedeb5 100644
--- a/utils/kernel_utility.cc
+++ b/utils/kernel_utility.cc
@@ -17,11 +17,9 @@
 #include <iostream>
 
 extern "C" {
+#include "cryptolib.h"
 #include "file_keys.h"
 #include "kernel_image.h"
-#include "padding.h"
-#include "rsa_utility.h"
-#include "sha_utility.h"
 #include "utility.h"
 }