Switch C++-style C headers with their C equivalents.
The C++ headers define the C functions within the std:: namespace, but
we mainly don't use the std:: namespace for C functions. Therefore we
should include the C headers.
BUG=1833
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1917004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4486 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/main/source/nack.cc b/webrtc/modules/audio_coding/main/source/nack.cc
index f42e4d4..ec6cb3d 100644
--- a/webrtc/modules/audio_coding/main/source/nack.cc
+++ b/webrtc/modules/audio_coding/main/source/nack.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/audio_coding/main/source/nack.h"
+#include <assert.h> // For assert.
+
#include <algorithm> // For std::max.
-#include <cassert> // For assert.
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/system_wrappers/interface/logging.h"
diff --git a/webrtc/modules/audio_coding/main/test/APITest.cc b/webrtc/modules/audio_coding/main/test/APITest.cc
index 8b09e12..90f88e3 100644
--- a/webrtc/modules/audio_coding/main/test/APITest.cc
+++ b/webrtc/modules/audio_coding/main/test/APITest.cc
@@ -10,11 +10,11 @@
#include "webrtc/modules/audio_coding/main/test/APITest.h"
+#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <cctype>
#include <iostream>
#include <ostream>
#include <string>
diff --git a/webrtc/modules/audio_coding/main/test/PCMFile.cc b/webrtc/modules/audio_coding/main/test/PCMFile.cc
index 5c4b98e..b7e65dd 100644
--- a/webrtc/modules/audio_coding/main/test/PCMFile.cc
+++ b/webrtc/modules/audio_coding/main/test/PCMFile.cc
@@ -10,7 +10,7 @@
#include "PCMFile.h"
-#include <cctype>
+#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/modules/audio_coding/main/test/PCMFile.h b/webrtc/modules/audio_coding/main/test/PCMFile.h
index e3fdcd8..e7387a6 100644
--- a/webrtc/modules/audio_coding/main/test/PCMFile.h
+++ b/webrtc/modules/audio_coding/main/test/PCMFile.h
@@ -11,8 +11,9 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_
#define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_PCMFILE_H_
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
+
#include <string>
#include "module_common_types.h"
diff --git a/webrtc/modules/audio_coding/main/test/TestFEC.cc b/webrtc/modules/audio_coding/main/test/TestFEC.cc
index 6cb4eff..66c9441 100644
--- a/webrtc/modules/audio_coding/main/test/TestFEC.cc
+++ b/webrtc/modules/audio_coding/main/test/TestFEC.cc
@@ -10,7 +10,8 @@
#include "TestFEC.h"
-#include <cassert>
+#include <assert.h>
+
#include <iostream>
#include "audio_coding_module_typedefs.h"
diff --git a/webrtc/modules/audio_coding/main/test/TestStereo.cc b/webrtc/modules/audio_coding/main/test/TestStereo.cc
index c5b8f40..741f00b 100644
--- a/webrtc/modules/audio_coding/main/test/TestStereo.cc
+++ b/webrtc/modules/audio_coding/main/test/TestStereo.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/audio_coding/main/test/TestStereo.h"
-#include <cassert>
+#include <assert.h>
+
#include <string>
#include "gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/main/test/TimedTrace.h b/webrtc/modules/audio_coding/main/test/TimedTrace.h
index 1c893fb..237b329 100644
--- a/webrtc/modules/audio_coding/main/test/TimedTrace.h
+++ b/webrtc/modules/audio_coding/main/test/TimedTrace.h
@@ -13,8 +13,8 @@
#include "typedefs.h"
-#include <cstdio>
-#include <cstdlib>
+#include <stdio.h>
+#include <stdlib.h>
class TimedTrace {
public:
diff --git a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
index 9c896f9..1bf8879 100644
--- a/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
+++ b/webrtc/modules/audio_coding/main/test/TwoWayCommunication.cc
@@ -10,7 +10,7 @@
#include "TwoWayCommunication.h"
-#include <cctype>
+#include <ctype.h>
#include <stdio.h>
#include <string.h>
diff --git a/webrtc/modules/audio_coding/main/test/delay_test.cc b/webrtc/modules/audio_coding/main/test/delay_test.cc
index bfe6128..d647b1f 100644
--- a/webrtc/modules/audio_coding/main/test/delay_test.cc
+++ b/webrtc/modules/audio_coding/main/test/delay_test.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include <assert.h>
#include <math.h>
-#include <cassert>
#include <iostream>
#include "gflags/gflags.h"
diff --git a/webrtc/modules/audio_coding/main/test/iSACTest.cc b/webrtc/modules/audio_coding/main/test/iSACTest.cc
index b2b0fca..64931d5 100644
--- a/webrtc/modules/audio_coding/main/test/iSACTest.cc
+++ b/webrtc/modules/audio_coding/main/test/iSACTest.cc
@@ -10,14 +10,14 @@
#include "webrtc/modules/audio_coding/main/test/iSACTest.h"
-#include <cctype>
+#include <ctype.h>
#include <stdio.h>
#include <string.h>
#if _WIN32
#include <windows.h>
#elif WEBRTC_LINUX
-#include <ctime>
+#include <time.h>
#else
#include <sys/time.h>
#include <time.h>
diff --git a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
index 618ccb5..ea2e1ca 100644
--- a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
+++ b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
@@ -10,9 +10,9 @@
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include <assert.h>
#include <math.h>
-#include <cassert>
#include <iostream>
#include "gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/main/test/opus_test.cc b/webrtc/modules/audio_coding/main/test/opus_test.cc
index 36aa355..73507f8 100644
--- a/webrtc/modules/audio_coding/main/test/opus_test.cc
+++ b/webrtc/modules/audio_coding/main/test/opus_test.cc
@@ -10,7 +10,8 @@
#include "webrtc/modules/audio_coding/main/test/opus_test.h"
-#include <cassert>
+#include <assert.h>
+
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc b/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc
index b3003ed..bbfcdf9 100644
--- a/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc
+++ b/webrtc/modules/audio_coding/neteq/test/NetEqRTPplay.cc
@@ -35,14 +35,14 @@
#include <vector>
#ifdef WIN32
-#include <cassert>
+#include <assert.h>
#include <windows.h>
#endif
#ifdef WEBRTC_LINUX
-#include <netinet/in.h>
+#include <assert.h>
#include <libgen.h>
-#include <cassert>
+#include <netinet/in.h>
#endif
//#include "vld.h"
diff --git a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
index a5e65b6..46b9cd1 100644
--- a/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
+++ b/webrtc/modules/audio_coding/neteq/test/RTPencode.cc
@@ -11,12 +11,12 @@
//TODO(hlundin): Reformat file to meet style guide.
/* header includes */
-#include "typedefs.h"
#include "stdio.h"
+#include "typedefs.h"
#include "webrtc_neteq.h" // needed for enum WebRtcNetEQDecoder
-#include <string.h>
+#include <assert.h>
#include <stdlib.h>
-#include <cassert>
+#include <string.h>
#ifdef WIN32
#include <winsock2.h>
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc b/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
index 248556a..b80c829 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
+++ b/webrtc/modules/audio_coding/neteq4/audio_decoder_impl.cc
@@ -11,8 +11,7 @@
#include "webrtc/modules/audio_coding/neteq4/audio_decoder_impl.h"
#include <assert.h>
-
-#include <cstring> // memmove
+#include <string.h> // memmove
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
#include "webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h"
diff --git a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h b/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
index 5f933d9..7167c67 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
+++ b/webrtc/modules/audio_coding/neteq4/audio_multi_vector.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_MULTI_VECTOR_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/audio_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/audio_vector.h b/webrtc/modules/audio_coding/neteq4/audio_vector.h
index 6081cd8..3fd2369 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_vector.h
+++ b/webrtc/modules/audio_coding/neteq4/audio_vector.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_AUDIO_VECTOR_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
+
#include <vector>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.cc b/webrtc/modules/audio_coding/neteq4/background_noise.cc
index 7ab5ead..4b46e6f 100644
--- a/webrtc/modules/audio_coding/neteq4/background_noise.cc
+++ b/webrtc/modules/audio_coding/neteq4/background_noise.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/background_noise.h"
#include <assert.h>
+#include <string.h> // memcpy
#include <algorithm> // min, max
-#include <cstring> // memcpy
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/background_noise.h b/webrtc/modules/audio_coding/neteq4/background_noise.h
index 6aa643b..85e6177 100644
--- a/webrtc/modules/audio_coding/neteq4/background_noise.h
+++ b/webrtc/modules/audio_coding/neteq4/background_noise.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_BACKGROUND_NOISE_H_
-#include <cstring> // size_t
+#include <string.h> // size_t
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc b/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
index febdb83..ddaf08d 100644
--- a/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq4/buffer_level_filter_unittest.cc
@@ -12,7 +12,7 @@
#include "webrtc/modules/audio_coding/neteq4/buffer_level_filter.h"
-#include <cmath> // Access to pow function.
+#include <math.h> // Access to pow function.
#include "gtest/gtest.h"
diff --git a/webrtc/modules/audio_coding/neteq4/delay_manager.h b/webrtc/modules/audio_coding/neteq4/delay_manager.h
index 9d385e7..d46924f 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_manager.h
+++ b/webrtc/modules/audio_coding/neteq4/delay_manager.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_MANAGER_H_
-#include <cstring> // Provide access to size_t.
+#include <string.h> // Provide access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
diff --git a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h b/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
index daa41a1..dfdd253 100644
--- a/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
+++ b/webrtc/modules/audio_coding/neteq4/delay_peak_detector.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DELAY_PEAK_DETECTOR_H_
-#include <cstring> // size_t
+#include <string.h> // size_t
+
#include <list>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc b/webrtc/modules/audio_coding/neteq4/dsp_helper.cc
index ebb3966..f972fc5 100644
--- a/webrtc/modules/audio_coding/neteq4/dsp_helper.cc
+++ b/webrtc/modules/audio_coding/neteq4/dsp_helper.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/dsp_helper.h"
#include <assert.h>
+#include <string.h> // Access to memset.
#include <algorithm> // Access to min, max.
-#include <cstring> // Access to memset.
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
diff --git a/webrtc/modules/audio_coding/neteq4/dsp_helper.h b/webrtc/modules/audio_coding/neteq4/dsp_helper.h
index 947824f..7fe1cbb 100644
--- a/webrtc/modules/audio_coding/neteq4/dsp_helper.h
+++ b/webrtc/modules/audio_coding/neteq4/dsp_helper.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_DSP_HELPER_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc b/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
index acd0843..393648c 100644
--- a/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq4/dtmf_tone_generator_unittest.cc
@@ -12,7 +12,7 @@
#include "webrtc/modules/audio_coding/neteq4/dtmf_tone_generator.h"
-#include <cmath>
+#include <math.h>
#include "gtest/gtest.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/expand.cc b/webrtc/modules/audio_coding/neteq4/expand.cc
index 1e196c9..8719abe 100644
--- a/webrtc/modules/audio_coding/neteq4/expand.cc
+++ b/webrtc/modules/audio_coding/neteq4/expand.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/expand.h"
#include <assert.h>
+#include <string.h> // memset
#include <algorithm> // min, max
-#include <cstring> // memset
#include <limits> // numeric_limits<T>
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
diff --git a/webrtc/modules/audio_coding/neteq4/interface/neteq.h b/webrtc/modules/audio_coding/neteq4/interface/neteq.h
index 2766565..59e5bab 100644
--- a/webrtc/modules/audio_coding/neteq4/interface/neteq.h
+++ b/webrtc/modules/audio_coding/neteq4/interface/neteq.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_INTERFACE_NETEQ_H_
-#include <cstring> // Provide access to size_t.
+#include <string.h> // Provide access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/interface/audio_decoder.h"
diff --git a/webrtc/modules/audio_coding/neteq4/merge.cc b/webrtc/modules/audio_coding/neteq4/merge.cc
index 5c081fe..c15fc34 100644
--- a/webrtc/modules/audio_coding/neteq4/merge.cc
+++ b/webrtc/modules/audio_coding/neteq4/merge.cc
@@ -11,9 +11,9 @@
#include "webrtc/modules/audio_coding/neteq4/merge.h"
#include <assert.h>
+#include <string.h> // memmove, memcpy, memset, size_t
#include <algorithm> // min, max
-#include <cstring> // memmove, memcpy, memset, size_t
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/normal.cc b/webrtc/modules/audio_coding/neteq4/normal.cc
index ddbea4c..353c51b 100644
--- a/webrtc/modules/audio_coding/neteq4/normal.cc
+++ b/webrtc/modules/audio_coding/neteq4/normal.cc
@@ -10,8 +10,9 @@
#include "webrtc/modules/audio_coding/neteq4/normal.h"
+#include <string.h> // memset, memcpy
+
#include <algorithm> // min
-#include <cstring> // memset, memcpy
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
diff --git a/webrtc/modules/audio_coding/neteq4/normal.h b/webrtc/modules/audio_coding/neteq4/normal.h
index aba55c4..23fcca5 100644
--- a/webrtc/modules/audio_coding/neteq4/normal.h
+++ b/webrtc/modules/audio_coding/neteq4/normal.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_NORMAL_H_
-#include <cstring> // Access to size_t.
+#include <string.h> // Access to size_t.
+
#include <vector>
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
diff --git a/webrtc/modules/audio_coding/neteq4/random_vector.h b/webrtc/modules/audio_coding/neteq4/random_vector.h
index a456b17..64cfe0d 100644
--- a/webrtc/modules/audio_coding/neteq4/random_vector.h
+++ b/webrtc/modules/audio_coding/neteq4/random_vector.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_RANDOM_VECTOR_H_
-#include <cstring> // size_t
+#include <string.h> // size_t
#include "webrtc/system_wrappers/interface/constructor_magic.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc b/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
index 9355204..b6e9222 100644
--- a/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
+++ b/webrtc/modules/audio_coding/neteq4/statistics_calculator.cc
@@ -11,8 +11,7 @@
#include "webrtc/modules/audio_coding/neteq4/statistics_calculator.h"
#include <assert.h>
-
-#include <cstring> // memset
+#include <string.h> // memset
#include "webrtc/modules/audio_coding/neteq4/decision_logic.h"
#include "webrtc/modules/audio_coding/neteq4/delay_manager.h"
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc b/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
index 370fc05..7368b02 100644
--- a/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
+++ b/webrtc/modules/audio_coding/neteq4/test/RTPencode.cc
@@ -21,7 +21,7 @@
#include <netinet/in.h>
#endif
-#include <cassert>
+#include <assert.h>
#include "webrtc/typedefs.h"
// needed for NetEqDecoder
diff --git a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc b/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc
index 301ceb6..79af181 100644
--- a/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc
+++ b/webrtc/modules/audio_coding/neteq4/test/RTPjitter.cc
@@ -23,7 +23,7 @@
#include <netinet/in.h>
#endif
-#include <cassert>
+#include <assert.h>
#include "gtest/gtest.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/modules/audio_coding/neteq4/time_stretch.h b/webrtc/modules/audio_coding/neteq4/time_stretch.h
index e701e26..e80c02c 100644
--- a/webrtc/modules/audio_coding/neteq4/time_stretch.h
+++ b/webrtc/modules/audio_coding/neteq4/time_stretch.h
@@ -12,8 +12,7 @@
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TIME_STRETCH_H_
#include <assert.h>
-
-#include <cstring> // memset, size_t
+#include <string.h> // memset, size_t
#include "webrtc/modules/audio_coding/neteq4/audio_multi_vector.h"
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h b/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
index b296cd3..de51ff8 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
+++ b/webrtc/modules/audio_coding/neteq4/tools/input_audio_file.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
#define WEBRTC_MODULES_AUDIO_CODING_NETEQ4_TOOLS_INPUT_AUDIO_FILE_H_
-#include <cstdio>
+#include <stdio.h>
+
#include <string>
#include "webrtc/system_wrappers/interface/constructor_magic.h"
diff --git a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc b/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
index 1c8a870..c5abdf7 100644
--- a/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
+++ b/webrtc/modules/audio_coding/neteq4/tools/neteq_rtpplay.cc
@@ -8,9 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include <assert.h>
+#include <stdio.h>
+
#include <algorithm>
-#include <cassert>
-#include <cstdio>
#include <iostream>
#include <string>