diff --git a/Android.mk b/Android.mk
index 57bce2f00b..cd41171548 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,12 +12,12 @@ MY_WEBRTC_ROOT_PATH := $(call my-dir)
 include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing_library/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/NetEQ/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/neteq/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/CNG/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G711/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G722/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/PCM16B/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iLBC/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/ilbc/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/iSAC/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/main/source/Android.mk
diff --git a/src/modules/audio_coding/codecs/ilbc/Android.mk b/src/modules/audio_coding/codecs/ilbc/Android.mk
index ce0fcfbbcd..a00aba886a 100644
--- a/src/modules/audio_coding/codecs/ilbc/Android.mk
+++ b/src/modules/audio_coding/codecs/ilbc/Android.mk
@@ -91,6 +91,7 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
+    $(LOCAL_PATH)/interface \
     $(LOCAL_PATH)/../../../.. \
     $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface 
 
diff --git a/src/modules/audio_coding/main/source/Android.mk b/src/modules/audio_coding/main/source/Android.mk
index 8e1007fbdb..485ec1c2f4 100644
--- a/src/modules/audio_coding/main/source/Android.mk
+++ b/src/modules/audio_coding/main/source/Android.mk
@@ -44,11 +44,11 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../codecs/CNG/main/interface \
     $(LOCAL_PATH)/../../codecs/G711/main/interface \
     $(LOCAL_PATH)/../../codecs/G722/main/interface \
-    $(LOCAL_PATH)/../../codecs/iLBC/main/interface \
+    $(LOCAL_PATH)/../../codecs/ilbc/interface \
     $(LOCAL_PATH)/../../codecs/iSAC/main/interface \
     $(LOCAL_PATH)/../../codecs/iSAC/fix/interface \
     $(LOCAL_PATH)/../../codecs/PCM16B/main/interface \
-    $(LOCAL_PATH)/../../NetEQ/main/interface \
+    $(LOCAL_PATH)/../../neteq/interface \
     $(LOCAL_PATH)/../../../.. \
     $(LOCAL_PATH)/../../../interface \
     $(LOCAL_PATH)/../../../../common_audio/resampler/main/interface \