diff --git a/CheckHeaders.cpp b/CheckHeaders.cpp
index ee3148dae..26b2d29fb 100644
--- a/CheckHeaders.cpp
+++ b/CheckHeaders.cpp
@@ -25,6 +25,11 @@ void WarningHeaderWithImplementation()
             std::ostringstream ostr;
             ostr << FileLine(tok) << ": Found implementation in header";
             ReportErr(ostr.str());
+
+            // Goto next file..
+            unsigned int fileindex = tok->FileIndex;
+            while ( tok->next && tok->FileIndex == fileindex )
+                tok = tok->next;
         }
     }
 }