Revert "Some cleanups to recovery."

This reverts commit c0319b60f56d445c2d1c74f551e01f069b028fe6.

Reason for revert: Broke builds.

Change-Id: I82aa880b83de5ae6c36fd7567cb001920559a972
diff --git a/roots.h b/roots.h
index 542f03b..a14b7d9 100644
--- a/roots.h
+++ b/roots.h
@@ -17,7 +17,7 @@
 #ifndef RECOVERY_ROOTS_H_
 #define RECOVERY_ROOTS_H_
 
-typedef struct fstab_rec Volume;
+#include "common.h"
 
 // Load and parse volume data from /etc/recovery.fstab.
 void load_volume_table();