diff --git a/webrtc/base/common.h b/webrtc/base/common.h
index 1b1dac64b0..fe98ef5d6c 100644
--- a/webrtc/base/common.h
+++ b/webrtc/base/common.h
@@ -11,7 +11,6 @@
 #ifndef WEBRTC_BASE_COMMON_H_  // NOLINT
 #define WEBRTC_BASE_COMMON_H_
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
 
 #if defined(_MSC_VER)
diff --git a/webrtc/base/event.h b/webrtc/base/event.h
index 523715194a..7686d30af2 100644
--- a/webrtc/base/event.h
+++ b/webrtc/base/event.h
@@ -19,8 +19,6 @@
 #error "Must define either WEBRTC_WIN or WEBRTC_POSIX."
 #endif
 
-#include "webrtc/base/basictypes.h"
-
 namespace rtc {
 
 class Event {
diff --git a/webrtc/base/taskparent.h b/webrtc/base/taskparent.h
index 3c0b81cf6a..1d39bae4fa 100644
--- a/webrtc/base/taskparent.h
+++ b/webrtc/base/taskparent.h
@@ -14,7 +14,6 @@
 #include <memory>
 #include <set>
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/base/constructormagic.h"
 
 namespace rtc {
diff --git a/webrtc/libjingle/xmpp/jid.h b/webrtc/libjingle/xmpp/jid.h
index 94ad7c8338..83e27cc6df 100644
--- a/webrtc/libjingle/xmpp/jid.h
+++ b/webrtc/libjingle/xmpp/jid.h
@@ -13,7 +13,6 @@
 
 #include <string>
 #include "webrtc/libjingle/xmllite/xmlconstants.h"
-#include "webrtc/base/basictypes.h"
 
 namespace buzz {
 
diff --git a/webrtc/pc/rtcpmuxfilter.h b/webrtc/pc/rtcpmuxfilter.h
index 91e790d684..bdd8a3537f 100644
--- a/webrtc/pc/rtcpmuxfilter.h
+++ b/webrtc/pc/rtcpmuxfilter.h
@@ -11,7 +11,6 @@
 #ifndef WEBRTC_PC_RTCPMUXFILTER_H_
 #define WEBRTC_PC_RTCPMUXFILTER_H_
 
-#include "webrtc/base/basictypes.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 
 namespace cricket {
diff --git a/webrtc/typedefs.h b/webrtc/typedefs.h
index 98b32f7720..65aa1aded5 100644
--- a/webrtc/typedefs.h
+++ b/webrtc/typedefs.h
@@ -61,7 +61,6 @@
 #define WEBRTC_CPU_DETECTION
 #endif
 
-// TODO(pbos): Use webrtc/base/basictypes.h instead to include fixed-size ints.
 #include <stdint.h>
 
 // Annotate a function indicating the caller must examine the return value.