diff --git a/webrtc/api/jsepsessiondescription_unittest.cc b/webrtc/api/jsepsessiondescription_unittest.cc
index 7e505a122c..7868beaad3 100644
--- a/webrtc/api/jsepsessiondescription_unittest.cc
+++ b/webrtc/api/jsepsessiondescription_unittest.cc
@@ -18,7 +18,7 @@
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/pc/mediasession.h"
 
diff --git a/webrtc/api/peerconnection_unittest.cc b/webrtc/api/peerconnection_unittest.cc
index 2b4e3e3e3b..a43d075d57 100644
--- a/webrtc/api/peerconnection_unittest.cc
+++ b/webrtc/api/peerconnection_unittest.cc
@@ -38,7 +38,7 @@
 #include "webrtc/base/thread.h"
 #include "webrtc/base/virtualsocketserver.h"
 #include "webrtc/media/engine/fakewebrtcvideoengine.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/client/fakeportallocator.h"
 #include "webrtc/pc/mediasession.h"
diff --git a/webrtc/api/webrtcsdp.cc b/webrtc/api/webrtcsdp.cc
index eb7a66a823..2ee0747627 100644
--- a/webrtc/api/webrtcsdp.cc
+++ b/webrtc/api/webrtcsdp.cc
@@ -25,12 +25,12 @@
 #include "webrtc/base/messagedigest.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/cryptoparams.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/media/sctp/sctpdataengine.h"
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/pc/mediasession.h"
 
diff --git a/webrtc/api/webrtcsdp_unittest.cc b/webrtc/api/webrtcsdp_unittest.cc
index f68010902b..39b7cdd3db 100644
--- a/webrtc/api/webrtcsdp_unittest.cc
+++ b/webrtc/api/webrtcsdp_unittest.cc
@@ -24,8 +24,8 @@
 #include "webrtc/base/sslfingerprint.h"
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/media/base/constants.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/pc/mediasession.h"
 
 using cricket::AudioCodec;
diff --git a/webrtc/api/webrtcsession.cc b/webrtc/api/webrtcsession.cc
index 455be0f808..9b37811368 100644
--- a/webrtc/api/webrtcsession.cc
+++ b/webrtc/api/webrtcsession.cc
@@ -31,7 +31,7 @@
 #include "webrtc/base/stringencode.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/call.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/videocapturer.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/transportchannel.h"
diff --git a/webrtc/media/base/codec.h b/webrtc/media/base/codec.h
index f072be1392..7476c02694 100644
--- a/webrtc/media/base/codec.h
+++ b/webrtc/media/base/codec.h
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 
 namespace cricket {
 
diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
index 8b848d1a33..bab72b2192 100644
--- a/webrtc/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -24,7 +24,7 @@
 #include "webrtc/base/socket.h"
 #include "webrtc/base/window.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/base/videosinkinterface.h"
 // TODO(juberti): re-evaluate this include
diff --git a/webrtc/media/base/constants.cc b/webrtc/media/base/mediaconstants.cc
similarity index 99%
rename from webrtc/media/base/constants.cc
rename to webrtc/media/base/mediaconstants.cc
index 3443a9db3f..2190a54d10 100644
--- a/webrtc/media/base/constants.cc
+++ b/webrtc/media/base/mediaconstants.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 
 #include <string>
 
diff --git a/webrtc/media/base/constants.h b/webrtc/media/base/mediaconstants.h
similarity index 97%
rename from webrtc/media/base/constants.h
rename to webrtc/media/base/mediaconstants.h
index e55b2d097c..94225def4b 100644
--- a/webrtc/media/base/constants.h
+++ b/webrtc/media/base/mediaconstants.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MEDIA_BASE_CONSTANTS_H_
-#define WEBRTC_MEDIA_BASE_CONSTANTS_H_
+#ifndef WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_
+#define WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_
 
 #include <string>
 
@@ -164,4 +164,4 @@ extern const int kDefaultVideoMaxHeight;
 extern const int kDefaultVideoMaxFramerate;
 }  // namespace cricket
 
