diff --git a/checkstyle.json b/checkstyle.json
index dae5a33a9..d41a6d617 100644
--- a/checkstyle.json
+++ b/checkstyle.json
@@ -64,6 +64,10 @@
       },
       "type": "CodeSimilarity"
     },
+    {
+      "props": {},
+      "type": "CommentedOutCode"
+    },
     {
       "props": {
         "policy": "aligned",
@@ -76,7 +80,7 @@
       "props": {
         "ignoreExtern": true,
         "format": "^[A-Z][A-Z0-9]*(_[A-Z0-9_]+)*$",
-        "tokens": ["INLINE"]
+        "tokens": ["INLINE", "NOTINLINE"]
       },
       "type": "ConstantName"
     },
@@ -338,6 +342,13 @@
       "props": {},
       "type": "MultipleVariableDeclarations"
     },
+    {
+      "props": {
+        "allowSingleLineStatement": true,
+        "tokens": ["FOR", "IF", "ELSE_IF", "WHILE", "DO_WHILE"]
+      },
+      "type": "NeedBraces"
+    },
     {
       "props": {
         "max": 3,
@@ -375,7 +386,6 @@
         "oldFunctionTypePolicy": "none",
         "unaryOpPolicy": "none",
         "intervalOpPolicy": "none",
-
         "newFunctionTypePolicy": "around",
         "ternaryOpPolicy": "around",
         "boolOpPolicy": "around",
@@ -537,6 +547,13 @@
       },
       "type": "Spacing"
     },
+    {
+      "props": {
+        "policy": "onlySingle",
+        "allowException": true
+      },
+      "type": "StringLiteral"
+    },
     {
       "props": {
         "format": "^\\s*(TODO|FIXME|HACK|XXX|BUG)"
@@ -559,12 +576,6 @@
       "props": {},
       "type": "TrailingWhitespace"
     },
-    {
-      "props": {
-        "ignoreEnumAbstractValues": true
-      },
-      "type": "Type"
-    },
     {
       "props": {
         "tokens": ["CLASS_DEF", "ENUM_DEF", "INTERFACE_DEF", "TYPEDEF_DEF"]
@@ -596,12 +607,6 @@
       },
       "type": "UnusedLocalVar"
     },
-    {
-      "props": {
-        "severity": "IGNORE"
-      },
-      "type": "VariableInitialisation"
-    },
     {
       "props": {
         "typeHintPolicy": "enforce_all",