diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 4e567e47d9f..af6d0c37d93 100644
--- 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
index 16e9bb56107..7012caf5a1b 100644
--- 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
index 24acc186818..6f2e7c5744c 100644
--- 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
index 71af18b3b3f..ddbb6083c35 100644
--- 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
index 090b698a6e7..6e1a733fa2d 100644
--- 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
index 6926183974b..6159a9b8129 100644
--- 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
index 2949d3c57a7..c53e3b61970 100644
--- 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
index 8884a03fc48..2f09bc211ce 100644
--- 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
index 53257591273..ed44610f726 100644
--- 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
index c4827157988..77b38f00767 100644
--- 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
index 68b6580d270..1323ea8d13c 100644
--- 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
index 44d10f17c60..868da63444e 100644
--- 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
index 0fb23203718..cfb3c3598c5 100644
--- 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
index d0175b2997f..2cc7ba7a790 100644
--- 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
index 249d724fae9..8b1dd2c45c4 100644
--- 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 b/lib/cppcheckstd.h
similarity index 100%
rename from lib/standards.h
rename to lib/cppcheckstd.h
diff --git a/lib/filesettings.h b/lib/filesettings.h
index 3149421c629..89ca23f4328 100644
--- 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
index acd7842224f..be4d45b350c 100644
--- 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
index 1460a5a776a..1ac30b2bc39 100644
--- 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
index b5b19a197b2..afbd5e915f6 100644
--- 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
index 23db06c4e50..5e3e879e19c 100644
--- 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
index 4673c4859e6..79d1145a870 100644
--- 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
index 123ef5ca898..6044a5af00c 100644
--- 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
index f8f213b13df..f2312c3217e 100644
--- 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
index 750fd6653e0..6adab50ee9f 100644
--- 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
index cae78e850eb..d29f8b8a688 100644
--- 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
index a0ec72c1580..18c888b3a52 100644
--- 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
index b6528d9a9e6..2adb8ad33ab 100644
--- 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
index 1291993990d..90a99a82c7c 100644
--- 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
index cc98703011a..eb366691a94 100644
--- 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
index 1e476a14ec5..83a453369ad 100644
--- 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
index 764eb67bdee..28d079dd560 100644
--- 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
index 023d2ebde31..d9a730c715c 100644
--- 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
index 333f850d07d..9bbe77170cb 100644
--- 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
index 5983ae66a3a..355abfa7f6f 100644
--- 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
index 5a0bd106812..79c4cc954b0 100644
--- 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
index 35e86e0dbb8..8713c9acfd1 100644
--- 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
index c67767db0ba..d50d8ea4520 100644
--- 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
index 038d1ea0b01..bba89dcacc5 100644
--- 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
index 54af2d0a1c3..31895046fdc 100644
--- 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
index 35b25175023..2f45c83431a 100644
--- 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
index 9e495640523..5a421d9090d 100644
--- 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
index 13057735513..e8491ace879 100644
--- 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
index c815cb8aa01..59f8eefbc2e 100644
--- 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
index ef6b774181a..5467e351436 100644
--- 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>
diff --git a/test/testfunctions.cpp b/test/testfunctions.cpp
index da589c765fe..5bd20e370ab 100644
--- a/test/testfunctions.cpp
+++ b/test/testfunctions.cpp
@@ -22,7 +22,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <cstddef>
 #include <string>
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
index 5e6db0163c8..616e5feebf2 100644
--- a/test/testimportproject.cpp
+++ b/test/testimportproject.cpp
@@ -21,7 +21,7 @@
 #include "importproject.h"
 #include "redirect.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "xml.h"
 
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
index a531ac4cba9..60830a03990 100644
--- a/test/testlibrary.cpp
+++ b/test/testlibrary.cpp
@@ -21,7 +21,7 @@
 #include "helpers.h"
 #include "library.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "tokenlist.h"
 
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index a2f9526162c..372a92ba4b5 100644
--- a/test/testmathlib.cpp
+++ b/test/testmathlib.cpp
@@ -18,7 +18,7 @@
 
 #include "fixture.h"
 #include "mathlib.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "tokenlist.h"
 
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index ee971fd44a8..cb570301ef5 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -24,7 +24,7 @@
 #include "helpers.h"
 #include "library.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 
 #include <cstddef>
diff --git a/test/testother.cpp b/test/testother.cpp
index 50581a332c5..085c3800a8f 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -22,7 +22,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <cstddef>
 #include <sstream>