-#endif  // WEBRTC_MEDIA_BASE_CONSTANTS_H_
+#endif  // WEBRTC_MEDIA_BASE_MEDIACONSTANTS_H_
diff --git a/webrtc/media/base/rtpdataengine.cc b/webrtc/media/base/rtpdataengine.cc
index a3fd030570..705ccbdaff 100644
--- a/webrtc/media/base/rtpdataengine.cc
+++ b/webrtc/media/base/rtpdataengine.cc
@@ -16,7 +16,7 @@
 #include "webrtc/base/ratelimiter.h"
 #include "webrtc/base/timing.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/media/base/streamparams.h"
 
diff --git a/webrtc/media/base/rtpdataengine.h b/webrtc/media/base/rtpdataengine.h
index 8636435f65..62eebf63c1 100644
--- a/webrtc/media/base/rtpdataengine.h
+++ b/webrtc/media/base/rtpdataengine.h
@@ -16,8 +16,8 @@
 #include <vector>
 
 #include "webrtc/base/timing.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/mediaengine.h"
 
 namespace cricket {
diff --git a/webrtc/media/base/rtpdataengine_unittest.cc b/webrtc/media/base/rtpdataengine_unittest.cc
index 2362de3b5d..2a9b25e277 100644
--- a/webrtc/media/base/rtpdataengine_unittest.cc
+++ b/webrtc/media/base/rtpdataengine_unittest.cc
@@ -16,8 +16,8 @@
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/timing.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtpdataengine.h"
 #include "webrtc/media/base/rtputils.h"
 
diff --git a/webrtc/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc
index 9a9666657c..e3ddc92241 100644
--- a/webrtc/media/base/videoadapter.cc
+++ b/webrtc/media/base/videoadapter.cc
@@ -15,7 +15,7 @@
 
 #include "webrtc/base/logging.h"
 #include "webrtc/base/timeutils.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/videocommon.h"
 #include "webrtc/media/base/videoframe.h"
 
diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc
index 2cd19e7435..c50ff1159c 100644
--- a/webrtc/media/engine/webrtcvoiceengine.cc
+++ b/webrtc/media/engine/webrtcvoiceengine.cc
@@ -34,7 +34,7 @@
 #include "webrtc/common.h"
 #include "webrtc/media/base/audioframe.h"
 #include "webrtc/media/base/audiorenderer.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/media/engine/webrtcmediaengine.h"
 #include "webrtc/media/engine/webrtcvoe.h"
diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
index 1e23d381cd..768673d73d 100644
--- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc
+++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
@@ -17,10 +17,10 @@
 #include "webrtc/call.h"
 #include "webrtc/p2p/base/faketransportcontroller.h"
 #include "webrtc/test/field_trial.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/fakemediaengine.h"
 #include "webrtc/media/base/fakenetworkinterface.h"
 #include "webrtc/media/base/fakertp.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/engine/fakewebrtccall.h"
 #include "webrtc/media/engine/fakewebrtcvoiceengine.h"
 #include "webrtc/media/engine/webrtcvoiceengine.h"
diff --git a/webrtc/media/media.gyp b/webrtc/media/media.gyp
index 2a5295734a..53716bd8f9 100644
--- a/webrtc/media/media.gyp
+++ b/webrtc/media/media.gyp
@@ -37,8 +37,6 @@
         'base/capturemanager.h',
         'base/codec.cc',
         'base/codec.h',
-        'base/constants.cc',
-        'base/constants.h',
         'base/cpuid.cc',
         'base/cpuid.h',
         'base/cryptoparams.h',
@@ -47,6 +45,8 @@
         'base/hybriddataengine.h',
         'base/mediachannel.h',
         'base/mediacommon.h',
+        'base/mediaconstants.cc',
+        'base/mediaconstants.h',
         'base/mediaengine.cc',
         'base/mediaengine.h',
         'base/rtpdataengine.cc',
diff --git a/webrtc/media/sctp/sctpdataengine.cc b/webrtc/media/sctp/sctpdataengine.cc
index 27cd54d59c..ce0f91ae39 100644
--- a/webrtc/media/sctp/sctpdataengine.cc
+++ b/webrtc/media/sctp/sctpdataengine.cc
@@ -24,7 +24,7 @@
 #include "webrtc/base/logging.h"
 #include "webrtc/base/safe_conversions.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/streamparams.h"
 
 namespace {
diff --git a/webrtc/media/sctp/sctpdataengine_unittest.cc b/webrtc/media/sctp/sctpdataengine_unittest.cc
index 3fb31665bf..893d717db7 100644
--- a/webrtc/media/sctp/sctpdataengine_unittest.cc
+++ b/webrtc/media/sctp/sctpdataengine_unittest.cc
@@ -25,8 +25,8 @@
 #include "webrtc/base/messagequeue.h"
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/base/thread.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/sctp/sctpdataengine.h"
 
 enum {
diff --git a/webrtc/p2p/base/candidate.h b/webrtc/p2p/base/candidate.h
index ddfeef0323..afea2a21c7 100644
--- a/webrtc/p2p/base/candidate.h
+++ b/webrtc/p2p/base/candidate.h
@@ -19,7 +19,7 @@
 #include <sstream>
 #include <string>
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/helpers.h"
 #include "webrtc/base/network.h"
diff --git a/webrtc/p2p/base/constants.cc b/webrtc/p2p/base/p2pconstants.cc
similarity index 92%
rename from webrtc/p2p/base/constants.cc
rename to webrtc/p2p/base/p2pconstants.cc
index 2a258718f4..fd75984a08 100644
--- a/webrtc/p2p/base/constants.cc
+++ b/webrtc/p2p/base/p2pconstants.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 
 #include <string>
 
@@ -32,8 +32,8 @@ const size_t ICE_PWD_MIN_LENGTH = 22;
 const size_t ICE_UFRAG_MAX_LENGTH = 255;
 const size_t ICE_PWD_MAX_LENGTH = 256;
 
-// TODO: This is media-specific, so might belong
-// somewhere like media/base/constants.h
+// This is media-specific, so might belong
+// somewhere like media/base/mediaconstants.h
 const int ICE_CANDIDATE_COMPONENT_RTP = 1;
 const int ICE_CANDIDATE_COMPONENT_RTCP = 2;
 const int ICE_CANDIDATE_COMPONENT_DEFAULT = 1;
diff --git a/webrtc/p2p/base/constants.h b/webrtc/p2p/base/p2pconstants.h
similarity index 93%
rename from webrtc/p2p/base/constants.h
rename to webrtc/p2p/base/p2pconstants.h
index c3e1b781dc..a36cd889d0 100644
--- a/webrtc/p2p/base/constants.h
+++ b/webrtc/p2p/base/p2pconstants.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_P2P_BASE_CONSTANTS_H_
-#define WEBRTC_P2P_BASE_CONSTANTS_H_
+#ifndef WEBRTC_P2P_BASE_P2PCONSTANTS_H_
+#define WEBRTC_P2P_BASE_P2PCONSTANTS_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@ extern const char CONNECTIONROLE_HOLDCONN_STR[];
 
 }  // namespace cricket
 
-#endif  // WEBRTC_P2P_BASE_CONSTANTS_H_
+#endif  // WEBRTC_P2P_BASE_P2PCONSTANTS_H_
diff --git a/webrtc/p2p/base/transport.cc b/webrtc/p2p/base/transport.cc
index 673ce7fa0b..17d05adc23 100644
--- a/webrtc/p2p/base/transport.cc
+++ b/webrtc/p2p/base/transport.cc
@@ -13,7 +13,7 @@
 #include "webrtc/p2p/base/transport.h"
 
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/port.h"
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/bind.h"
diff --git a/webrtc/p2p/base/transport.h b/webrtc/p2p/base/transport.h
index 6b4b37d4c5..2a0423c059 100644
--- a/webrtc/p2p/base/transport.h
+++ b/webrtc/p2p/base/transport.h
@@ -29,7 +29,7 @@
 #include <string>
 #include <vector>
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
 #include "webrtc/base/messagequeue.h"
diff --git a/webrtc/p2p/base/transportdescription.cc b/webrtc/p2p/base/transportdescription.cc
index b8f14eaa98..4d61edd5c6 100644
--- a/webrtc/p2p/base/transportdescription.cc
+++ b/webrtc/p2p/base/transportdescription.cc
@@ -12,7 +12,7 @@
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 
 namespace cricket {
 
diff --git a/webrtc/p2p/base/transportdescription.h b/webrtc/p2p/base/transportdescription.h
index 79fecc7970..003780b767 100644
--- a/webrtc/p2p/base/transportdescription.h
+++ b/webrtc/p2p/base/transportdescription.h
@@ -15,7 +15,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/sslfingerprint.h"
 
diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
index a52d9ed95a..765c607a6d 100644
--- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
@@ -11,7 +11,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/p2p/base/transportdescriptionfactory.h"
 #include "webrtc/base/fakesslidentity.h"
diff --git a/webrtc/p2p/base/transportinfo.h b/webrtc/p2p/base/transportinfo.h
index 3fbf204d98..504eb23b2a 100644
--- a/webrtc/p2p/base/transportinfo.h
+++ b/webrtc/p2p/base/transportinfo.h
@@ -15,7 +15,7 @@
 #include <vector>
 
 #include "webrtc/p2p/base/candidate.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/base/helpers.h"
 
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index 7649b5a0d1..9455d176be 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -12,7 +12,7 @@
 #endif
 
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/tcpport.h"
 #include "webrtc/p2p/base/testturnserver.h"
diff --git a/webrtc/p2p/client/portallocator_unittest.cc b/webrtc/p2p/client/portallocator_unittest.cc
index 5fce3b5762..a76900ab6a 100644
--- a/webrtc/p2p/client/portallocator_unittest.cc
+++ b/webrtc/p2p/client/portallocator_unittest.cc
@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/p2p/base/basicpacketsocketfactory.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/p2ptransportchannel.h"
 #include "webrtc/p2p/base/testrelayserver.h"
 #include "webrtc/p2p/base/teststunserver.h"
diff --git a/webrtc/p2p/p2p.gyp b/webrtc/p2p/p2p.gyp
index 10a439b4bd..4bce605dee 100644
--- a/webrtc/p2p/p2p.gyp
+++ b/webrtc/p2p/p2p.gyp
@@ -26,10 +26,10 @@
         'base/basicpacketsocketfactory.h',
         'base/candidate.h',
         'base/common.h',
-        'base/constants.cc',
-        'base/constants.h',
         'base/dtlstransportchannel.cc',
         'base/dtlstransportchannel.h',
+        'base/p2pconstants.cc',
+        'base/p2pconstants.h',
         'base/p2ptransport.cc',
         'base/p2ptransport.h',
         'base/p2ptransportchannel.cc',
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index 6c9d722228..1d5d159d05 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -20,7 +20,7 @@
 #include "webrtc/base/dscp.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
-#include "webrtc/media/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/rtputils.h"
 #include "webrtc/p2p/base/transportchannel.h"
 #include "webrtc/pc/channelmanager.h"
diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc
index 9ec9169779..f3c4a3c912 100644
--- a/webrtc/pc/mediasession.cc
+++ b/webrtc/pc/mediasession.cc
@@ -19,9 +19,9 @@
 #include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/stringutils.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/cryptoparams.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/media/base/mediaconstants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/pc/channelmanager.h"
 #include "webrtc/pc/srtpfilter.h"
 
diff --git a/webrtc/pc/mediasession.h b/webrtc/pc/mediasession.h
index 60ded556ae..78ae67bac3 100644
--- a/webrtc/pc/mediasession.h
+++ b/webrtc/pc/mediasession.h
@@ -20,9 +20,9 @@
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/media/base/codec.h"
-#include "webrtc/media/base/constants.h"
 #include "webrtc/media/base/cryptoparams.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/mediaengine.h"  // For DataChannelType
 #include "webrtc/media/base/streamparams.h"
 #include "webrtc/p2p/base/sessiondescription.h"
diff --git a/webrtc/pc/mediasession_unittest.cc b/webrtc/pc/mediasession_unittest.cc
index 34caa998f7..6887194b58 100644
--- a/webrtc/pc/mediasession_unittest.cc
+++ b/webrtc/pc/mediasession_unittest.cc
@@ -17,7 +17,7 @@
 #include "webrtc/base/ssladapter.h"
 #include "webrtc/media/base/codec.h"
 #include "webrtc/media/base/testutils.h"
-#include "webrtc/p2p/base/constants.h"
+#include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/transportdescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
 #include "webrtc/pc/mediasession.h"