diff --git a/src/native/build.xml b/src/native/build.xml
index 8a79312882d993066ce3167071d3ad1b0a1fcf65..01e746d3cee523e48e997a72e8d6c8027c230cb4 100644
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -997,89 +997,89 @@
                 includes="*.c"/>
 
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/aecm/"
-			includes="aecm_core.c"/>
+            includes="aecm_core.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/aecm/"
-			includes="aecm_core_c.c"/>
+            includes="aecm_core_c.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/aecm/"
-			includes="echo_control_mobile.c"/>
+            includes="echo_control_mobile.c"/>
 
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/ns/"
-			includes="noise_suppression.c"/>
+            includes="noise_suppression.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/ns/"
-			includes="noise_suppression_x.c"/>
+            includes="noise_suppression_x.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/ns/"
-			includes="ns_core.c"/>
+            includes="ns_core.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/ns/"
-			includes="nsx_core.c"/>
+            includes="nsx_core.c"/>
 
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-      			includes="splitting_filter.c"/>
+                includes="splitting_filter.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-      			includes="real_fft.c"/>
+                includes="real_fft.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="complex_bit_reverse.c"/>
+            includes="complex_bit_reverse.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="complex_fft.c"/>
+            includes="complex_fft.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="spl_init.c"/>
+            includes="spl_init.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="cross_correlation.c"/>
+            includes="cross_correlation.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="division_operations.c"/>
+            includes="division_operations.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="dot_product_with_scale.c"/>
+            includes="dot_product_with_scale.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="resample_by_2.c"/>
+            includes="resample_by_2.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="energy.c"/>
+            includes="energy.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="downsample_fast.c"/>
+            includes="downsample_fast.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="auto_corr_to_refl_coef.c"/>
+            includes="auto_corr_to_refl_coef.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="auto_correlation.c"/>
+            includes="auto_correlation.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="copy_set_operations.c"/>
+            includes="copy_set_operations.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="filter_ar.c"/>
+            includes="filter_ar.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="filter_ar_fast_q12.c"/>
+            includes="filter_ar_fast_q12.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="filter_ma_fast_q12.c"/>
+            includes="filter_ma_fast_q12.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="get_hanning_window.c"/>
+            includes="get_hanning_window.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="get_scaling_square.c"/>
+            includes="get_scaling_square.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="ilbc_specific_functions.c"/>
+            includes="ilbc_specific_functions.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="levinson_durbin.c"/>
+            includes="levinson_durbin.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="lpc_to_refl_coef.c"/>
+            includes="lpc_to_refl_coef.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="min_max_operations.c"/>
+            includes="min_max_operations.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="randomization_functions.c"/>
+            includes="randomization_functions.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="refl_coef_to_lpc.c"/>
+            includes="refl_coef_to_lpc.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="resample.c"/>
+            includes="resample.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="resample_48khz.c"/>
+            includes="resample_48khz.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="resample_by_2_internal.c"/>
+            includes="resample_by_2_internal.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="resample_fractional.c"/>
+            includes="resample_fractional.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="spl_sqrt.c"/>
+            includes="spl_sqrt.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="spl_sqrt_floor.c"/>
+            includes="spl_sqrt_floor.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="spl_version.c"/>
+            includes="spl_version.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="sqrt_of_one_minus_x_squared.c"/>
+            includes="sqrt_of_one_minus_x_squared.c"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/common_audio/signal_processing/"
-			includes="vector_scaling_operations.c"/>
+        includes="vector_scaling_operations.c"/>
     </cc>
 
 
@@ -1108,80 +1108,80 @@
       <linkerarg value="${basedir}/${native_install_dir}/libjnwebrtc.dylib" />
 
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="audio_buffer.cc"/>
+            includes="audio_buffer.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="audio_processing_impl.cc"/>
+            includes="audio_processing_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="echo_cancellation_impl.cc"/>
+            includes="echo_cancellation_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="echo_control_mobile_impl.cc"/>
+            includes="echo_control_mobile_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="gain_control_impl.cc"/>
+            includes="gain_control_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="high_pass_filter_impl.cc"/>
+            includes="high_pass_filter_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="level_estimator_impl.cc"/>
+            includes="level_estimator_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="noise_suppression_impl.cc"/>
+            includes="noise_suppression_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="processing_component.cc"/>
+            includes="processing_component.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="splitting_filter.cc"/>
+            includes="splitting_filter.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/modules/audio_processing/"
-			includes="voice_detection_impl.cc"/>
+            includes="voice_detection_impl.cc"/>
 
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
             includes="cpu_features.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="aligned_malloc.cc"/>
+            includes="aligned_malloc.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="clock.cc"/>
+            includes="clock.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="condition_variable.cc"/>
+            includes="condition_variable.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="condition_variable_posix.cc"/>
+            includes="condition_variable_posix.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="cpu_info.cc"/>
+            includes="cpu_info.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="critical_section.cc"/>
+            includes="critical_section.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="critical_section_posix.cc"/>
+            includes="critical_section_posix.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="data_log.cc"/>
+            includes="data_log.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="data_log_c.cc"/>
+            includes="data_log_c.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="event.cc"/>
+            includes="event.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="event_posix.cc"/>
+            includes="event_posix.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="event_tracer.cc"/>
+            includes="event_tracer.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="file_impl.cc"/>
+            includes="file_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="list_no_stl.cc"/>
+            includes="list_no_stl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="logging.cc"/>
+            includes="logging.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="rw_lock.cc"/>
+            includes="rw_lock.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="rw_lock_generic.cc"/>
+            includes="rw_lock_generic.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="rw_lock_posix.cc"/>
+            includes="rw_lock_posix.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="sleep.cc"/>
+            includes="sleep.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="sort.cc"/>
+            includes="sort.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="thread.cc"/>
+            includes="thread.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="thread_posix.cc"/>
+            includes="thread_posix.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="tick_util.cc"/>
+            includes="tick_util.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="trace_impl.cc"/>
+            includes="trace_impl.cc"/>
       <fileset dir="${webrtcSrc}/trunk/webrtc/system_wrappers/source/"
-			includes="trace_posix.cc"/>
+            includes="trace_posix.cc"/>
 
       <fileset dir="${src}/native/macosx/coreaudio/lib/"
             includes="libjitsi_webrtc_aec.c"/>