diff --git a/uncrustify_headers.cfg b/uncrustify_headers.cfg
index 285ac77c1f..3ad9618d48 100644
--- a/uncrustify_headers.cfg
+++ b/uncrustify_headers.cfg
@@ -257,7 +257,7 @@ sp_paren_paren                           = ignore   # ignore/add/remove/force
 sp_balance_nested_parens                 = false    # false/true
 
 # Add or remove space between ')' and '{'
-sp_paren_brace                           = ignore   # ignore/add/remove/force
+sp_paren_brace                           = force# ignore/add/remove/force
 
 # Add or remove space before pointer star '*'
 sp_before_ptr_star                       = ignore   # ignore/add/remove/force
@@ -652,7 +652,7 @@ align_func_params                        = true # false/true
 align_same_func_call_params              = false    # false/true
 
 # The span for aligning variable definitions (0=don't align)
-align_var_def_span                       = 3        # number
+align_var_def_span                       = 2        # number
 
 # How to align the star in variable definitions.
 #  0=Part of the type     'void *   foo;'
@@ -1295,7 +1295,7 @@ cmt_width                                = 78        # number
 # 0: no reflowing (apart from the line wrapping due to cmt_width)
 # 1: no touching at all
 # 2: full reflow
-cmt_reflow_mode                          = 0        # number
+cmt_reflow_mode                          = 1        # number
 
 # If false, disable all multi-line comment changes, including cmt_width. keyword substitution, and leading chars.
 # Default is true.