diff --git a/firewall_service.h b/firewall_service.h
index 2cf5218..bcfb546 100644
--- a/firewall_service.h
+++ b/firewall_service.h
@@ -15,9 +15,12 @@
 #ifndef FIREWALLD_FIREWALL_SERVICE_H_
 #define FIREWALLD_FIREWALL_SERVICE_H_
 
+#if !defined(__ANDROID__)
+# include <memory>
+#endif  // !__ANDROID__
+
 #include <base/callback.h>
 #include <base/macros.h>
-#include <base/memory/scoped_ptr.h>
 #include <base/memory/weak_ptr.h>
 #include <brillo/dbus/dbus_object.h>
 
diff --git a/include/firewalld/firewall.h b/include/firewalld/firewall.h
index d61ac2b..04718fa 100644
--- a/include/firewalld/firewall.h
+++ b/include/firewalld/firewall.h
@@ -16,6 +16,8 @@
 #define FIREWALLD_BINDER_CLIENT_FIREWALL_H_
 
 #include <memory>
+#include <string>
+#include <vector>
 
 #include <binderwrapper/binder_wrapper.h>