diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 2ed39edd1ab..23a5d21ecf6 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -1134,15 +1134,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
                     codeWithoutCfg = preprocessor.getcode(currentConfig, files, true);
                 });
 
-                if (startsWith(codeWithoutCfg,"#file"))
-                    codeWithoutCfg.insert(0U, "//");
                 std::string::size_type pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#file",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
-                while ((pos = codeWithoutCfg.find("\n#endfile",pos)) != std::string::npos)
-                    codeWithoutCfg.insert(pos+1U, "//");
-                pos = 0;
                 while ((pos = codeWithoutCfg.find(Preprocessor::macroChar,pos)) != std::string::npos)
                     codeWithoutCfg[pos] = ' ';
                 mErrorLogger.reportOut(codeWithoutCfg, Color::Reset);
diff --git a/test/cli/other_test.py b/test/cli/other_test.py
index 38391ad0720..b9764fb68a6 100644
--- a/test/cli/other_test.py
+++ b/test/cli/other_test.py
@@ -3853,3 +3853,41 @@ def test_unmatched_file(tmp_path):  # #14248 / #14249
         f'{lib_file}:-1:0: information: Unmatched suppression: error6 [unmatchedSuppression]'
     ]
     assert ret == 0, stdout
+
+
+# The implementation for "A::a" is missing - so don't check if "A::b" is used or not
+def test_unused_private_function_incomplete_impl(tmpdir):
+    test_inc = os.path.join(tmpdir, 'test.h')
+    with open(test_inc, 'wt') as f:
+        f.write(
+"""
+class A
+{
+public:
+    A();
+    void a();
+private:
+    void b();
+};
+""")
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write(
+"""
+#include "test.h"
+
+A::A() { }
+void A::b() { }
+""")
+
+    args = [
+        '-q',
+        '--template=simple',
+        test_file
+    ]
+
+    ret, stdout, stderr = cppcheck(args)
+    assert stdout == ''
+    assert stderr.splitlines() == []
+    assert ret == 0, stdout
\ No newline at end of file
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index ada3a7e5c45..56b41e79529 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -144,7 +144,7 @@ class TestPreprocessor : public TestFixture {
             cfgs = preprocessor.getConfigs();
         for (const std::string & config : cfgs) {
             try {
-                const bool writeLocations = (strstr(code, "#file") != nullptr) || (strstr(code, "#include") != nullptr);
+                const bool writeLocations = (strstr(code, "#include") != nullptr);
                 cfgcode[config] = preprocessor.getcode(config, files, writeLocations);
             } catch (const simplecpp::Output &) {
                 cfgcode[config] = "";
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
index 5a364347163..6a158a33437 100644
--- a/test/testunusedprivfunc.cpp
+++ b/test/testunusedprivfunc.cpp
@@ -58,7 +58,6 @@ class TestUnusedPrivateFunction : public TestFixture {
 
         TEST_CASE(classInClass);
         TEST_CASE(sameFunctionNames);
-        TEST_CASE(incompleteImplementation);
 
         TEST_CASE(derivedClass);   // skip warning for derived classes. It might be a virtual function.
 
@@ -482,24 +481,6 @@ class TestUnusedPrivateFunction : public TestFixture {
         ASSERT_EQUALS("", errout_str());
     }
 
-    void incompleteImplementation() {
-        // The implementation for "A::a" is missing - so don't check if
-        // "A::b" is used or not
-        check("#file \"test.h\"\n"
-              "class A\n"
-              "{\n"
-              "public:\n"
-              "    A();\n"
-              "    void a();\n"
-              "private:\n"
-              "    void b();\n"
-              "};\n"
-              "#endfile\n"
-              "A::A() { }\n"
-              "void A::b() { }");
-        ASSERT_EQUALS("", errout_str());
-    }
-
     void derivedClass() {
         // skip warning in derived classes in case the base class is invisible
         check("class derived : public base\n"