diff --git a/metrics/metrics_library.h b/metrics/metrics_library.h
index 97b2b72..38ab47f 100644
--- a/metrics/metrics_library.h
+++ b/metrics/metrics_library.h
@@ -9,8 +9,8 @@
 #include <string>
 #include <unistd.h>
 
-#include <base/basictypes.h>
 #include <base/compiler_specific.h>
+#include <base/macros.h>
 #include <base/memory/scoped_ptr.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
 
diff --git a/metrics/timer.h b/metrics/timer.h
index 654c2cb..52cc578 100644
--- a/metrics/timer.h
+++ b/metrics/timer.h
@@ -9,6 +9,7 @@
 
 #include <string>
 
+#include <base/macros.h>
 #include <base/memory/scoped_ptr.h>
 #include <base/time/time.h>
 #include <gtest/gtest_prod.h>  // for FRIEND_TEST
diff --git a/metrics/timer_mock.h b/metrics/timer_mock.h
index 6eef761..2f2d0f4 100644
--- a/metrics/timer_mock.h
+++ b/metrics/timer_mock.h
@@ -5,10 +5,8 @@
 #ifndef METRICS_TIMER_MOCK_H_
 #define METRICS_TIMER_MOCK_H_
 
-
 #include <string>
 
-#include <base/basictypes.h>
 #include <gmock/gmock.h>
 
 #include "metrics/timer.h"
diff --git a/metrics/uploader/metrics_log.h b/metrics/uploader/metrics_log.h
index bd1958c..37a82bd 100644
--- a/metrics/uploader/metrics_log.h
+++ b/metrics/uploader/metrics_log.h
@@ -7,6 +7,8 @@
 
 #include <string>
 
+#include <base/macros.h>
+
 #include "components/metrics/metrics_log_base.h"
 
 // This file defines a set of user experience metrics data recorded by