diff --git a/src/cabac.h b/src/cabac.h
index 5a69259c..a79f5ba7 100644
--- a/src/cabac.h
+++ b/src/cabac.h
@@ -45,7 +45,7 @@ typedef struct
   int32_t    bits_left;
   int8_t     only_count;
   bitstream *stream;
-  
+
   // CONTEXTS
   cabac_ctx ctx_sao_merge_flag_model;
   cabac_ctx ctx_sao_type_idx_model;
diff --git a/src/encoder.c b/src/encoder.c
index 6c1f7185..0709a825 100644
--- a/src/encoder.c
+++ b/src/encoder.c
@@ -51,7 +51,7 @@ int8_t g_convert_to_bit[LCU_WIDTH + 1];
 static void add_checksum(encoder_control* encoder);
 static void encode_VUI(encoder_control* encoder);
 static void encode_sao(encoder_control *encoder,
-		       cabac_data *cabac,
+                       cabac_data *cabac,
                        unsigned x_lcu, uint16_t y_lcu,
                        sao_info *sao_luma, sao_info *sao_chroma);
 
@@ -392,7 +392,7 @@ void encode_one_frame(encoder_control* encoder)
   const int is_radl_frame = is_first_frame || is_i_radl || is_p_radl;
 
   picture *pic = encoder->in.cur_pic;
-  
+
   cabac_data cabac;
 
   // Initialize lambda value(s) to use in search
@@ -459,7 +459,7 @@ void encode_one_frame(encoder_control* encoder)
     nal_write(encoder->output,
               is_radl_frame ? NAL_IDR_W_RADL : NAL_TRAIL_R, 0, long_start_code);
   }
-  
+
   // Set CABAC output bitstream
   cabac.stream = encoder->stream;
 
@@ -1266,7 +1266,7 @@ static void encode_sao_merge_flags(sao_info *sao, cabac_data *cabac,
  * \brief Encode SAO information.
  */
 static void encode_sao(encoder_control *encoder,
-		       cabac_data *cabac,
+                       cabac_data *cabac,
                        unsigned x_lcu, uint16_t y_lcu,
                        sao_info *sao_luma, sao_info *sao_chroma)
 {
@@ -1283,7 +1283,7 @@ static void encode_sao(encoder_control *encoder,
 
 
 void encode_coding_tree(encoder_control *encoder, cabac_data *cabac,
-			uint16_t x_ctb, uint16_t y_ctb, uint8_t depth)
+                        uint16_t x_ctb, uint16_t y_ctb, uint8_t depth)
 {
   cu_info *cur_cu = &encoder->in.cur_pic->cu_array[MAX_DEPTH][x_ctb + y_ctb * (encoder->in.width_in_lcu << MAX_DEPTH)];
   uint8_t split_flag = GET_SPLITDATA(cur_cu, depth);
diff --git a/src/encoder.h b/src/encoder.h
index 5439acc8..1f8d0079 100644
--- a/src/encoder.h
+++ b/src/encoder.h
@@ -118,8 +118,8 @@ void encode_coding_tree(encoder_control *encoder, cabac_data *cabac, uint16_t x_
                         uint16_t y_ctb, uint8_t depth);
 
 void encode_last_significant_xy(cabac_data *cabac,
-				uint8_t lastpos_x, uint8_t lastpos_y, 
-				uint8_t width, uint8_t height,
+                                uint8_t lastpos_x, uint8_t lastpos_y,
+                                uint8_t width, uint8_t height,
                                 uint8_t type, uint8_t scan);
 void encode_coeff_nxn(encoder_control *encoder, cabac_data *cabac, int16_t *coeff, uint8_t width,
                       uint8_t type, int8_t scan_mode, int8_t tr_skip);
diff --git a/src/global.h b/src/global.h
index 45e08668..66d489c6 100644
--- a/src/global.h
+++ b/src/global.h
@@ -61,7 +61,7 @@ typedef int16_t coefficient;
 #define MAX_INTER_SEARCH_DEPTH 3
 #define MIN_INTER_SEARCH_DEPTH 0
 
-#define MAX_INTRA_SEARCH_DEPTH 4 
+#define MAX_INTRA_SEARCH_DEPTH 4
 #define MIN_INTRA_SEARCH_DEPTH 1
 
 #define MAX_DEPTH 3  /*!< spec: log2_diff_max_min_luma_coding_block_size */
diff --git a/src/interface_main.c b/src/interface_main.c
index c6412c92..c5063e4d 100644
--- a/src/interface_main.c
+++ b/src/interface_main.c
@@ -4,11 +4,11 @@
  *
  * This file is needed for Visual Studio, because it will not link the main
  * function from the .lib if the project has no .c files.
- * 
- * \author Marko Viitanen ( fador@iki.fi ), 
+ *
+ * \author Marko Viitanen ( fador@iki.fi ),
  *         Tampere University of Technology,
  *         Department of Pervasive Computing.
- * \author Ari Koivula ( ari@koivu.la ), 
+ * \author Ari Koivula ( ari@koivu.la ),
  *         Tampere University of Technology,
  *         Department of Pervasive Computing.
  */
diff --git a/src/rdo.c b/src/rdo.c
index 6db99bb0..00c31283 100644
--- a/src/rdo.c
+++ b/src/rdo.c
@@ -107,7 +107,7 @@ int32_t get_coeff_cost(encoder_control *encoder, cabac_data *cabac, coefficient
 
   // Store cabac state
   memcpy(&temp_cabac,cabac,sizeof(cabac_data));
-  
+
   // Clear bytes and bits and set mode to "count"
   cabac->only_count = 1;
   cabac->num_buffered_bytes = 0;
@@ -156,7 +156,7 @@ int32_t get_coeff_cost(encoder_control *encoder, cabac_data *cabac, coefficient
  * From HM 12.0
  */
 double get_ic_rate_cost  (cabac_data *cabac,
-			  uint32_t abs_level,
+                          uint32_t abs_level,
                           uint16_t ctx_num_one,
                           uint16_t ctx_num_abs,
                           uint16_t abs_go_rice,
diff --git a/src/search.c b/src/search.c
index 5338dd18..0c593343 100644
--- a/src/search.c
+++ b/src/search.c
@@ -725,7 +725,7 @@ static int search_cu_intra(encoder_control *encoder,
  * here as (coefficient_sum * 1.5) * lambda)
  */
 static int lcu_get_final_cost(encoder_control *encoder,
-			      cabac_data *cabac,
+                              cabac_data *cabac,
                               const int x_px, const int y_px,
                               const int depth, lcu_t *lcu)
 {