diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 206445f..6e5a4ef 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -110,7 +110,7 @@
 
 config("cng_config") {
   include_dirs = [
-    "../..",
+    "../../..",
     "codecs/cng/include",
   ]
 }
@@ -130,7 +130,7 @@
 
 config("g711_config") {
   include_dirs = [
-    "../..",
+    "../../..",
     "codecs/g711/include",
   ]
 }
@@ -148,7 +148,7 @@
 
 config("g722_config") {
   include_dirs = [
-    "../..",
+    "../../..",
     "codecs/g722/include",
   ]
 }
@@ -167,7 +167,7 @@
 
 config("ilbc_config") {
   include_dirs = [
-    "../..",
+    "../../..",
     "codecs/ilbc/interface",
   ]
 }
@@ -322,7 +322,7 @@
 
 config("isac_config") {
   include_dirs = [
-    "../..",
+    "../../..",
     "codecs/isac/main/interface",
   ]
 }
@@ -393,7 +393,7 @@
 
 config("isac_fix_config") {
   include_dirs = [
-    "../..",
+    "../../..",
     "codecs/isac/fix/interface",
   ]
 }
@@ -517,7 +517,7 @@
     ]
 
     include_dirs = [
-      "../..",
+      "../../..",
     ]
 
     # Disable LTO in audio_processing_neon target due to compiler bug.
@@ -546,7 +546,7 @@
 
 config("pcm16b_config") {
   include_dirs = [
-    "../..",
+    "../../..",
     "codecs/pcm16b/include",
   ]
 }
