diff --git a/config/intellij-idea-inspections.xml b/config/intellij-idea-inspections.xml
index a75d4501e18..f1741a14de6 100644
--- a/config/intellij-idea-inspections.xml
+++ b/config/intellij-idea-inspections.xml
@@ -501,6 +501,7 @@
     <inspection_tool class="Dependency" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="DeprecatedCallableAddReplaceWith" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="DeprecatedClassUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="DeprecatedIsStillUsed" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="Deprecation" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="DeserializableClassInSecureContext" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="DesignForExtension" enabled="false" level="ERROR" enabled_by_default="false" />
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
index 98f5aa20d35..d464760c5c9 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/api/FileContents.java
@@ -92,7 +92,7 @@ public FileContents(FileText text) {
     @Override
     public void reportSingleLineComment(String type, int startLineNo,
             int startColNo) {
-        reportCppComment(startLineNo, startColNo);
+        reportSingleLineComment(startLineNo, startColNo);
     }
 
     /**
@@ -111,7 +111,7 @@ public void reportSingleLineComment(int startLineNo, int startColNo) {
     @Override
     public void reportBlockComment(String type, int startLineNo,
             int startColNo, int endLineNo, int endColNo) {
-        reportCComment(startLineNo, startColNo, endLineNo, endColNo);
+        reportBlockComment(startLineNo, startColNo, endLineNo, endColNo);
     }
 
     /**
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java
index 344d03fa440..a5822a61052 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/AbstractTypeAwareCheck.java
@@ -41,6 +41,7 @@
  * @author Oliver Burn
  * @deprecated Checkstyle is not type aware tool and all Checks derived from this
  *     class are potentially unstable.
+ * @noinspection DeprecatedIsStillUsed
  */
 @Deprecated
 public abstract class AbstractTypeAwareCheck extends AbstractCheck {
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java
index 568017c405f..28e52a6fac4 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/api/FileContentsTest.java
@@ -41,9 +41,11 @@ public void testDeprecatedCtor() {
     @SuppressWarnings("deprecation")
     public void testDeprecatedAbbreviatedMethod() {
         // just to make UT coverage 100%
-        final FileContents o = new FileContents("filename", "1", "2");
+        final FileContents o = new FileContents("filename", "123", "456");
         o.getCppComments();
         o.getCComments();
+        o.reportCppComment(1, 1);
+        o.reportCComment(1, 1, 1, 1);
     }
 
     @Test