diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 0889e2888..d9259c394 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -645,22 +645,11 @@ static simplecpp::DUI createDUI(const Settings &mSettings, const std::string &cf
         dui.defines.push_back(s);
     }
 
-    if (Path::isCPP(filename)) {
-        if (mSettings.standards.cpp == Standards::CPP11)
-            dui.defines.emplace_back("__cplusplus=201103L");
-        else if (mSettings.standards.cpp == Standards::CPP14)
-            dui.defines.emplace_back("__cplusplus=201402L");
-        else if (mSettings.standards.cpp == Standards::CPP17)
-            dui.defines.emplace_back("__cplusplus=201703L");
-        else if (mSettings.standards.cpp == Standards::CPP20)
-            dui.defines.emplace_back("__cplusplus=202002L");
-        else
-            dui.defines.emplace_back("__cplusplus");
-    }
-
     dui.undefined = mSettings.userUndefs; // -U
     dui.includePaths = mSettings.includePaths; // -I
     dui.includes = mSettings.userIncludes;  // --include
+    if (Path::isCPP(filename))
+        dui.std = mSettings.standards.getCPP();
     return dui;
 }