@@ -561,7 +561,7 @@
 }
 
 config("opus_config") {
-  include_dirs = [ "../.." ]
+  include_dirs = [ "../../.." ]
 }
 
 source_set("webrtc_opus") {
diff --git a/modules/audio_coding/codecs/cng/cng_helpfuns.c b/modules/audio_coding/codecs/cng/cng_helpfuns.c
index ab43aef..bc08d43 100644
--- a/modules/audio_coding/codecs/cng/cng_helpfuns.c
+++ b/modules/audio_coding/codecs/cng/cng_helpfuns.c
@@ -11,7 +11,7 @@
 #include "cng_helpfuns.h"
 
 #include "signal_processing_library.h"
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 #include "webrtc_cng.h"
 
 /* Values in |k| are Q15, and |a| Q12. */
diff --git a/modules/audio_coding/codecs/cng/cng_helpfuns.h b/modules/audio_coding/codecs/cng/cng_helpfuns.h
index de9e0d0..a553a76 100644
--- a/modules/audio_coding/codecs/cng/cng_helpfuns.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/modules/audio_coding/codecs/cng/include/webrtc_cng.h b/modules/audio_coding/codecs/cng/include/webrtc_cng.h
index 6030f8e..d90a269 100644
--- a/modules/audio_coding/codecs/cng/include/webrtc_cng.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/modules/audio_coding/codecs/g711/g711.c b/modules/audio_coding/codecs/g711/g711.c
index ac9e44a..a183757 100644
--- a/modules/audio_coding/codecs/g711/g711.c
+++ b/modules/audio_coding/codecs/g711/g711.c
@@ -21,7 +21,7 @@
  */
 
 #include "g711.h"
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /* Copied from the CCITT G.711 specification */
 static const uint8_t ulaw_to_alaw_table[256] = {
diff --git a/modules/audio_coding/codecs/g711/g711.h b/modules/audio_coding/codecs/g711/g711.h
index f34d266..3b07d8b 100644
--- a/modules/audio_coding/codecs/g711/g711.h
+++ b/modules/audio_coding/codecs/g711/g711.h
@@ -49,7 +49,7 @@
 extern "C" {
 #endif
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #if defined(__i386__)
 /*! \brief Find the bit position of the highest set bit in a word
diff --git a/modules/audio_coding/codecs/g711/g711_interface.c b/modules/audio_coding/codecs/g711/g711_interface.c
index 087e3e1..134c1e4 100644
--- a/modules/audio_coding/codecs/g711/g711_interface.c
+++ b/modules/audio_coding/codecs/g711/g711_interface.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include "g711.h"
 #include "g711_interface.h"
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 int16_t WebRtcG711_EncodeA(void* state,
                            int16_t* speechIn,
diff --git a/modules/audio_coding/codecs/g711/include/g711_interface.h b/modules/audio_coding/codecs/g711/include/g711_interface.h
index bee5ffa..83357e4 100644
--- a/modules/audio_coding/codecs/g711/include/g711_interface.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 // Comfort noise constants
 #define G711_WEBRTC_SPEECH 1
diff --git a/modules/audio_coding/codecs/g722/g722_decode.c b/modules/audio_coding/codecs/g722/g722_decode.c
index e62af98..65ca77b 100644
--- a/modules/audio_coding/codecs/g722/g722_decode.c
+++ b/modules/audio_coding/codecs/g722/g722_decode.c
@@ -34,13 +34,12 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
 #include <memory.h>
+#include <stdio.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/modules/audio_coding/codecs/g722/g722_enc_dec.h b/modules/audio_coding/codecs/g722/g722_enc_dec.h
index ef279ac..da61224 100644
--- a/modules/audio_coding/codecs/g722/g722_enc_dec.h
+++ b/modules/audio_coding/codecs/g722/g722_enc_dec.h
@@ -31,6 +31,8 @@
 #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/modules/audio_coding/codecs/g722/g722_encode.c b/modules/audio_coding/codecs/g722/g722_encode.c
index 5b07615..03ac3c5 100644
--- a/modules/audio_coding/codecs/g722/g722_encode.c
+++ b/modules/audio_coding/codecs/g722/g722_encode.c
@@ -34,12 +34,12 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
 #include <memory.h>
+#include <stdio.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/modules/audio_coding/codecs/g722/g722_interface.c b/modules/audio_coding/codecs/g722/g722_interface.c
index 7075669..a52981b 100644
--- a/modules/audio_coding/codecs/g722/g722_interface.c
+++ b/modules/audio_coding/codecs/g722/g722_interface.c
@@ -12,10 +12,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "g722_interface.h"
 #include "g722_enc_dec.h"
-#include "typedefs.h"
-
+#include "g722_interface.h"
+#include "webrtc/typedefs.h"
 
 int16_t WebRtcG722_CreateEncoder(G722EncInst **G722enc_inst)
 {
diff --git a/modules/audio_coding/codecs/g722/include/g722_interface.h b/modules/audio_coding/codecs/g722/include/g722_interface.h
index 0948a18..1d3d799 100644
--- a/modules/audio_coding/codecs/g722/include/g722_interface.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /*
  * Solution to support multiple instances
diff --git a/modules/audio_coding/codecs/g722/test/testG722.cc b/modules/audio_coding/codecs/g722/test/testG722.cc
index d51301d..9df1476 100644
--- a/modules/audio_coding/codecs/g722/test/testG722.cc
+++ b/modules/audio_coding/codecs/g722/test/testG722.cc
@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /* include API */
 #include "g722_interface.h"
diff --git a/modules/audio_coding/codecs/ilbc/constants.h b/modules/audio_coding/codecs/ilbc/constants.h
index cdc8a9c..ff6370e 100644
--- a/modules/audio_coding/codecs/ilbc/constants.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /* high pass filters */
 
diff --git a/modules/audio_coding/codecs/ilbc/defines.h b/modules/audio_coding/codecs/ilbc/defines.h
index b60eaf4..796d7b5 100644
--- a/modules/audio_coding/codecs/ilbc/defines.h
+++ b/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 "typedefs.h"
-#include "signal_processing_library.h"
 #include <string.h>
+#include "signal_processing_library.h"
+#include "webrtc/typedefs.h"
 
 /* general codec settings */
 
diff --git a/modules/audio_coding/codecs/ilbc/interface/ilbc.h b/modules/audio_coding/codecs/ilbc/interface/ilbc.h
index 9ab2e86..ccb3f5e 100644
--- a/modules/audio_coding/codecs/ilbc/interface/ilbc.h
+++ b/modules/audio_coding/codecs/ilbc/interface/ilbc.h
@@ -22,7 +22,7 @@
  * Define the fixpoint numeric formats
  */
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /*
  * Solution to support multiple instances
diff --git a/modules/audio_coding/codecs/ilbc/vq3.h b/modules/audio_coding/codecs/ilbc/vq3.h
index e2e2ab5..b146ea3 100644
--- a/modules/audio_coding/codecs/ilbc/vq3.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /*----------------------------------------------------------------*
  *  Vector quantization of order 3 (based on MSE)
diff --git a/modules/audio_coding/codecs/ilbc/vq4.h b/modules/audio_coding/codecs/ilbc/vq4.h
index 5ae4c87..9263759 100644
--- a/modules/audio_coding/codecs/ilbc/vq4.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /*----------------------------------------------------------------*
  *  Vector quantization of order 4 (based on MSE)
diff --git a/modules/audio_coding/codecs/isac/fix/interface/isacfix.h b/modules/audio_coding/codecs/isac/fix/interface/isacfix.h
index da7163e..7cd2954 100644
--- a/modules/audio_coding/codecs/isac/fix/interface/isacfix.h
+++ b/modules/audio_coding/codecs/isac/fix/interface/isacfix.h
@@ -14,8 +14,7 @@
 /*
  * Define the fixpoint numeric formats
  */
-#include "typedefs.h"
-
+#include "webrtc/typedefs.h"
 
 typedef struct {
   void *dummy;
diff --git a/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c
index a66a43e..599f8f0 100644
--- a/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c
+++ b/modules/audio_coding/codecs/isac/fix/source/entropy_coding_mips.c
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h"
 
 // MIPS optimization of the function WebRtcIsacfix_MatrixProduct1.
 // Bit-exact with the function WebRtcIsacfix_MatrixProduct1C from
diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
index 7a5f746..2aa587f 100644
--- a/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h b/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
index 9a888e4..c96fb05 100644
--- a/modules/audio_coding/codecs/isac/fix/source/filterbank_tables.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
diff --git a/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/modules/audio_coding/codecs/isac/fix/source/isacfix.c
index 3be2b15..e855dae 100644
--- a/modules/audio_coding/codecs/isac/fix/source/isacfix.c
+++ b/modules/audio_coding/codecs/isac/fix/source/isacfix.c
@@ -15,17 +15,17 @@
  *
  */
 
-#include "modules/audio_coding/codecs/isac/fix/interface/isacfix.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/interface/isacfix.h"
 
 #include <stdlib.h>
 
-#include "modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h"
-#include "modules/audio_coding/codecs/isac/fix/source/codec.h"
-#include "modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
-#include "modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h"
-#include "modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h"
-#include "modules/audio_coding/codecs/isac/fix/source/structs.h"
-#include "system_wrappers/interface/cpu_features_wrapper.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/bandwidth_estimator.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/codec.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/filterbank_internal.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/structs.h"
+#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h"
 
 // Declare function pointers.
 FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix;
diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_c.c b/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
index d5b2d0e..d7d198c 100644
--- a/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
+++ b/modules/audio_coding/codecs/isac/fix/source/lattice_c.c
@@ -16,7 +16,7 @@
 
 #include "settings.h"
 #include "signal_processing_library.h"
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /* Filter ar_g_Q0[] and ar_f_Q0[] through an AR filter with coefficients
  * cth_Q15[] and sth_Q15[].
diff --git a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
index 587bcd4..7e8121e 100644
--- a/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
+++ b/modules/audio_coding/codecs/isac/fix/source/lpc_tables.h
@@ -18,8 +18,7 @@
 #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 "typedefs.h"
-
+#include "webrtc/typedefs.h"
 
 /* indices of KLT coefficients used */
 extern const uint16_t WebRtcIsacfix_kSelIndGain[12];
diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c
index d3c90b3..5b1b3f1 100644
--- a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c
+++ b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_c.c
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/pitch_estimator.h"
 
 /* Filter coefficicients in Q15. */
 static const int16_t kDampFilter[PITCH_DAMPORDER] = {
diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
index c4e0be5..4aab2b6 100644
--- a/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
+++ b/modules/audio_coding/codecs/isac/fix/source/pitch_gain_tables.h
@@ -18,8 +18,7 @@
 #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 "typedefs.h"
-
+#include "webrtc/typedefs.h"
 
 /********************* Pitch Filter Gain Coefficient Tables ************************/
 /* cdf for quantized pitch filter gains */
diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
index bb8b39a..a5478b2 100644
--- a/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
+++ b/modules/audio_coding/codecs/isac/fix/source/pitch_lag_tables.h
@@ -18,9 +18,7 @@
 #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 "typedefs.h"
-
+#include "webrtc/typedefs.h"
 
 /********************* Pitch Filter Lag Coefficient Tables ************************/
 
diff --git a/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
index 115509a..5583206 100644
--- a/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
+++ b/modules/audio_coding/codecs/isac/fix/source/spectrum_ar_model_tables.h
@@ -19,9 +19,8 @@
 #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/modules/audio_coding/codecs/isac/fix/source/structs.h b/modules/audio_coding/codecs/isac/fix/source/structs.h
index bd20ba0..1777efd 100644
--- a/modules/audio_coding/codecs/isac/fix/source/structs.h
+++ b/modules/audio_coding/codecs/isac/fix/source/structs.h
@@ -19,9 +19,9 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_STRUCTS_H_
 
 
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
-#include "typedefs.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/audio_coding/codecs/isac/fix/source/settings.h"
+#include "webrtc/typedefs.h"
 
 /* Bitstream struct for decoder */
 typedef struct Bitstreamstruct_dec {
diff --git a/modules/audio_coding/codecs/isac/main/source/crc.h b/modules/audio_coding/codecs/isac/main/source/crc.h
index dba8749..19d1bf3 100644
--- a/modules/audio_coding/codecs/isac/main/source/crc.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /****************************************************************************
  * WebRtcIsac_GetCrc(...)
diff --git a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
index 67e77b5..d59f748 100644
--- a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.c
+++ b/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 "lpc_shape_swb12_tables.h"
-#include "lpc_shape_swb16_tables.h"
-#include "lpc_gain_swb_tables.h"
-
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <math.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"
 
 /******************************************************************************
  * WebRtcIsac_RemoveLarMean()
diff --git a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
index eab98c1..3dd2311 100644
--- a/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
+++ b/modules/audio_coding/codecs/isac/main/source/encode_lpc_swb.h
@@ -19,10 +19,9 @@
 #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/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
index 8ce004b..5cc6c11 100644
--- a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.c
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 const double WebRtcIsac_kQSizeLpcGain = 0.100000;
 
diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
index 121d05e..c163f4a 100644
--- a/modules/audio_coding/codecs/isac/main/source/lpc_gain_swb_tables.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 extern const double WebRtcIsac_kQSizeLpcGain;
 
diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
index 2c5698f..599b89d 100644
--- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.c
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /*
 * Mean value of LAR
diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
index cef885a..256f1d4 100644
--- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb12_tables.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 extern const double WebRtcIsac_kMeanLarUb12[UB_LPC_ORDER];
 
diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
index 0f567ed..6176d2c 100644
--- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.c
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 /*
 * Mean value of LAR
diff --git a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
index a4b3a59..3e1bdf7 100644
--- a/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
+++ b/modules/audio_coding/codecs/isac/main/source/lpc_shape_swb16_tables.h
@@ -20,8 +20,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_MAIN_SOURCE_LPC_SHAPE_SWB16_TABLES_H_
 
 #include "settings.h"
-#include "typedefs.h"
-
+#include "webrtc/typedefs.h"
 
 extern const double WebRtcIsac_kMeanLarUb16[UB_LPC_ORDER];
 
diff --git a/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h b/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
index 891c67c..2b446e9 100644
--- a/modules/audio_coding/codecs/isac/main/source/os_specific_inline.h
+++ b/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 "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #if defined(WEBRTC_POSIX)
 #define WebRtcIsac_lrint lrint
diff --git a/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
index e7518b1..8d708ce 100644
--- a/modules/audio_coding/codecs/isac/main/source/pitch_gain_tables.h
+++ b/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 "typedefs.h"
+#include "webrtc/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/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h b/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
index 7c72571..01989f0 100644
--- a/modules/audio_coding/codecs/isac/main/source/pitch_lag_tables.h
+++ b/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 "typedefs.h"
+#include "webrtc/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/modules/audio_coding/codecs/pcm16b/include/pcm16b.h b/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
index 9db65dd..9c96b83 100644
--- a/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
+++ b/modules/audio_coding/codecs/pcm16b/include/pcm16b.h
@@ -14,7 +14,7 @@
  * Define the fixpoint numeric formats
  */
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/modules/audio_coding/codecs/pcm16b/pcm16b.c b/modules/audio_coding/codecs/pcm16b/pcm16b.c
index 3ade037..af6720f 100644
--- a/modules/audio_coding/codecs/pcm16b/pcm16b.c
+++ b/modules/audio_coding/codecs/pcm16b/pcm16b.c
@@ -16,7 +16,7 @@
 #include <string.h>
 #endif
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #define HIGHEND 0xFF00
 #define LOWEND    0xFF
diff --git a/modules/audio_coding/main/test/TimedTrace.h b/modules/audio_coding/main/test/TimedTrace.h
index 237b329..ef9609a 100644
--- a/modules/audio_coding/main/test/TimedTrace.h
+++ b/modules/audio_coding/main/test/TimedTrace.h
@@ -11,7 +11,7 @@
 #ifndef TIMED_TRACE_H
 #define TIMED_TRACE_H
 
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
 
 #include <stdio.h>
 #include <stdlib.h>