diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc b/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
index 348a0c19f..4acb09ae1 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/test/isac_speed_test.cc
@@ -12,6 +12,7 @@
 #include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h"
 #include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
 
+using ::std::string;
 using ::std::tr1::make_tuple;
 using ::testing::ValuesIn;
 
diff --git a/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc b/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
index 401474ef5..16099c6d9 100644
--- a/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/opus_speed_test.cc
@@ -11,6 +11,7 @@
 #include "webrtc/modules/audio_coding/codecs/opus/interface/opus_interface.h"
 #include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
 
+using ::std::string;
 using ::std::tr1::make_tuple;
 using ::testing::ValuesIn;
 
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
index 2563c412e..c7cafdff9 100644
--- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
+++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc
@@ -117,8 +117,8 @@ void AudioCodecSpeedTest::EncodeDecode(size_t audio_duration_sec) {
   }
 
   printf("Encoding: %.2f%% real time,\nDecoding: %.2f%% real time.\n",
-         encoding_time_ms_ / audio_duration_sec / 10.0,
-         decoding_time_ms_ / audio_duration_sec / 10.0);
+         (encoding_time_ms_ / audio_duration_sec) / 10.0,
+         (decoding_time_ms_ / audio_duration_sec) / 10.0);
 }
 
 }  // namespace webrtc
diff --git a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
index b385aa29a..2c9b45e4f 100644
--- a/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
+++ b/webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
@@ -16,17 +16,13 @@
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/typedefs.h"
 
-using ::std::string;
-using ::std::tr1::tuple;
-using ::testing::TestWithParam;
-
 namespace webrtc {
 
 // Define coding parameter as
 // <channels, bit_rate, file_name, extension, if_save_output>.
-typedef tuple<int, int, string, string, bool> coding_param;
+typedef std::tr1::tuple<int, int, std::string, std::string, bool> coding_param;
 
-class AudioCodecSpeedTest : public TestWithParam<coding_param> {
+class AudioCodecSpeedTest : public testing::TestWithParam<coding_param> {
  protected:
   AudioCodecSpeedTest(int block_duration_ms,
                       int input_sampling_khz,
@@ -83,7 +79,7 @@ class AudioCodecSpeedTest : public TestWithParam<coding_param> {
   // Bit rate is in bit-per-second.
   int bit_rate_;
 
-  string in_filename_;
+  std::string in_filename_;
 
   // Determines whether to save the output to file.
   bool save_out_data_;