diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 9509980b6f..ae518e5c83 100644
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -456,11 +456,10 @@ C_COMPILER = env.subst('$CC')
 C_CCFLAGS = env.subst('$CCFLAGS').split()
 # if we use ms vc, the commands are fine (cl.exe and link.exe)
 if use_vc:
-    # /TP treat all source code as C++
     # C4819: The file contains a character that cannot be represented
     #   in the current code page (number)
     # C4996: foo was decleared deprecated
-    CCFLAGS_required.extend(['/TP', '/EHsc'])
+    CCFLAGS_required.append('/EHsc')
     if mode == 'debug':
         CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
         # the flags are also needed in C mode (for intl lib)
diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py
index 2baa5eef40..984261abc7 100644
--- a/development/scons/scons_utils.py
+++ b/development/scons/scons_utils.py
@@ -228,7 +228,7 @@ int main()
 }
 '''
     conf.Message('Checking for the use of global cstd... ')
-    ret = conf.TryLink(check_global_cstd_source, '.c')
+    ret = conf.TryLink(check_global_cstd_source, '.cpp')
     conf.Result(ret)
     return ret
 
@@ -407,7 +407,7 @@ int main() {
 }
 '''
     conf.Message('Checking if the declaration of iconv needs const... ')
-    ret = conf.TryLink(check_iconv_const, '.c')
+    ret = conf.TryLink(check_iconv_const, '.cpp')
     conf.Result(ret)
     return ret
 
diff --git a/status.15x b/status.15x
index a495340c2e..d07ef7d93d 100644
--- a/status.15x
+++ b/status.15x
@@ -95,3 +95,4 @@ What's new
 
 - Better alignment in the version info output.
 
+- Remove /TP (force to use C++ compiler) option from scons/msvc.