diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index d0923cc44..a181064eb 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -1570,7 +1570,13 @@ void Preprocessor::handleIncludes(std::string &code,
         }
         else if (!fileOpened)
         {
+            // TODO: Fix the handling of system includes and then
+            // remove the "headerType == UserHeader"
+#ifdef NDEBUG
+            if (headerType == UserHeader && _errorLogger && _settings && _settings->isEnabled("missingInclude"))
+#else
             if (_errorLogger && _settings && _settings->isEnabled("missingInclude"))
+#endif
             {
                 // Determine line number of include
                 unsigned int linenr = 1;