danmar · reshmavk · Jan 7, 2026
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -34,7 +34,7 @@
 #include "pathmatch.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "timer.h"
 #include "utils.h"

diff --git a/cli/cmdlineparser.h b/cli/cmdlineparser.h
@@ -27,7 +27,7 @@
 
 #include "cmdlinelogger.h"
 #include "filesettings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "utils.h"
 
 class Settings;

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
@@ -25,7 +25,7 @@
 #include "filesettings.h"
 #include "path.h"
 #include "pathmatch.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "utils.h"
 
 #include <cstring>

diff --git a/frontend/frontend.h b/frontend/frontend.h
@@ -19,7 +19,7 @@
 #ifndef FRONTEND_H
 #define FRONTEND_H
 
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <list>
 

diff --git a/gui/checkthread.cpp b/gui/checkthread.cpp
@@ -26,7 +26,7 @@
 #include "errortypes.h"
 #include "filesettings.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "threadresult.h"
 #include "utils.h"
 

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -47,7 +47,7 @@
 #include "showtypes.h"
 #include "statsdialog.h"
 #include "settingsdialog.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "threadhandler.h"
 #include "threadresult.h"

diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -22,7 +22,7 @@
 #include "astutils.h"
 #include "library.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "errorlogger.h"
 #include "errortypes.h"

diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -28,7 +28,7 @@
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"

diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -26,7 +26,7 @@
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"

diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -24,7 +24,7 @@
 #include "mathlib.h"
 #include "pathanalysis.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"

diff --git a/lib/checktype.cpp b/lib/checktype.cpp
@@ -25,7 +25,7 @@
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"

diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -21,7 +21,7 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -33,7 +33,7 @@
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "symboldatabase.h"
 #include "timer.h"

diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
@@ -163,7 +163,7 @@
     <ClInclude Include="settings.h" />
     <ClInclude Include="smallvector.h" />
     <ClInclude Include="sourcelocation.h" />
-    <ClInclude Include="standards.h" />
+    <ClInclude Include="cppcheckstd.h" />
     <ClInclude Include="summaries.h" />
     <ClInclude Include="suppressions.h" />
     <ClInclude Include="symboldatabase.h" />

diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters
@@ -427,7 +427,7 @@
     <ClInclude Include="smallvector.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="standards.h">
+    <ClInclude Include="cppcheckstd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="valueptr.h">

diff --git a/lib/standards.h → lib/cppcheckstd.h b/lib/standards.h → lib/cppcheckstd.h
diff --git a/lib/filesettings.h b/lib/filesettings.h
@@ -22,7 +22,7 @@
 #include "config.h"
 #include "path.h"
 #include "platform.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <list>
 #include <set>

diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -21,7 +21,7 @@
 #include "path.h"
 #include "pathmatch.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "token.h"
 #include "tokenlist.h"

diff --git a/lib/keywords.h b/lib/keywords.h
@@ -19,7 +19,7 @@
 #ifndef keywordsH
 #define keywordsH
 
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <string>
 #include <unordered_set>

diff --git a/lib/library.h b/lib/library.h
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "utils.h"
 
 #include <array>

diff --git a/lib/path.h b/lib/path.h
@@ -22,7 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <set>
 #include <string>

diff --git a/lib/platform.h b/lib/platform.h
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "mathlib.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <cassert>
 #include <climits>

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -25,7 +25,7 @@
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "utils.h"
 

diff --git a/lib/preprocessor.h b/lib/preprocessor.h
@@ -22,7 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <cstddef>
 #include <cstdint>

diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -24,7 +24,7 @@
 #include "library.h"
 #include "mathlib.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenlist.h"

diff --git a/lib/settings.h b/lib/settings.h
@@ -26,7 +26,7 @@
 #include "errortypes.h"
 #include "library.h"
 #include "platform.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "checkers.h"
 
 #include <algorithm>

diff --git a/lib/standards.cpp b/lib/standards.cpp
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "utils.h"
 
 #include <utility>

diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -28,7 +28,7 @@
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "templatesimplifier.h"
 #include "token.h"
 #include "tokenize.h"

diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -22,7 +22,7 @@
 #include "errortypes.h"
 #include "mathlib.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -28,7 +28,7 @@
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "summaries.h"
 #include "symboldatabase.h"
 #include "templatesimplifier.h"

diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -28,7 +28,7 @@
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 
 #include <algorithm>

diff --git a/lib/tokenlist.h b/lib/tokenlist.h
@@ -22,7 +22,7 @@
 //---------------------------------------------------------------------------
 
 #include "config.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <cstddef>
 #include <cstdint>

diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -96,7 +96,7 @@
 #include "settings.h"
 #include "smallvector.h"
 #include "sourcelocation.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "timer.h"
 #include "token.h"

diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
@@ -23,7 +23,7 @@
 #include "path.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "vfvalue.h"

diff --git a/test/fixture.h b/test/fixture.h
@@ -27,7 +27,7 @@
 #include "errortypes.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <cstddef>
 #include <cstdint>

diff --git a/test/helpers.h b/test/helpers.h
@@ -22,7 +22,7 @@
 #include "library.h"
 #include "path.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "tokenize.h"
 #include "tokenlist.h"
 

diff --git a/test/testanalyzerinformation.cpp b/test/testanalyzerinformation.cpp
@@ -21,7 +21,7 @@
 #include "errorlogger.h"
 #include "filesettings.h"
 #include "fixture.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <list>
 #include <sstream>

diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -19,7 +19,7 @@
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"

diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -29,7 +29,7 @@
 #include "platform.h"
 #include "redirect.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "timer.h"
 #include "utils.h"

diff --git a/test/testconstructors.cpp b/test/testconstructors.cpp
@@ -20,7 +20,7 @@
 #include "errortypes.h"
 #include "fixture.h"
 #include "helpers.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "settings.h"
 
 #include <cstddef>

diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
@@ -28,7 +28,7 @@
 #include "preprocessor.h"
 #include "redirect.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 
 #include <algorithm>

diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
@@ -24,7 +24,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 
 #include <list>

diff --git a/test/testfilelister.cpp b/test/testfilelister.cpp
@@ -21,7 +21,7 @@
 #include "fixture.h"
 #include "path.h"
 #include "pathmatch.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <algorithm>
 #include <list>

diff --git a/test/testfilesettings.cpp b/test/testfilesettings.cpp
@@ -18,7 +18,7 @@
 
 #include "filesettings.h"
 #include "fixture.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 class TestFileSettings : public TestFixture {
 public:

diff --git a/test/testfrontend.cpp b/test/testfrontend.cpp
@@ -21,7 +21,7 @@
 #include "fixture.h"
 #include "frontend.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <list>
 #include <string>