diff --git a/webrtc/api/jsep.h b/webrtc/api/jsep.h
index e11a2ade9a..37aed46b5b 100644
--- a/webrtc/api/jsep.h
+++ b/webrtc/api/jsep.h
@@ -13,10 +13,11 @@
 #ifndef WEBRTC_API_JSEP_H_
 #define WEBRTC_API_JSEP_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/refcount.h"
 
 namespace cricket {
diff --git a/webrtc/api/mediastreaminterface.h b/webrtc/api/mediastreaminterface.h
index eb51633e2b..d7493a7d29 100644
--- a/webrtc/api/mediastreaminterface.h
+++ b/webrtc/api/mediastreaminterface.h
@@ -17,10 +17,11 @@
 #ifndef WEBRTC_API_MEDIASTREAMINTERFACE_H_
 #define WEBRTC_API_MEDIASTREAMINTERFACE_H_
 
+#include <stddef.h>
+
 #include <string>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/optional.h"
diff --git a/webrtc/base/ratelimiter.h b/webrtc/base/ratelimiter.h
index cf5d6b05b5..1423e991bc 100644
--- a/webrtc/base/ratelimiter.h
+++ b/webrtc/base/ratelimiter.h
@@ -11,8 +11,7 @@
 #ifndef WEBRTC_BASE_RATELIMITER_H_
 #define WEBRTC_BASE_RATELIMITER_H_
 
-#include <stdlib.h>
-#include "webrtc/base/basictypes.h"
+#include <stddef.h>
 
 namespace rtc {
 
diff --git a/webrtc/base/scopedptrcollection.h b/webrtc/base/scopedptrcollection.h
index cfdb6f9673..a4be035695 100644
--- a/webrtc/base/scopedptrcollection.h
+++ b/webrtc/base/scopedptrcollection.h
@@ -14,10 +14,11 @@
 #ifndef WEBRTC_BASE_SCOPEDPTRCOLLECTION_H_
 #define WEBRTC_BASE_SCOPEDPTRCOLLECTION_H_
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
 
 namespace rtc {
diff --git a/webrtc/base/stream.h b/webrtc/base/stream.h
index bc949065c8..33090dfb1e 100644
--- a/webrtc/base/stream.h
+++ b/webrtc/base/stream.h
@@ -11,10 +11,10 @@
 #ifndef WEBRTC_BASE_STREAM_H_
 #define WEBRTC_BASE_STREAM_H_
 
-#include <memory>
 #include <stdio.h>
 
-#include "webrtc/base/basictypes.h"
+#include <memory>
+
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
diff --git a/webrtc/base/stringencode.cc b/webrtc/base/stringencode.cc
index 01b41a633a..ab04d02856 100644
--- a/webrtc/base/stringencode.cc
+++ b/webrtc/base/stringencode.cc
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/stringutils.h"
 
diff --git a/webrtc/base/stringutils.h b/webrtc/base/stringutils.h
index 5a6f42a063..de256581d7 100644
--- a/webrtc/base/stringutils.h
+++ b/webrtc/base/stringutils.h
@@ -32,8 +32,6 @@
 
 #include <string>
 
-#include "webrtc/base/basictypes.h"
-
 ///////////////////////////////////////////////////////////////////////////////
 // Generic string/memory utilities
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/webrtc/media/engine/fakewebrtcvoiceengine.h b/webrtc/media/engine/fakewebrtcvoiceengine.h
index cd6c42064a..8a40ff90d0 100644
--- a/webrtc/media/engine/fakewebrtcvoiceengine.h
+++ b/webrtc/media/engine/fakewebrtcvoiceengine.h
@@ -11,11 +11,12 @@
 #ifndef WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
 #define WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
 
+#include <stddef.h>
+
 #include <list>
 #include <map>
 #include <vector>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/config.h"