diff --git a/update_manager/boxed_value.cc b/update_manager/boxed_value.cc
index 8200879..56b42b8 100644
--- a/update_manager/boxed_value.cc
+++ b/update_manager/boxed_value.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include <set>
 #include <string>
 
@@ -49,7 +51,7 @@
 string BoxedValue::ValuePrinter<uint64_t>(const void *value) {
   const uint64_t* val =
     reinterpret_cast<const uint64_t*>(value);
-  return base::Uint64ToString(static_cast<uint64>(*val));
+  return base::Uint64ToString(static_cast<uint64_t>(*val));
 }
 
 template<>
diff --git a/update_manager/real_device_policy_provider.cc b/update_manager/real_device_policy_provider.cc
index e26ffe0..ca1f6ca 100644
--- a/update_manager/real_device_policy_provider.cc
+++ b/update_manager/real_device_policy_provider.cc
@@ -4,6 +4,8 @@
 
 #include "update_engine/update_manager/real_device_policy_provider.h"
 
+#include <stdint.h>
+
 #include <base/logging.h>
 #include <base/time/time.h>
 #include <policy/device_policy.h>
@@ -94,7 +96,7 @@
 
 bool RealDevicePolicyProvider::ConvertScatterFactor(
     base::TimeDelta* scatter_factor) const {
-  int64 scatter_factor_in_seconds;
+  int64_t scatter_factor_in_seconds;
   if (!policy_provider_->GetDevicePolicy().GetScatterFactorInSeconds(
       &scatter_factor_in_seconds)) {
     return false;