Forwarded: not-needed
--- a/tools/aapt2/AppInfo.h
+++ b/tools/aapt2/AppInfo.h
@@ -21,6 +21,8 @@
 #include <set>
 #include <string>
 
+#include <stdint.h>
+
 namespace aapt {
 
 // Information relevant to building an app, parsed from the app's AndroidManifest.xml.
--- a/tools/aapt2/cmd/Command.h
+++ b/tools/aapt2/cmd/Command.h
@@ -18,6 +18,7 @@
 #define AAPT_COMMAND_H
 
 #include <functional>
+#include <memory>
 #include <optional>
 #include <ostream>
 #include <string>