diff --git a/test/testpath.cpp b/test/testpath.cpp
index 7c181e28afb..945f27b5e00 100644
--- a/test/testpath.cpp
+++ b/test/testpath.cpp
@@ -19,7 +19,7 @@
 #include "path.h"
 #include "fixture.h"
 #include "helpers.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <initializer_list>
 #include <list>
diff --git a/test/testplatform.cpp b/test/testplatform.cpp
index c0f7bb2c017..f88ed23fd15 100644
--- a/test/testplatform.cpp
+++ b/test/testplatform.cpp
@@ -18,7 +18,7 @@
 
 #include "platform.h"
 #include "fixture.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <string>
 
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 66b3e24062f..aaf607bea3b 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -26,7 +26,7 @@
 #include "platform.h"
 #include "preprocessor.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "tokenlist.h"
 #include "fixture.h"
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
index 1866234ac78..fc46c38db0a 100644
--- a/test/testprocessexecutor.cpp
+++ b/test/testprocessexecutor.cpp
@@ -25,7 +25,7 @@
 #include "processexecutor.h"
 #include "redirect.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "timer.h"
 
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
index 494127fbee8..0368e25912e 100644
--- a/test/testsimplifytemplate.cpp
+++ b/test/testsimplifytemplate.cpp
@@ -20,7 +20,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "templatesimplifier.h"
 #include "token.h"
 #include "tokenize.h"
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index f55b1e83fc7..980edeee7ac 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -20,7 +20,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "fixture.h"
 #include "token.h"
 
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index a24131dd667..27b6b058419 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -20,7 +20,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
index feb760e5381..cfb995a7215 100644
--- a/test/testsingleexecutor.cpp
+++ b/test/testsingleexecutor.cpp
@@ -23,7 +23,7 @@
 #include "redirect.h"
 #include "settings.h"
 #include "singleexecutor.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "timer.h"
 
diff --git a/test/teststandards.cpp b/test/teststandards.cpp
index 0786021dfc1..29d070cf830 100644
--- a/test/teststandards.cpp
+++ b/test/teststandards.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "fixture.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 class TestStandards : public TestFixture {
 public:
diff --git a/test/teststl.cpp b/test/teststl.cpp
index 2c4669dbeca..8211abf0f58 100644
--- a/test/teststl.cpp
+++ b/test/teststl.cpp
@@ -21,7 +21,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "utils.h"
 
 #include <cstddef>
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 1f572bd2eb2..860530fba2b 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -27,7 +27,7 @@
 #include "processexecutor.h"
 #include "settings.h"
 #include "singleexecutor.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "threadexecutor.h"
 
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
index 106a5bc9078..1690bf027c9 100644
--- a/test/testthreadexecutor.cpp
+++ b/test/testthreadexecutor.cpp
@@ -24,7 +24,7 @@
 #include "helpers.h"
 #include "redirect.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "suppressions.h"
 #include "threadexecutor.h"
 #include "timer.h"
diff --git a/test/testtoken.cpp b/test/testtoken.cpp
index 1a94e092ac9..75e2f4e4f0d 100644
--- a/test/testtoken.cpp
+++ b/test/testtoken.cpp
@@ -19,7 +19,7 @@
 #include "fixture.h"
 #include "helpers.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "tokenlist.h"
 #include "vfvalue.h"
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 70b78a44250..0726432d346 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -23,7 +23,7 @@
 #include "platform.h"
 #include "preprocessor.h" // usually tests here should not use preprocessor...
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "tokenize.h"
 #include "tokenlist.h"
diff --git a/test/testtokenlist.cpp b/test/testtokenlist.cpp
index 4e658743f92..45905ff1a52 100644
--- a/test/testtokenlist.cpp
+++ b/test/testtokenlist.cpp
@@ -22,7 +22,7 @@
 #include "path.h"
 #include "platform.h"
 #include "preprocessor.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "tokenlist.h"
 
diff --git a/test/testtype.cpp b/test/testtype.cpp
index bf36182c59a..b6f9a9360e8 100644
--- a/test/testtype.cpp
+++ b/test/testtype.cpp
@@ -22,7 +22,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 
 #include <cstddef>
 #include <string>
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 79ad6e45b30..574ede56bf0 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -22,7 +22,7 @@
 #include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "token.h"
 #include "vfvalue.h"
 
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index 6f1ea052abe..3d728834a84 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -19,7 +19,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
-#include "standards.h"
+#include "cppcheckstd.h"
 #include "fixture.h"
 #include "token.h"