Revert "Some cleanups to recovery."

This reverts commit c0319b60f56d445c2d1c74f551e01f069b028fe6.

Reason for revert: Broke builds.

Change-Id: I82aa880b83de5ae6c36fd7567cb001920559a972
diff --git a/verifier.cpp b/verifier.cpp
index 44098f7..82cdd3b 100644
--- a/verifier.cpp
+++ b/verifier.cpp
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-#include "verifier.h"
-
 #include <errno.h>
+#include <malloc.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
@@ -33,6 +31,9 @@
 #include "common.h"
 #include "print_sha1.h"
 #include "ui.h"
+#include "verifier.h"
+
+extern RecoveryUI* ui;
 
 static constexpr size_t MiB = 1024 * 1024;