diff --git a/convert.ml b/convert.ml
index 50c629a28e5a7c4391ee0f43d88be6b72bc1fc72..020554306d4af8dc892b490ee8e9e0b1cf25f8c8 100644
--- a/convert.ml
+++ b/convert.ml
@@ -2146,21 +2146,21 @@ and convert_init_statement env init does_remove_virtual =
           let env = Convert_env.add_local_var env id_name typ.plain_type in
           match init_val with
           | None ->
-	    let init = (id_name, decl JUSTBASE,[],loc),NO_INIT in
-	    (env, aux, init::l, def, base)
+      let init = (id_name, decl JUSTBASE,[],loc),NO_INIT in
+      (env, aux, init::l, def, base)
           | Some init ->
             let var = Local { prequalification = []; decl_name = id_name } in
             let env,aux',init, def' =
               convert_initializer env typ var init does_remove_virtual
             in
-	    let def = match def' with
-	      | None -> def
-	      | Some stmt -> stmt::def
-	    in
-	    let init = (id_name, decl JUSTBASE,attrs,loc),init in
-	    env, merge_aux aux' aux, init::l, def, base)
-	init_declarator_list
-	(env, empty_aux, [], [], None)
+      let def = match def' with
+        | None -> def
+        | Some stmt -> stmt::def
+      in
+      let init = (id_name, decl JUSTBASE,attrs,loc),init in
+      env, merge_aux aux' aux, init::l, def, base)
+  init_declarator_list
+  (env, empty_aux, [], [], None)
     in
     let l = List.rev l in
     if l = [] then
@@ -2776,8 +2776,8 @@ let iter_on_array ?(incr=true) env idx length mk_body =
   let init =
     if incr then const_int 0
     else BINARY(SUB, length,
-		{expr_loc=loc;
-		 expr_node=const_int 1})
+    {expr_loc=loc;
+    expr_node=const_int 1})
   in
   let last = if incr then length.expr_node else const_int 0 in
   let last_test = if incr then LT else GE in
diff --git a/tests/basic/oracle/placement_new.res.oracle b/tests/basic/oracle/placement_new.res.oracle
index f1b04d623fa5c7f00e8f7210ae4d1eca0840fd43..8b784187f7089075a94b83ecb50c2994a67dcac5 100644
--- a/tests/basic/oracle/placement_new.res.oracle
+++ b/tests/basic/oracle/placement_new.res.oracle
@@ -40,6 +40,7 @@ struct __fc_lldiv_t {
    long long rem ;
 };
 typedef struct __fc_lldiv_t lldiv_t;
+typedef long wchar_t;
 typedef size_t size_t;
 struct T;
 struct T {
diff --git a/tests/basic/oracle/placement_newb.res.oracle b/tests/basic/oracle/placement_newb.res.oracle
index 39905324945b67e7a479d3a95f3402e34b818e47..86182e2aa2cc7516fcb61269c5e5d35c4bb73e4b 100644
--- a/tests/basic/oracle/placement_newb.res.oracle
+++ b/tests/basic/oracle/placement_newb.res.oracle
@@ -18,6 +18,7 @@ struct __fc_lldiv_t {
    long long rem ;
 };
 typedef struct __fc_lldiv_t lldiv_t;
+typedef long wchar_t;
 void *malloc(size_t size);
 
 void free(void *p);
diff --git a/tests/stl/oracle/stl_shared_ptr_mistake10.res.oracle b/tests/stl/oracle/stl_shared_ptr_mistake10.res.oracle
index a98a8a7ee933cf7004e23ca2d8ffffd77c740ac6..8e0031628a80fc4528891d7ebbdc41ade3c1292b 100644
--- a/tests/stl/oracle/stl_shared_ptr_mistake10.res.oracle
+++ b/tests/stl/oracle/stl_shared_ptr_mistake10.res.oracle
@@ -116,6 +116,7 @@ struct __fc_lldiv_t {
    long long rem ;
 };
 typedef struct __fc_lldiv_t lldiv_t;
+typedef long wchar_t;
 struct Aircraft {
    int m_id ;
    int m_flyCount ;
diff --git a/tests/stl/oracle/stl_shared_ptr_mistake5.res.oracle b/tests/stl/oracle/stl_shared_ptr_mistake5.res.oracle
index 540339c4f0a55df8fe56f23c5f13015f186b4f66..ac8493964ed61757c030250237fe5c0bd9a78ec0 100644
--- a/tests/stl/oracle/stl_shared_ptr_mistake5.res.oracle
+++ b/tests/stl/oracle/stl_shared_ptr_mistake5.res.oracle
@@ -113,6 +113,7 @@ struct __fc_lldiv_t {
    long long rem ;
 };
 typedef struct __fc_lldiv_t lldiv_t;
+typedef long wchar_t;
 struct Aircraft {
    int m_id ;
    int m_flyCount ;
diff --git a/tests/stl/oracle/stl_shared_ptr_mistake6.res.oracle b/tests/stl/oracle/stl_shared_ptr_mistake6.res.oracle
index 474773e28a369a709cfe378de0e8b785feba86f0..25559b649ddbe1016be3a16eb66e9a06c8e25364 100644
--- a/tests/stl/oracle/stl_shared_ptr_mistake6.res.oracle
+++ b/tests/stl/oracle/stl_shared_ptr_mistake6.res.oracle
@@ -114,6 +114,7 @@ struct __fc_lldiv_t {
    long long rem ;
 };
 typedef struct __fc_lldiv_t lldiv_t;
+typedef long wchar_t;
 struct Aircraft {
    int m_id ;
    int m_flyCount ;
diff --git a/tests/stl/oracle/stl_system_error.res.oracle b/tests/stl/oracle/stl_system_error.res.oracle
index 27e8e63f101cc88d7d2714d1c8ca1db1f7599704..a33d8294a7aa93d3141900c4f8f9a6f2e2c14e5c 100644
--- a/tests/stl/oracle/stl_system_error.res.oracle
+++ b/tests/stl/oracle/stl_system_error.res.oracle
@@ -104,6 +104,7 @@ struct tm {
    int tm_yday ;
    int tm_isdst ;
 };
+typedef long wchar_t;
 typedef char char_type;
 typedef wchar_t char_type;
 struct __shared_ref_base;