diff --git a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
index 8978ffc443..17f77b48d9 100644
--- a/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
+++ b/.pytool/Plugin/UncrustifyCheck/UncrustifyCheck.py
@@ -110,7 +110,7 @@ class UncrustifyCheck(ICiBuildPlugin):
     # A package can add any additional paths with "AdditionalIncludePaths"
     # A package can remove any of these paths with "IgnoreStandardPaths"
     #
-    STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h")
+    STANDARD_PLUGIN_DEFINED_PATHS = ("*.c", "*.h", "*.cpp")
 
     #
     # The Uncrustify application path should set in this environment variable
diff --git a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
index 8506c33337..d7e86a6e57 100644
--- a/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
+++ b/.pytool/Plugin/UncrustifyCheck/uncrustify.cfg
@@ -215,7 +215,7 @@ indent_braces                   = false
 indent_braces_no_class          = false
 indent_braces_no_func           = true
 indent_braces_no_struct         = false
-indent_class                    = false
+indent_class                    = true
 indent_class_colon              = false
 indent_cmt_with_tabs            = false         # Whether to indent comments that are not at a brace level with tabs on
                                                 # a tabstop. Requires indent_with_tabs=2. If false, will use spaces.
@@ -223,7 +223,7 @@ indent_col1_comment             = true
 indent_col1_multi_string_literal= true
 indent_comma_paren              = true
 indent_else_if                  = true
-indent_extern                   = false
+indent_extern                   = true
 indent_first_bool_expr          = true
 
 indent_func_def_param_paren_pos_threshold = 0