diff --git a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c
index bc08d431a..ab43aef8a 100644
--- a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c
+++ b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.c
@@ -11,7 +11,7 @@
 #include "cng_helpfuns.h"
 
 #include "signal_processing_library.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 #include "webrtc_cng.h"
 
 /* Values in |k| are Q15, and |a| Q12. */
diff --git a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h
index a553a7615..de9e0d0a3 100644
--- a/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h
+++ b/webrtc/modules/audio_coding/codecs/cng/cng_helpfuns.h
@@ -10,7 +10,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_CNG_HELPFUNS_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h b/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h
index d90a26919..6030f8ebe 100644
--- a/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h
+++ b/webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h
@@ -12,7 +12,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_MAIN_INTERFACE_WEBRTC_CNG_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.c b/webrtc/modules/audio_coding/codecs/g711/g711.c
index a183757ec..ac9e44a65 100644
--- a/webrtc/modules/audio_coding/codecs/g711/g711.c
+++ b/webrtc/modules/audio_coding/codecs/g711/g711.c
@@ -21,7 +21,7 @@
  */
 
 #include "g711.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /* Copied from the CCITT G.711 specification */
 static const uint8_t ulaw_to_alaw_table[256] = {
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711.h b/webrtc/modules/audio_coding/codecs/g711/g711.h
index 3b07d8ba8..f34d26667 100644
--- a/webrtc/modules/audio_coding/codecs/g711/g711.h
+++ b/webrtc/modules/audio_coding/codecs/g711/g711.h
@@ -49,7 +49,7 @@ specification by other means.
 extern "C" {
 #endif
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #if defined(__i386__)
 /*! \brief Find the bit position of the highest set bit in a word
diff --git a/webrtc/modules/audio_coding/codecs/g711/g711_interface.c b/webrtc/modules/audio_coding/codecs/g711/g711_interface.c
index 134c1e4e1..087e3e11c 100644
--- a/webrtc/modules/audio_coding/codecs/g711/g711_interface.c
+++ b/webrtc/modules/audio_coding/codecs/g711/g711_interface.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include "g711.h"
 #include "g711_interface.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 int16_t WebRtcG711_EncodeA(void* state,
                            int16_t* speechIn,
diff --git a/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h b/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h
index 83357e474..bee5ffad5 100644
--- a/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h
+++ b/webrtc/modules/audio_coding/codecs/g711/include/g711_interface.h
@@ -11,7 +11,7 @@
 #ifndef MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_
 #define MODULES_AUDIO_CODING_CODECS_G711_MAIN_INTERFACE_G711_INTERFACE_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 // Comfort noise constants
 #define G711_WEBRTC_SPEECH 1
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_decode.c b/webrtc/modules/audio_coding/codecs/g722/g722_decode.c
index 65ca77bad..e62af981f 100644
--- a/webrtc/modules/audio_coding/codecs/g722/g722_decode.c
+++ b/webrtc/modules/audio_coding/codecs/g722/g722_decode.c
@@ -34,12 +34,13 @@
 #include <config.h>
 #endif
 
-#include <memory.h>
 #include <stdio.h>
+#include <memory.h>
 #include <stdlib.h>
 
+#include "typedefs.h"
 #include "g722_enc_dec.h"
-#include "webrtc/typedefs.h"
+
 
 #if !defined(FALSE)
 #define FALSE 0
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h b/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h
index da6122456..ef279ac5a 100644
--- a/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h
+++ b/webrtc/modules/audio_coding/codecs/g722/g722_enc_dec.h
@@ -31,8 +31,6 @@
 #if !defined(_G722_ENC_DEC_H_)
 #define _G722_ENC_DEC_H_
 
-#include "webrtc/typedefs.h"
-
 /*! \page g722_page G.722 encoding and decoding
 \section g722_page_sec_1 What does it do?
 The G.722 module is a bit exact implementation of the ITU G.722 specification for all three
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_encode.c b/webrtc/modules/audio_coding/codecs/g722/g722_encode.c
index 03ac3c52f..5b07615a0 100644
--- a/webrtc/modules/audio_coding/codecs/g722/g722_encode.c
+++ b/webrtc/modules/audio_coding/codecs/g722/g722_encode.c
@@ -34,12 +34,12 @@
 #include <config.h>
 #endif
 
-#include <memory.h>
 #include <stdio.h>
+#include <memory.h>
 #include <stdlib.h>
 
+#include "typedefs.h"
 #include "g722_enc_dec.h"
-#include "webrtc/typedefs.h"
 
 #if !defined(FALSE)
 #define FALSE 0
diff --git a/webrtc/modules/audio_coding/codecs/g722/g722_interface.c b/webrtc/modules/audio_coding/codecs/g722/g722_interface.c
index a52981b9a..7075669f5 100644
--- a/webrtc/modules/audio_coding/codecs/g722/g722_interface.c
+++ b/webrtc/modules/audio_coding/codecs/g722/g722_interface.c
@@ -12,9 +12,10 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "g722_enc_dec.h"
 #include "g722_interface.h"
-#include "webrtc/typedefs.h"
+#include "g722_enc_dec.h"
+#include "typedefs.h"
+
 
 int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst)
 {
diff --git a/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h b/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h
index 1d3d79908..0948a1831 100644
--- a/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h
+++ b/webrtc/modules/audio_coding/codecs/g722/include/g722_interface.h
@@ -11,7 +11,7 @@
 #ifndef MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_
 #define MODULES_AUDIO_CODING_CODECS_G722_MAIN_INTERFACE_G722_INTERFACE_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /*
  * Solution to support multiple instances
diff --git a/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc b/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc
index 9df147692..d51301d51 100644
--- a/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc
+++ b/webrtc/modules/audio_coding/codecs/g722/test/testG722.cc
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /* include API */
 #include "g722_interface.h"
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/constants.h b/webrtc/modules/audio_coding/codecs/ilbc/constants.h
index ff6370e14..cdc8a9c56 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/constants.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/constants.h
@@ -20,7 +20,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_CONSTANTS_H_
 
 #include "defines.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /* high pass filters */
 
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/defines.h b/webrtc/modules/audio_coding/codecs/ilbc/defines.h
index 796d7b586..b60eaf481 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/defines.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/defines.h
@@ -18,9 +18,9 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_DEFINES_H_
 
-#include <string.h>
+#include "typedefs.h"
 #include "signal_processing_library.h"
-#include "webrtc/typedefs.h"
+#include <string.h>
 
 /* general codec settings */
 
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h b/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h
index ccb3f5e3e..9ab2e86a9 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h
@@ -22,7 +22,7 @@
  * Define the fixpoint numeric formats
  */
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /*
  * Solution to support multiple instances
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq3.h b/webrtc/modules/audio_coding/codecs/ilbc/vq3.h
index b146ea3d8..e2e2ab525 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/vq3.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/vq3.h
@@ -19,7 +19,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ3_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /*----------------------------------------------------------------*
  *  Vector quantization of order 3 (based on MSE)
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/vq4.h b/webrtc/modules/audio_coding/codecs/ilbc/vq4.h
index 926375936..5ae4c8747 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/vq4.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/vq4.h
@@ -19,7 +19,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_MAIN_SOURCE_VQ4_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /*----------------------------------------------------------------*
  *  Vector quantization of order 4 (based on MSE)
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h b/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h
index 7cd295440..da7163e99 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h
@@ -14,7 +14,8 @@
 /*
  * Define the fixpoint numeric formats
  */
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
+
 
 typedef struct {
   void *dummy;
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
index 2aa587fc0..7a5f7462f 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_INTERNAL_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
index c96fb05b8..9a888e4fc 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
@@ -19,7 +19,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_FILTERBANK_TABLES_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
index d7d198caf..d5b2d0e91 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
@@ -16,7 +16,7 @@
 
 #include "settings.h"
 #include "signal_processing_library.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /* Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients
  * cth_Q15[] and sth_Q15[].
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
index 7e8121e83..587bcd473 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
@@ -18,7 +18,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_LPC_TABLES_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
+
 
 /* indices of KLT coefficients used */
 extern const uint16_t WebRtcIsacfix_kSelIndGain[12];
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
index 4aab2b6c4..c4e0be594 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
@@ -18,7 +18,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_GAIN_TABLES_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
+
 
 /********************* Pitch Filter Gain Coefficient Tables ************************/
 /* cdf for quantized pitch filter gains */
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
index a5478b2eb..bb8b39ac5 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
@@ -18,7 +18,9 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_PITCH_LAG_TABLES_H_
 
-#include "webrtc/typedefs.h"
+
+#include "typedefs.h"
+
 
 /********************* Pitch Filter Lag Coefficient Tables ************************/
 
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
index 55832063f..115509af0 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
@@ -19,8 +19,9 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_SPECTRUM_AR_MODEL_TABLES_H_
 
+#include "typedefs.h"
 #include "settings.h"
-#include "webrtc/typedefs.h"
+
 
 /********************* AR Coefficient Tables ************************/
 /* cdf for quantized reflection coefficient 1 */
diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h b/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h
index 64171f74d..bd20ba016 100644
--- a/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h
+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h
@@ -21,7 +21,7 @@
 
 #include "common_audio/signal_processing/include/signal_processing_library.h"
 #include "modules/audio_coding/codecs/isac/fix/source/settings.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /* Bitstream struct for decoder */
 typedef struct Bitstreamstruct_dec {
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h b/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h
index 19d1bf31d..dba87493a 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/crc.h
@@ -18,7 +18,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_CRC_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /****************************************************************************
  * WebRtcIsac_GetCrc(...)
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
index d59f7489e..67e77b53f 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
@@ -17,16 +17,16 @@
  */
 
 #include "encode_lpc_swb.h"
+#include "typedefs.h"
+#include "settings.h"
 
-#include <math.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "lpc_gain_swb_tables.h"
 #include "lpc_shape_swb12_tables.h"
 #include "lpc_shape_swb16_tables.h"
-#include "settings.h"
-#include "webrtc/typedefs.h"
+#include "lpc_gain_swb_tables.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
 
 /******************************************************************************
  * WebRtcIsac_RemoveLarMean()
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
index 3dd2311ba..eab98c157 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
@@ -19,9 +19,10 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_ENCODE_LPC_SWB_H_
 
+#include "typedefs.h"
 #include "settings.h"
 #include "structs.h"
-#include "webrtc/typedefs.h"
+
 
 /******************************************************************************
  * WebRtcIsac_RemoveLarMean()
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
index 5cc6c11c7..8ce004b28 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
@@ -18,7 +18,7 @@
 
 #include "lpc_gain_swb_tables.h"
 #include "settings.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 const double WebRtcIsac_kQSizeLpcGain = 0.100000;
 
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
index c163f4ab5..121d05e7d 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
@@ -20,7 +20,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_GAIN_SWB_TABLES_H_
 
 #include "settings.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 extern const double WebRtcIsac_kQSizeLpcGain;
 
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
index 599b89d8a..2c5698fbb 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
@@ -18,7 +18,7 @@
 
 #include "lpc_shape_swb12_tables.h"
 #include "settings.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /*
 * Mean value of LAR
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
index 256f1d4a7..cef885a7f 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
@@ -20,7 +20,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB12_TABLES_H_
 
 #include "settings.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER];
 
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
index 6176d2cf7..0f567ed7d 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
@@ -18,7 +18,7 @@
 
 #include "lpc_shape_swb16_tables.h"
 #include "settings.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /*
 * Mean value of LAR
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
index 3e1bdf71d..a4b3a59f4 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
@@ -20,7 +20,8 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
 
 #include "settings.h"
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
+
 
 extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER];
 
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
index 2b446e932..891c67ccd 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
@@ -13,7 +13,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_OS_SPECIFIC_INLINE_H_
 
 #include <math.h>
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #if defined(WEBRTC_POSIX)
 #define WebRtcIsac_lrint lrint
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
index 8d708ce68..e7518b168 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
@@ -18,7 +18,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_GAIN_TABLES_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 /* header file for coding tables for the pitch filter side-info in the entropy coder */
 /********************* Pitch Filter Gain Coefficient Tables ************************/
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
index 01989f018..7c72571ff 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
+++ b/webrtc/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
@@ -18,7 +18,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_PITCH_LAG_TABLES_H_
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 /* header file for coding tables for the pitch filter side-info in the entropy coder */
 /********************* Pitch Filter Lag Coefficient Tables ************************/
 
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h b/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
index 9c96b8304..9db65ddab 100644
--- a/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
+++ b/webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
@@ -14,7 +14,7 @@
  * Define the fixpoint numeric formats
  */
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
index af6720f63..3ade03724 100644
--- a/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
+++ b/webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #endif
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #define HIGHEND 0xFF00
 #define LOWEND    0xFF
diff --git a/webrtc/modules/audio_coding/main/test/TimedTrace.h b/webrtc/modules/audio_coding/main/test/TimedTrace.h
index ef9609a26..237b329e7 100644
--- a/webrtc/modules/audio_coding/main/test/TimedTrace.h
+++ b/webrtc/modules/audio_coding/main/test/TimedTrace.h
@@ -11,7 +11,7 @@
 #ifndef TIMED_TRACE_H
 #define TIMED_TRACE_H
 
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
 
 #include <stdio.h>
 #include <stdlib.h>