diff --git a/buffet/commands/command_definition.h b/buffet/commands/command_definition.h
index 36ba554..f02cf48 100644
--- a/buffet/commands/command_definition.h
+++ b/buffet/commands/command_definition.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 
 #include "buffet/commands/object_schema.h"
 
diff --git a/buffet/commands/command_dictionary.h b/buffet/commands/command_dictionary.h
index 8356bcb..bd60986 100644
--- a/buffet/commands/command_dictionary.h
+++ b/buffet/commands/command_dictionary.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/errors/error.h>
 
 namespace base {
diff --git a/buffet/commands/command_instance.h b/buffet/commands/command_instance.h
index 4b71149..f8bde2a 100644
--- a/buffet/commands/command_instance.h
+++ b/buffet/commands/command_instance.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/errors/error.h>
 
 #include "buffet/commands/prop_values.h"
diff --git a/buffet/commands/command_queue.h b/buffet/commands/command_queue.h
index 4e2706b..6d81b34 100644
--- a/buffet/commands/command_queue.h
+++ b/buffet/commands/command_queue.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 
 #include "buffet/commands/command_instance.h"
 
diff --git a/buffet/commands/dbus_command_proxy.h b/buffet/commands/dbus_command_proxy.h
index 1221099..eb37d32 100644
--- a/buffet/commands/dbus_command_proxy.h
+++ b/buffet/commands/dbus_command_proxy.h
@@ -8,7 +8,7 @@
 #include <memory>
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <chromeos/dbus/data_serialization.h>
 #include <chromeos/dbus/dbus_object.h>
 
diff --git a/buffet/commands/prop_constraints.h b/buffet/commands/prop_constraints.h
index fabf815..4054f30 100644
--- a/buffet/commands/prop_constraints.h
+++ b/buffet/commands/prop_constraints.h
@@ -9,7 +9,7 @@
 #include <type_traits>
 #include <vector>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <base/values.h>
 #include <chromeos/errors/error.h>
 #include <chromeos/strings/string_utils.h>
diff --git a/buffet/device_registration_info.h b/buffet/device_registration_info.h
index 3e6f4c6..ec2f00b 100644
--- a/buffet/device_registration_info.h
+++ b/buffet/device_registration_info.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <utility>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <base/time/time.h>
 #include <chromeos/data_encoding.h>
 #include <chromeos/errors/error.h>
diff --git a/buffet/manager.h b/buffet/manager.h
index 42401b9..35a5534 100644
--- a/buffet/manager.h
+++ b/buffet/manager.h
@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-#include <base/basictypes.h>
+#include <base/macros.h>
 #include <base/memory/weak_ptr.h>
 #include <base/values.h>
 #include <chromeos/dbus/dbus_object.h>
diff --git a/buffet/storage_impls.h b/buffet/storage_impls.h
index 156f946..84110c7 100644
--- a/buffet/storage_impls.h
+++ b/buffet/storage_impls.h
@@ -5,8 +5,8 @@
 #ifndef BUFFET_STORAGE_IMPLS_H_
 #define BUFFET_STORAGE_IMPLS_H_
 
-#include <base/basictypes.h>
 #include <base/file_util.h>
+#include <base/macros.h>
 #include <base/values.h>
 
 #include "buffet/storage_interface.h"