From 4149bd2070e0a8beec6dedb238e6fd832a39611b Mon Sep 17 00:00:00 2001
From: kchoi <code.kchoi@gmail.com>
Date: Wed, 7 Sep 2016 14:12:22 -0700
Subject: [PATCH] Fix strict aliasing violation from conditional typedef of
 wchar_t by building entire project as C++ for Unix (#6801)

Enable building CoreCLR as C++ project on Unix

This series of patches fixes the strict aliasing violation from
the conditional typedef of wchar_t in src/pal/inc/pal_char16.h:40

* rename c files to cpp
* modify all cmake files to change .c files to .cpp
* apply c++ linkage to templates
---
 src/ilasm/CMakeLists.txt                      | 11 ++--
 .../prebuilt/{asmparse.c => asmparse.cpp}     |  0
 src/inc/CMakeLists.txt                        |  9 ++-
 src/inc/{xmlparser_i.c => xmlparser_i.cpp}    |  0
 src/pal/inc/mbusafecrt.h                      |  2 +-
 src/pal/inc/pal.h                             |  1 +
 src/pal/inc/pal_char16.h                      |  3 +-
 src/pal/inc/pal_mstypes.h                     |  5 ++
 src/pal/inc/rt/palrt.h                        |  4 ++
 .../idl/{clrdata_i.c => clrdata_i.cpp}        |  0
 .../{clrinternal_i.c => clrinternal_i.cpp}    |  0
 ...pxhosting_i.c => clrprivappxhosting_i.cpp} |  0
 ...lrprivbinding_i.c => clrprivbinding_i.cpp} |  0
 ...lrprivhosting_i.c => clrprivhosting_i.cpp} |  0
 ...inders_i.c => clrprivruntimebinders_i.cpp} |  0
 .../idl/{cordebug_i.c => cordebug_i.cpp}      |  0
 .../idl/{corprof_i.c => corprof_i.cpp}        |  0
 .../prebuilt/idl/{corpub_i.c => corpub_i.cpp} |  0
 .../prebuilt/idl/{corsym_i.c => corsym_i.cpp} |  0
 .../idl/{fusionpriv_i.c => fusionpriv_i.cpp}  |  0
 .../prebuilt/idl/{gchost_i.c => gchost_i.cpp} |  0
 .../idl/{ivalidator_i.c => ivalidator_i.cpp}  |  0
 .../idl/{ivehandler_i.c => ivehandler_i.cpp}  |  0
 .../idl/{mscorsvc_i.c => mscorsvc_i.cpp}      |  0
 .../idl/{sospriv_i.c => sospriv_i.cpp}        |  6 +-
 .../idl/{tlbimpexp_i.c => tlbimpexp_i.cpp}    |  0
 .../idl/{xclrdata_i.c => xclrdata_i.cpp}      |  0
 .../idl/{xcordebug_i.c => xcordebug_i.cpp}    |  0
 src/pal/src/CMakeLists.txt                    | 62 +++++++++----------
 src/pal/src/examples/CMakeLists.txt           |  2 +-
 .../src/examples/{example1.c => example1.cpp} |  0
 src/pal/src/include/pal/palinternal.h         |  1 -
 .../safecrt/{makepath_s.c => makepath_s.cpp}  |  0
 .../safecrt/{mbusafecrt.c => mbusafecrt.cpp}  |  0
 .../src/safecrt/{memcpy_s.c => memcpy_s.cpp}  |  0
 .../safecrt/{memmove_s.c => memmove_s.cpp}    |  0
 ...{safecrt_input_s.c => safecrt_input_s.cpp} |  0
 ...afecrt_output_l.c => safecrt_output_l.cpp} |  0
 ...afecrt_output_s.c => safecrt_output_s.cpp} |  0
 ...afecrt_winput_s.c => safecrt_winput_s.cpp} |  0
 ...ecrt_woutput_s.c => safecrt_woutput_s.cpp} |  0
 .../src/safecrt/{snprintf.c => snprintf.cpp}  |  0
 .../{splitpath_s.c => splitpath_s.cpp}        |  0
 .../src/safecrt/{sprintf.c => sprintf.cpp}    |  0
 src/pal/src/safecrt/{sscanf.c => sscanf.cpp}  |  2 +-
 .../src/safecrt/{strcat_s.c => strcat_s.cpp}  |  0
 .../src/safecrt/{strcpy_s.c => strcpy_s.cpp}  |  0
 .../src/safecrt/{strlen_s.c => strlen_s.cpp}  |  2 +-
 .../safecrt/{strncat_s.c => strncat_s.cpp}    |  0
 .../safecrt/{strncpy_s.c => strncpy_s.cpp}    |  0
 .../src/safecrt/{strtok_s.c => strtok_s.cpp}  |  0
 .../src/safecrt/{swprintf.c => swprintf.cpp}  |  0
 .../src/safecrt/{vsprintf.c => vsprintf.cpp}  |  0
 .../src/safecrt/{vswprint.c => vswprint.cpp}  |  0
 .../src/safecrt/{wcscat_s.c => wcscat_s.cpp}  |  0
 .../src/safecrt/{wcscpy_s.c => wcscpy_s.cpp}  |  0
 .../src/safecrt/{wcslen_s.c => wcslen_s.cpp}  |  0
 .../safecrt/{wcsncat_s.c => wcsncat_s.cpp}    |  0
 .../safecrt/{wcsncpy_s.c => wcsncpy_s.cpp}    |  0
 .../src/safecrt/{wcstok_s.c => wcstok_s.cpp}  |  0
 .../{wmakepath_s.c => wmakepath_s.cpp}        |  0
 .../{wsplitpath_s.c => wsplitpath_s.cpp}      |  0
 src/pal/src/safecrt/{xtoa_s.c => xtoa_s.cpp}  |  0
 src/pal/src/safecrt/{xtow_s.c => xtow_s.cpp}  |  0
 src/pal/tests/CMakeLists.txt                  |  5 ++
 .../c_runtime/__iscsym/test1/CMakeLists.txt   |  2 +-
 .../test1/{__iscsym.c => __iscsym.cpp}        |  0
 .../c_runtime/_alloca/test1/CMakeLists.txt    |  2 +-
 .../_alloca/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_ecvt/test1/CMakeLists.txt      |  2 +-
 .../_ecvt/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/_fdopen/test1/CMakeLists.txt    |  2 +-
 .../_fdopen/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_finite/test1/CMakeLists.txt    |  2 +-
 .../_finite/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_fullpath/test1/CMakeLists.txt  |  2 +-
 .../_fullpath/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/_gcvt/test1/CMakeLists.txt      |  2 +-
 .../_gcvt/test1/{_gcvt.c => _gcvt.cpp}        |  0
 .../c_runtime/_gcvt/test2/CMakeLists.txt      |  2 +-
 .../_gcvt/test2/{test2.c => test2.cpp}        |  0
 .../c_runtime/_getw/test1/CMakeLists.txt      |  2 +-
 .../_getw/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/_isnan/test1/CMakeLists.txt     |  2 +-
 .../_isnan/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/_itow/test1/CMakeLists.txt      |  2 +-
 .../_itow/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/_makepath/test1/CMakeLists.txt  |  2 +-
 .../_makepath/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/_mbsdec/test1/CMakeLists.txt    |  2 +-
 .../_mbsdec/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_mbsinc/test1/CMakeLists.txt    |  2 +-
 .../_mbsinc/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_mbslen/test1/CMakeLists.txt    |  2 +-
 .../_mbslen/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_mbsninc/test1/CMakeLists.txt   |  2 +-
 .../_mbsninc/test1/{test1.c => test1.cpp}     |  0
 .../_open_osfhandle/test1/CMakeLists.txt      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../_open_osfhandle/test2/CMakeLists.txt      |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../c_runtime/_putenv/test1/CMakeLists.txt    |  2 +-
 .../_putenv/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_putenv/test2/CMakeLists.txt    |  2 +-
 .../_putenv/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/_putenv/test3/CMakeLists.txt    |  2 +-
 .../_putenv/test3/{test3.c => test3.cpp}      |  0
 .../c_runtime/_putenv/test4/CMakeLists.txt    |  2 +-
 .../_putenv/test4/{test4.c => test4.cpp}      |  0
 .../c_runtime/_putw/test1/CMakeLists.txt      |  2 +-
 .../_putw/test1/{test1.c => test1.cpp}        |  2 +-
 .../palsuite/c_runtime/_snprintf/_snprintf.h  | 28 ++++-----
 .../c_runtime/_snprintf/test1/CMakeLists.txt  |  2 +-
 .../_snprintf/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/_snprintf/test10/CMakeLists.txt |  2 +-
 .../_snprintf/test10/{test10.c => test10.cpp} |  0
 .../c_runtime/_snprintf/test11/CMakeLists.txt |  2 +-
 .../_snprintf/test11/{test11.c => test11.cpp} |  0
 .../c_runtime/_snprintf/test12/CMakeLists.txt |  2 +-
 .../_snprintf/test12/{test12.c => test12.cpp} |  0
 .../c_runtime/_snprintf/test13/CMakeLists.txt |  2 +-
 .../_snprintf/test13/{test13.c => test13.cpp} |  0
 .../c_runtime/_snprintf/test14/CMakeLists.txt |  2 +-
 .../_snprintf/test14/{test14.c => test14.cpp} |  0
 .../c_runtime/_snprintf/test15/CMakeLists.txt |  2 +-
 .../_snprintf/test15/{test15.c => test15.cpp} |  0
 .../c_runtime/_snprintf/test16/CMakeLists.txt |  2 +-
 .../_snprintf/test16/{test16.c => test16.cpp} |  0
 .../c_runtime/_snprintf/test17/CMakeLists.txt |  2 +-
 .../_snprintf/test17/{test17.c => test17.cpp} |  0
 .../c_runtime/_snprintf/test18/CMakeLists.txt |  2 +-
 .../_snprintf/test18/{test18.c => test18.cpp} |  0
 .../c_runtime/_snprintf/test19/CMakeLists.txt |  2 +-
 .../_snprintf/test19/{test19.c => test19.cpp} |  6 +-
 .../c_runtime/_snprintf/test2/CMakeLists.txt  |  2 +-
 .../_snprintf/test2/{test2.c => test2.cpp}    |  0
 .../c_runtime/_snprintf/test3/CMakeLists.txt  |  2 +-
 .../_snprintf/test3/{test3.c => test3.cpp}    |  0
 .../c_runtime/_snprintf/test4/CMakeLists.txt  |  2 +-
 .../_snprintf/test4/{test4.c => test4.cpp}    |  0
 .../c_runtime/_snprintf/test5/CMakeLists.txt  |  2 +-
 .../_snprintf/test5/{test5.c => test5.cpp}    |  0
 .../c_runtime/_snprintf/test6/CMakeLists.txt  |  2 +-
 .../_snprintf/test6/{test6.c => test6.cpp}    |  0
 .../c_runtime/_snprintf/test7/CMakeLists.txt  |  2 +-
 .../_snprintf/test7/{test7.c => test7.cpp}    |  0
 .../c_runtime/_snprintf/test8/CMakeLists.txt  |  2 +-
 .../_snprintf/test8/{test8.c => test8.cpp}    |  0
 .../c_runtime/_snprintf/test9/CMakeLists.txt  |  2 +-
 .../_snprintf/test9/{test9.c => test9.cpp}    |  0
 .../c_runtime/_snwprintf/_snwprintf.h         | 32 +++++-----
 .../c_runtime/_snwprintf/test1/CMakeLists.txt |  2 +-
 .../_snwprintf/test1/{test1.c => test1.cpp}   |  0
 .../_snwprintf/test10/CMakeLists.txt          |  2 +-
 .../test10/{test10.c => test10.cpp}           |  0
 .../_snwprintf/test11/CMakeLists.txt          |  2 +-
 .../test11/{test11.c => test11.cpp}           |  0
 .../_snwprintf/test12/CMakeLists.txt          |  2 +-
 .../test12/{test12.c => test12.cpp}           |  0
 .../_snwprintf/test13/CMakeLists.txt          |  2 +-
 .../test13/{test13.c => test13.cpp}           |  0
 .../_snwprintf/test14/CMakeLists.txt          |  2 +-
 .../test14/{test14.c => test14.cpp}           |  0
 .../_snwprintf/test15/CMakeLists.txt          |  2 +-
 .../test15/{test15.c => test15.cpp}           |  0
 .../_snwprintf/test16/CMakeLists.txt          |  2 +-
 .../test16/{test16.c => test16.cpp}           |  0
 .../_snwprintf/test17/CMakeLists.txt          |  2 +-
 .../test17/{test17.c => test17.cpp}           |  0
 .../_snwprintf/test18/CMakeLists.txt          |  2 +-
 .../test18/{test18.c => test18.cpp}           |  0
 .../_snwprintf/test19/CMakeLists.txt          |  2 +-
 .../test19/{test19.c => test19.cpp}           |  6 +-
 .../c_runtime/_snwprintf/test2/CMakeLists.txt |  2 +-
 .../_snwprintf/test2/{test2.c => test2.cpp}   |  0
 .../c_runtime/_snwprintf/test3/CMakeLists.txt |  2 +-
 .../_snwprintf/test3/{test3.c => test3.cpp}   |  0
 .../c_runtime/_snwprintf/test4/CMakeLists.txt |  2 +-
 .../_snwprintf/test4/{test4.c => test4.cpp}   |  0
 .../c_runtime/_snwprintf/test5/CMakeLists.txt |  2 +-
 .../_snwprintf/test5/{test5.c => test5.cpp}   |  0
 .../c_runtime/_snwprintf/test6/CMakeLists.txt |  2 +-
 .../_snwprintf/test6/{test6.c => test6.cpp}   |  0
 .../c_runtime/_snwprintf/test7/CMakeLists.txt |  2 +-
 .../_snwprintf/test7/{test7.c => test7.cpp}   |  0
 .../c_runtime/_snwprintf/test8/CMakeLists.txt |  2 +-
 .../_snwprintf/test8/{test8.c => test8.cpp}   |  0
 .../c_runtime/_snwprintf/test9/CMakeLists.txt |  2 +-
 .../_snwprintf/test9/{test9.c => test9.cpp}   |  0
 .../c_runtime/_splitpath/test1/CMakeLists.txt |  2 +-
 .../_splitpath/test1/{test1.c => test1.cpp}   |  0
 .../c_runtime/_stricmp/test1/CMakeLists.txt   |  2 +-
 .../_stricmp/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/_strlwr/test1/CMakeLists.txt    |  2 +-
 .../_strlwr/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_strnicmp/test1/CMakeLists.txt  |  2 +-
 .../_strnicmp/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/_swab/test1/CMakeLists.txt      |  2 +-
 .../_swab/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/_vsnprintf/_vsnprintf.h         | 14 ++---
 .../c_runtime/_vsnprintf/test1/CMakeLists.txt |  2 +-
 .../_vsnprintf/test1/{test1.c => test1.cpp}   |  0
 .../_vsnprintf/test10/CMakeLists.txt          |  2 +-
 .../test10/{test10.c => test10.cpp}           |  0
 .../_vsnprintf/test11/CMakeLists.txt          |  2 +-
 .../test11/{test11.c => test11.cpp}           |  0
 .../_vsnprintf/test12/CMakeLists.txt          |  2 +-
 .../test12/{test12.c => test12.cpp}           |  0
 .../_vsnprintf/test13/CMakeLists.txt          |  2 +-
 .../test13/{test13.c => test13.cpp}           |  0
 .../_vsnprintf/test14/CMakeLists.txt          |  2 +-
 .../test14/{test14.c => test14.cpp}           |  0
 .../_vsnprintf/test15/CMakeLists.txt          |  2 +-
 .../test15/{test15.c => test15.cpp}           |  0
 .../_vsnprintf/test16/CMakeLists.txt          |  2 +-
 .../test16/{test16.c => test16.cpp}           |  0
 .../_vsnprintf/test17/CMakeLists.txt          |  2 +-
 .../test17/{test17.c => test17.cpp}           |  0
 .../_vsnprintf/test18/CMakeLists.txt          |  2 +-
 .../test18/{test18.c => test18.cpp}           |  0
 .../_vsnprintf/test19/CMakeLists.txt          |  2 +-
 .../test19/{test19.c => test19.cpp}           |  4 +-
 .../c_runtime/_vsnprintf/test2/CMakeLists.txt |  2 +-
 .../_vsnprintf/test2/{test2.c => test2.cpp}   |  0
 .../c_runtime/_vsnprintf/test3/CMakeLists.txt |  2 +-
 .../_vsnprintf/test3/{test3.c => test3.cpp}   |  0
 .../c_runtime/_vsnprintf/test4/CMakeLists.txt |  2 +-
 .../_vsnprintf/test4/{test4.c => test4.cpp}   |  0
 .../c_runtime/_vsnprintf/test5/CMakeLists.txt |  2 +-
 .../_vsnprintf/test5/{test5.c => test5.cpp}   |  0
 .../c_runtime/_vsnprintf/test6/CMakeLists.txt |  2 +-
 .../_vsnprintf/test6/{test6.c => test6.cpp}   |  0
 .../c_runtime/_vsnprintf/test7/CMakeLists.txt |  2 +-
 .../_vsnprintf/test7/{test7.c => test7.cpp}   |  0
 .../c_runtime/_vsnprintf/test8/CMakeLists.txt |  2 +-
 .../_vsnprintf/test8/{test8.c => test8.cpp}   |  0
 .../c_runtime/_vsnprintf/test9/CMakeLists.txt |  2 +-
 .../_vsnprintf/test9/{test9.c => test9.cpp}   |  0
 .../c_runtime/_vsnwprintf/_vsnwprintf.h       | 16 ++---
 .../_vsnwprintf/test1/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test1/{test1.c => test1.cpp}  |  0
 .../_vsnwprintf/test10/CMakeLists.txt         |  2 +-
 .../test10/{test10.c => test10.cpp}           |  0
 .../_vsnwprintf/test11/CMakeLists.txt         |  2 +-
 .../test11/{test11.c => test11.cpp}           |  0
 .../_vsnwprintf/test12/CMakeLists.txt         |  2 +-
 .../test12/{test12.c => test12.cpp}           |  0
 .../_vsnwprintf/test13/CMakeLists.txt         |  2 +-
 .../test13/{test13.c => test13.cpp}           |  0
 .../_vsnwprintf/test14/CMakeLists.txt         |  2 +-
 .../test14/{test14.c => test14.cpp}           |  0
 .../_vsnwprintf/test15/CMakeLists.txt         |  2 +-
 .../test15/{test15.c => test15.cpp}           |  0
 .../_vsnwprintf/test16/CMakeLists.txt         |  2 +-
 .../test16/{test16.c => test16.cpp}           |  0
 .../_vsnwprintf/test17/CMakeLists.txt         |  2 +-
 .../test17/{test17.c => test17.cpp}           |  0
 .../_vsnwprintf/test18/CMakeLists.txt         |  2 +-
 .../test18/{test18.c => test18.cpp}           |  0
 .../_vsnwprintf/test19/CMakeLists.txt         |  2 +-
 .../test19/{test19.c => test19.cpp}           |  2 +-
 .../_vsnwprintf/test2/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test2/{test2.c => test2.cpp}  |  0
 .../_vsnwprintf/test3/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test3/{test3.c => test3.cpp}  |  0
 .../_vsnwprintf/test4/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test4/{test4.c => test4.cpp}  |  0
 .../_vsnwprintf/test5/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test5/{test5.c => test5.cpp}  |  0
 .../_vsnwprintf/test6/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test6/{test6.c => test6.cpp}  |  0
 .../_vsnwprintf/test7/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test7/{test7.c => test7.cpp}  |  0
 .../_vsnwprintf/test8/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test8/{test8.c => test8.cpp}  |  0
 .../_vsnwprintf/test9/CMakeLists.txt          |  2 +-
 .../_vsnwprintf/test9/{test9.c => test9.cpp}  |  0
 .../c_runtime/_wcsicmp/test1/CMakeLists.txt   |  2 +-
 .../_wcsicmp/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/_wcslwr/test1/CMakeLists.txt    |  2 +-
 .../_wcslwr/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_wcsnicmp/test1/CMakeLists.txt  |  2 +-
 .../_wcsnicmp/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/_wfopen/test1/CMakeLists.txt    |  2 +-
 .../_wfopen/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/_wfopen/test2/CMakeLists.txt    |  2 +-
 .../_wfopen/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/_wfopen/test3/CMakeLists.txt    |  2 +-
 .../_wfopen/test3/{test3.c => test3.cpp}      |  0
 .../c_runtime/_wfopen/test4/CMakeLists.txt    |  2 +-
 .../_wfopen/test4/{test4.c => test4.cpp}      |  0
 .../c_runtime/_wfopen/test5/CMakeLists.txt    |  2 +-
 .../_wfopen/test5/{test5.c => test5.cpp}      |  0
 .../c_runtime/_wfopen/test6/CMakeLists.txt    |  2 +-
 .../_wfopen/test6/{test6.c => test6.cpp}      |  0
 .../c_runtime/_wfopen/test7/CMakeLists.txt    |  2 +-
 .../_wfopen/test7/{test7.c => test7.cpp}      |  0
 .../c_runtime/_wmakepath/test1/CMakeLists.txt |  2 +-
 .../_wmakepath/test1/{test1.c => test1.cpp}   |  0
 .../_wsplitpath/test1/CMakeLists.txt          |  2 +-
 .../_wsplitpath/test1/{test1.c => test1.cpp}  |  0
 .../c_runtime/_wtoi/test1/CMakeLists.txt      |  2 +-
 .../_wtoi/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/abs/test1/CMakeLists.txt        |  2 +-
 .../c_runtime/abs/test1/{abs.c => abs.cpp}    |  0
 .../c_runtime/acos/test1/CMakeLists.txt       |  2 +-
 .../acos/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/asin/test1/CMakeLists.txt       |  2 +-
 .../asin/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/atan/test1/CMakeLists.txt       |  2 +-
 .../atan/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/atan2/test1/CMakeLists.txt      |  2 +-
 .../atan2/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/atof/test1/CMakeLists.txt       |  2 +-
 .../atof/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/atoi/test1/CMakeLists.txt       |  2 +-
 .../atoi/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/atol/test1/CMakeLists.txt       |  2 +-
 .../atol/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/bsearch/test1/CMakeLists.txt    |  2 +-
 .../bsearch/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/bsearch/test2/CMakeLists.txt    |  2 +-
 .../bsearch/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/ceil/test1/CMakeLists.txt       |  2 +-
 .../ceil/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/cos/test1/CMakeLists.txt        |  2 +-
 .../cos/test1/{test1.c => test1.cpp}          |  0
 .../c_runtime/cosh/test1/CMakeLists.txt       |  2 +-
 .../cosh/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/ctime/test1/CMakeLists.txt      |  2 +-
 .../ctime/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/errno/test1/CMakeLists.txt      |  2 +-
 .../errno/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/errno/test2/CMakeLists.txt      |  2 +-
 .../errno/test2/{test2.c => test2.cpp}        |  0
 .../c_runtime/exit/test1/CMakeLists.txt       |  2 +-
 .../exit/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/exit/test2/CMakeLists.txt       |  2 +-
 .../exit/test2/{test2.c => test2.cpp}         |  0
 .../c_runtime/exp/test1/CMakeLists.txt        |  2 +-
 .../exp/test1/{test1.c => test1.cpp}          |  0
 .../c_runtime/fabs/test1/CMakeLists.txt       |  2 +-
 .../fabs/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/fabsf/test1/CMakeLists.txt      |  2 +-
 .../fabsf/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/fclose/test1/CMakeLists.txt     |  2 +-
 .../fclose/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/fclose/test2/CMakeLists.txt     |  2 +-
 .../fclose/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/feof/test1/CMakeLists.txt       |  2 +-
 .../feof/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/ferror/test1/CMakeLists.txt     |  2 +-
 .../ferror/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/ferror/test2/CMakeLists.txt     |  2 +-
 .../ferror/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/fflush/test1/CMakeLists.txt     |  2 +-
 .../fflush/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/fgets/test1/CMakeLists.txt      |  2 +-
 .../fgets/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/fgets/test2/CMakeLists.txt      |  2 +-
 .../fgets/test2/{test2.c => test2.cpp}        |  0
 .../c_runtime/fgets/test3/CMakeLists.txt      |  2 +-
 .../fgets/test3/{test3.c => test3.cpp}        |  0
 .../c_runtime/floor/test1/CMakeLists.txt      |  2 +-
 .../floor/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/fmod/test1/CMakeLists.txt       |  2 +-
 .../fmod/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/fmodf/test1/CMakeLists.txt      |  2 +-
 .../fmodf/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/fopen/test1/CMakeLists.txt      |  2 +-
 .../fopen/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/fopen/test2/CMakeLists.txt      |  2 +-
 .../fopen/test2/{test2.c => test2.cpp}        |  0
 .../c_runtime/fopen/test3/CMakeLists.txt      |  2 +-
 .../fopen/test3/{test3.c => test3.cpp}        |  0
 .../c_runtime/fopen/test4/CMakeLists.txt      |  2 +-
 .../fopen/test4/{test4.c => test4.cpp}        |  0
 .../c_runtime/fopen/test5/CMakeLists.txt      |  2 +-
 .../fopen/test5/{test5.c => test5.cpp}        |  0
 .../c_runtime/fopen/test6/CMakeLists.txt      |  2 +-
 .../fopen/test6/{test6.c => test6.cpp}        |  0
 .../c_runtime/fopen/test7/CMakeLists.txt      |  2 +-
 .../fopen/test7/{test7.c => test7.cpp}        |  0
 .../palsuite/c_runtime/fprintf/fprintf.h      | 14 ++---
 .../c_runtime/fprintf/test1/CMakeLists.txt    |  2 +-
 .../fprintf/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/fprintf/test10/CMakeLists.txt   |  2 +-
 .../fprintf/test10/{test10.c => test10.cpp}   |  0
 .../c_runtime/fprintf/test11/CMakeLists.txt   |  2 +-
 .../fprintf/test11/{test11.c => test11.cpp}   |  0
 .../c_runtime/fprintf/test12/CMakeLists.txt   |  2 +-
 .../fprintf/test12/{test12.c => test12.cpp}   |  0
 .../c_runtime/fprintf/test13/CMakeLists.txt   |  2 +-
 .../fprintf/test13/{test13.c => test13.cpp}   |  0
 .../c_runtime/fprintf/test14/CMakeLists.txt   |  2 +-
 .../fprintf/test14/{test14.c => test14.cpp}   |  0
 .../c_runtime/fprintf/test15/CMakeLists.txt   |  2 +-
 .../fprintf/test15/{test15.c => test15.cpp}   |  0
 .../c_runtime/fprintf/test16/CMakeLists.txt   |  2 +-
 .../fprintf/test16/{test16.c => test16.cpp}   |  0
 .../c_runtime/fprintf/test17/CMakeLists.txt   |  2 +-
 .../fprintf/test17/{test17.c => test17.cpp}   |  0
 .../c_runtime/fprintf/test18/CMakeLists.txt   |  2 +-
 .../fprintf/test18/{test18.c => test18.cpp}   |  0
 .../c_runtime/fprintf/test19/CMakeLists.txt   |  2 +-
 .../fprintf/test19/{test19.c => test19.cpp}   |  0
 .../c_runtime/fprintf/test2/CMakeLists.txt    |  2 +-
 .../fprintf/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/fprintf/test3/CMakeLists.txt    |  2 +-
 .../fprintf/test3/{test3.c => test3.cpp}      |  0
 .../c_runtime/fprintf/test4/CMakeLists.txt    |  2 +-
 .../fprintf/test4/{test4.c => test4.cpp}      |  0
 .../c_runtime/fprintf/test5/CMakeLists.txt    |  2 +-
 .../fprintf/test5/{test5.c => test5.cpp}      |  0
 .../c_runtime/fprintf/test6/CMakeLists.txt    |  2 +-
 .../fprintf/test6/{test6.c => test6.cpp}      |  0
 .../c_runtime/fprintf/test7/CMakeLists.txt    |  2 +-
 .../fprintf/test7/{test7.c => test7.cpp}      |  0
 .../c_runtime/fprintf/test8/CMakeLists.txt    |  2 +-
 .../fprintf/test8/{test8.c => test8.cpp}      |  0
 .../c_runtime/fprintf/test9/CMakeLists.txt    |  2 +-
 .../fprintf/test9/{test9.c => test9.cpp}      |  0
 .../c_runtime/fputs/test1/CMakeLists.txt      |  2 +-
 .../fputs/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/fputs/test2/CMakeLists.txt      |  2 +-
 .../fputs/test2/{test2.c => test2.cpp}        |  0
 .../c_runtime/fread/test1/CMakeLists.txt      |  2 +-
 .../fread/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/fread/test2/CMakeLists.txt      |  2 +-
 .../fread/test2/{test2.c => test2.cpp}        |  0
 .../c_runtime/fread/test3/CMakeLists.txt      |  2 +-
 .../fread/test3/{test3.c => test3.cpp}        |  0
 .../c_runtime/free/test1/CMakeLists.txt       |  2 +-
 .../free/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/fseek/test1/CMakeLists.txt      |  2 +-
 .../fseek/test1/{test1.c => test1.cpp}        |  2 +-
 .../c_runtime/ftell/test1/CMakeLists.txt      |  2 +-
 .../ftell/test1/{ftell.c => ftell.cpp}        |  0
 .../palsuite/c_runtime/fwprintf/fwprintf.h    | 34 +++++-----
 .../c_runtime/fwprintf/test1/CMakeLists.txt   |  2 +-
 .../fwprintf/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/fwprintf/test10/CMakeLists.txt  |  2 +-
 .../fwprintf/test10/{test10.c => test10.cpp}  |  0
 .../c_runtime/fwprintf/test11/CMakeLists.txt  |  2 +-
 .../fwprintf/test11/{test11.c => test11.cpp}  |  0
 .../c_runtime/fwprintf/test12/CMakeLists.txt  |  2 +-
 .../fwprintf/test12/{test12.c => test12.cpp}  |  0
 .../c_runtime/fwprintf/test13/CMakeLists.txt  |  2 +-
 .../fwprintf/test13/{test13.c => test13.cpp}  |  0
 .../c_runtime/fwprintf/test14/CMakeLists.txt  |  2 +-
 .../fwprintf/test14/{test14.c => test14.cpp}  |  0
 .../c_runtime/fwprintf/test15/CMakeLists.txt  |  2 +-
 .../fwprintf/test15/{test15.c => test15.cpp}  |  0
 .../c_runtime/fwprintf/test16/CMakeLists.txt  |  2 +-
 .../fwprintf/test16/{test16.c => test16.cpp}  |  0
 .../c_runtime/fwprintf/test17/CMakeLists.txt  |  2 +-
 .../fwprintf/test17/{test17.c => test17.cpp}  |  0
 .../c_runtime/fwprintf/test18/CMakeLists.txt  |  2 +-
 .../fwprintf/test18/{test18.c => test18.cpp}  |  0
 .../c_runtime/fwprintf/test19/CMakeLists.txt  |  2 +-
 .../fwprintf/test19/{test19.c => test19.cpp}  |  6 +-
 .../c_runtime/fwprintf/test2/CMakeLists.txt   |  2 +-
 .../fwprintf/test2/{test2.c => test2.cpp}     |  0
 .../c_runtime/fwprintf/test3/CMakeLists.txt   |  2 +-
 .../fwprintf/test3/{test3.c => test3.cpp}     |  0
 .../c_runtime/fwprintf/test4/CMakeLists.txt   |  2 +-
 .../fwprintf/test4/{test4.c => test4.cpp}     |  0
 .../c_runtime/fwprintf/test5/CMakeLists.txt   |  2 +-
 .../fwprintf/test5/{test5.c => test5.cpp}     |  0
 .../c_runtime/fwprintf/test6/CMakeLists.txt   |  2 +-
 .../fwprintf/test6/{test6.c => test6.cpp}     |  0
 .../c_runtime/fwprintf/test7/CMakeLists.txt   |  2 +-
 .../fwprintf/test7/{test7.c => test7.cpp}     |  0
 .../c_runtime/fwprintf/test8/CMakeLists.txt   |  2 +-
 .../fwprintf/test8/{test8.c => test8.cpp}     |  0
 .../c_runtime/fwprintf/test9/CMakeLists.txt   |  2 +-
 .../fwprintf/test9/{test9.c => test9.cpp}     |  0
 .../c_runtime/fwrite/test1/CMakeLists.txt     |  2 +-
 .../fwrite/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/getc/test1/CMakeLists.txt       |  2 +-
 .../c_runtime/getc/test1/{getc.c => getc.cpp} |  0
 .../c_runtime/getenv/test1/CMakeLists.txt     |  2 +-
 .../getenv/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/getenv/test2/CMakeLists.txt     |  2 +-
 .../getenv/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/getenv/test3/CMakeLists.txt     |  2 +-
 .../getenv/test3/{test3.c => test3.cpp}       |  0
 .../c_runtime/isalnum/test1/CMakeLists.txt    |  2 +-
 .../isalnum/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/isalpha/test1/CMakeLists.txt    |  2 +-
 .../isalpha/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/isdigit/test1/CMakeLists.txt    |  2 +-
 .../isdigit/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/islower/test1/CMakeLists.txt    |  2 +-
 .../islower/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/isprint/test1/CMakeLists.txt    |  2 +-
 .../isprint/test1/{isprint.c => isprint.cpp}  |  0
 .../c_runtime/isprint/test2/CMakeLists.txt    |  2 +-
 .../isprint/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/isspace/test1/CMakeLists.txt    |  2 +-
 .../isspace/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/isupper/test1/CMakeLists.txt    |  2 +-
 .../isupper/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/iswdigit/test1/CMakeLists.txt   |  2 +-
 .../iswdigit/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/iswprint/test1/CMakeLists.txt   |  2 +-
 .../iswprint/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/iswspace/test1/CMakeLists.txt   |  2 +-
 .../iswspace/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/iswupper/test1/CMakeLists.txt   |  2 +-
 .../iswupper/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/iswxdigit/test1/CMakeLists.txt  |  2 +-
 .../iswxdigit/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/isxdigit/test1/CMakeLists.txt   |  2 +-
 .../isxdigit/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/labs/test1/CMakeLists.txt       |  2 +-
 .../labs/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/llabs/test1/CMakeLists.txt      |  2 +-
 .../llabs/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/localtime/test1/CMakeLists.txt  |  2 +-
 .../localtime/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/log/test1/CMakeLists.txt        |  2 +-
 .../log/test1/{test1.c => test1.cpp}          |  0
 .../c_runtime/log10/test1/CMakeLists.txt      |  2 +-
 .../log10/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/malloc/test1/CMakeLists.txt     |  2 +-
 .../malloc/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/malloc/test2/CMakeLists.txt     |  2 +-
 .../malloc/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/memchr/test1/CMakeLists.txt     |  2 +-
 .../memchr/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/memcmp/test1/CMakeLists.txt     |  2 +-
 .../memcmp/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/memcpy/test1/CMakeLists.txt     |  2 +-
 .../memcpy/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/memmove/test1/CMakeLists.txt    |  2 +-
 .../memmove/test1/{test1.c => test1.cpp}      |  6 +-
 .../c_runtime/memset/test1/CMakeLists.txt     |  2 +-
 .../memset/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/modf/test1/CMakeLists.txt       |  2 +-
 .../modf/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/modff/test1/CMakeLists.txt      |  2 +-
 .../modff/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/pow/test1/CMakeLists.txt        |  2 +-
 .../pow/test1/{test1.c => test1.cpp}          |  0
 .../tests/palsuite/c_runtime/printf/printf.h  | 34 +++++-----
 .../c_runtime/printf/test1/CMakeLists.txt     |  2 +-
 .../printf/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/printf/test10/CMakeLists.txt    |  2 +-
 .../printf/test10/{test10.c => test10.cpp}    |  0
 .../c_runtime/printf/test11/CMakeLists.txt    |  2 +-
 .../printf/test11/{test11.c => test11.cpp}    |  0
 .../c_runtime/printf/test12/CMakeLists.txt    |  2 +-
 .../printf/test12/{test12.c => test12.cpp}    |  0
 .../c_runtime/printf/test13/CMakeLists.txt    |  2 +-
 .../printf/test13/{test13.c => test13.cpp}    |  0
 .../c_runtime/printf/test14/CMakeLists.txt    |  2 +-
 .../printf/test14/{test14.c => test14.cpp}    |  0
 .../c_runtime/printf/test15/CMakeLists.txt    |  2 +-
 .../printf/test15/{test15.c => test15.cpp}    |  0
 .../c_runtime/printf/test16/CMakeLists.txt    |  2 +-
 .../printf/test16/{test16.c => test16.cpp}    |  0
 .../c_runtime/printf/test17/CMakeLists.txt    |  2 +-
 .../printf/test17/{test17.c => test17.cpp}    |  0
 .../c_runtime/printf/test18/CMakeLists.txt    |  2 +-
 .../printf/test18/{test18.c => test18.cpp}    |  0
 .../c_runtime/printf/test19/CMakeLists.txt    |  2 +-
 .../printf/test19/{test19.c => test19.cpp}    |  6 +-
 .../c_runtime/printf/test2/CMakeLists.txt     |  2 +-
 .../printf/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/printf/test3/CMakeLists.txt     |  2 +-
 .../printf/test3/{test3.c => test3.cpp}       |  0
 .../c_runtime/printf/test4/CMakeLists.txt     |  2 +-
 .../printf/test4/{test4.c => test4.cpp}       |  0
 .../c_runtime/printf/test5/CMakeLists.txt     |  2 +-
 .../printf/test5/{test5.c => test5.cpp}       |  0
 .../c_runtime/printf/test6/CMakeLists.txt     |  2 +-
 .../printf/test6/{test6.c => test6.cpp}       |  0
 .../c_runtime/printf/test7/CMakeLists.txt     |  2 +-
 .../printf/test7/{test7.c => test7.cpp}       |  0
 .../c_runtime/printf/test8/CMakeLists.txt     |  2 +-
 .../printf/test8/{test8.c => test8.cpp}       |  0
 .../c_runtime/printf/test9/CMakeLists.txt     |  2 +-
 .../printf/test9/{test9.c => test9.cpp}       |  0
 .../c_runtime/qsort/test1/CMakeLists.txt      |  2 +-
 .../qsort/test1/{test1.c => test1.cpp}        |  0
 .../c_runtime/qsort/test2/CMakeLists.txt      |  2 +-
 .../qsort/test2/{test2.c => test2.cpp}        |  0
 .../c_runtime/rand_srand/test1/CMakeLists.txt |  2 +-
 .../rand_srand/test1/{test1.c => test1.cpp}   |  0
 .../c_runtime/realloc/test1/CMakeLists.txt    |  2 +-
 .../realloc/test1/{test1.c => test1.cpp}      |  2 +-
 .../c_runtime/sin/test1/CMakeLists.txt        |  2 +-
 .../sin/test1/{test1.c => test1.cpp}          |  0
 .../c_runtime/sinh/test1/CMakeLists.txt       |  2 +-
 .../sinh/test1/{test1.c => test1.cpp}         |  0
 .../palsuite/c_runtime/sprintf/sprintf.h      | 32 +++++-----
 .../c_runtime/sprintf/test1/CMakeLists.txt    |  2 +-
 .../sprintf/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/sprintf/test10/CMakeLists.txt   |  2 +-
 .../sprintf/test10/{test10.c => test10.cpp}   |  0
 .../c_runtime/sprintf/test11/CMakeLists.txt   |  2 +-
 .../sprintf/test11/{test11.c => test11.cpp}   |  0
 .../c_runtime/sprintf/test12/CMakeLists.txt   |  2 +-
 .../sprintf/test12/{test12.c => test12.cpp}   |  0
 .../c_runtime/sprintf/test13/CMakeLists.txt   |  2 +-
 .../sprintf/test13/{test13.c => test13.cpp}   |  0
 .../c_runtime/sprintf/test14/CMakeLists.txt   |  2 +-
 .../sprintf/test14/{test14.c => test14.cpp}   |  0
 .../c_runtime/sprintf/test15/CMakeLists.txt   |  2 +-
 .../sprintf/test15/{test15.c => test15.cpp}   |  0
 .../c_runtime/sprintf/test16/CMakeLists.txt   |  2 +-
 .../sprintf/test16/{test16.c => test16.cpp}   |  0
 .../c_runtime/sprintf/test17/CMakeLists.txt   |  2 +-
 .../sprintf/test17/{test17.c => test17.cpp}   |  0
 .../c_runtime/sprintf/test18/CMakeLists.txt   |  2 +-
 .../sprintf/test18/{test18.c => test18.cpp}   |  0
 .../c_runtime/sprintf/test19/CMakeLists.txt   |  2 +-
 .../sprintf/test19/{test19.c => test19.cpp}   |  6 +-
 .../c_runtime/sprintf/test2/CMakeLists.txt    |  2 +-
 .../sprintf/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/sprintf/test3/CMakeLists.txt    |  2 +-
 .../sprintf/test3/{test3.c => test3.cpp}      |  0
 .../c_runtime/sprintf/test4/CMakeLists.txt    |  2 +-
 .../sprintf/test4/{test4.c => test4.cpp}      |  0
 .../c_runtime/sprintf/test5/CMakeLists.txt    |  2 +-
 .../sprintf/test5/{test5.c => test5.cpp}      |  0
 .../c_runtime/sprintf/test6/CMakeLists.txt    |  2 +-
 .../sprintf/test6/{test6.c => test6.cpp}      |  0
 .../c_runtime/sprintf/test7/CMakeLists.txt    |  2 +-
 .../sprintf/test7/{test7.c => test7.cpp}      |  0
 .../c_runtime/sprintf/test8/CMakeLists.txt    |  2 +-
 .../sprintf/test8/{test8.c => test8.cpp}      |  0
 .../c_runtime/sprintf/test9/CMakeLists.txt    |  2 +-
 .../sprintf/test9/{test9.c => test9.cpp}      |  0
 .../c_runtime/sqrt/test1/CMakeLists.txt       |  2 +-
 .../sqrt/test1/{test1.c => test1.cpp}         |  0
 .../tests/palsuite/c_runtime/sscanf/sscanf.h  | 18 +++---
 .../c_runtime/sscanf/test1/CMakeLists.txt     |  2 +-
 .../sscanf/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/sscanf/test10/CMakeLists.txt    |  2 +-
 .../sscanf/test10/{test10.c => test10.cpp}    |  0
 .../c_runtime/sscanf/test11/CMakeLists.txt    |  2 +-
 .../sscanf/test11/{test11.c => test11.cpp}    |  0
 .../c_runtime/sscanf/test12/CMakeLists.txt    |  2 +-
 .../sscanf/test12/{test12.c => test12.cpp}    |  0
 .../c_runtime/sscanf/test13/CMakeLists.txt    |  2 +-
 .../sscanf/test13/{test13.c => test13.cpp}    |  0
 .../c_runtime/sscanf/test14/CMakeLists.txt    |  2 +-
 .../sscanf/test14/{test14.c => test14.cpp}    |  0
 .../c_runtime/sscanf/test15/CMakeLists.txt    |  2 +-
 .../sscanf/test15/{test15.c => test15.cpp}    |  0
 .../c_runtime/sscanf/test16/CMakeLists.txt    |  2 +-
 .../sscanf/test16/{test16.c => test16.cpp}    |  0
 .../c_runtime/sscanf/test17/CMakeLists.txt    |  2 +-
 .../sscanf/test17/{test17.c => test17.cpp}    |  0
 .../c_runtime/sscanf/test2/CMakeLists.txt     |  2 +-
 .../sscanf/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/sscanf/test3/CMakeLists.txt     |  2 +-
 .../sscanf/test3/{test3.c => test3.cpp}       |  0
 .../c_runtime/sscanf/test4/CMakeLists.txt     |  2 +-
 .../sscanf/test4/{test4.c => test4.cpp}       |  0
 .../c_runtime/sscanf/test5/CMakeLists.txt     |  2 +-
 .../sscanf/test5/{test5.c => test5.cpp}       |  0
 .../c_runtime/sscanf/test6/CMakeLists.txt     |  2 +-
 .../sscanf/test6/{test6.c => test6.cpp}       |  0
 .../c_runtime/sscanf/test7/CMakeLists.txt     |  2 +-
 .../sscanf/test7/{test7.c => test7.cpp}       |  0
 .../c_runtime/sscanf/test8/CMakeLists.txt     |  2 +-
 .../sscanf/test8/{test8.c => test8.cpp}       |  0
 .../c_runtime/sscanf/test9/CMakeLists.txt     |  2 +-
 .../sscanf/test9/{test9.c => test9.cpp}       |  0
 .../c_runtime/strcat/test1/CMakeLists.txt     |  2 +-
 .../strcat/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strchr/test1/CMakeLists.txt     |  2 +-
 .../strchr/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strcmp/test1/CMakeLists.txt     |  2 +-
 .../strcmp/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strcpy/test1/CMakeLists.txt     |  2 +-
 .../strcpy/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strcspn/test1/CMakeLists.txt    |  2 +-
 .../strcspn/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/strlen/test1/CMakeLists.txt     |  2 +-
 .../strlen/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strncat/test1/CMakeLists.txt    |  2 +-
 .../strncat/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/strncmp/test1/CMakeLists.txt    |  2 +-
 .../strncmp/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/strncpy/test1/CMakeLists.txt    |  2 +-
 .../strncpy/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/strpbrk/test1/CMakeLists.txt    |  2 +-
 .../strpbrk/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/strrchr/test1/CMakeLists.txt    |  2 +-
 .../strrchr/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/strspn/test1/CMakeLists.txt     |  2 +-
 .../strspn/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strstr/test1/CMakeLists.txt     |  2 +-
 .../strstr/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strtod/test1/CMakeLists.txt     |  2 +-
 .../strtod/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strtod/test2/CMakeLists.txt     |  2 +-
 .../strtod/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/strtok/test1/CMakeLists.txt     |  2 +-
 .../strtok/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/strtoul/test1/CMakeLists.txt    |  2 +-
 .../strtoul/test1/{test1.c => test1.cpp}      |  0
 .../palsuite/c_runtime/swprintf/swprintf.h    | 32 +++++-----
 .../c_runtime/swprintf/test1/CMakeLists.txt   |  2 +-
 .../swprintf/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/swprintf/test10/CMakeLists.txt  |  2 +-
 .../swprintf/test10/{test10.c => test10.cpp}  |  0
 .../c_runtime/swprintf/test11/CMakeLists.txt  |  2 +-
 .../swprintf/test11/{test11.c => test11.cpp}  |  0
 .../c_runtime/swprintf/test12/CMakeLists.txt  |  2 +-
 .../swprintf/test12/{test12.c => test12.cpp}  |  0
 .../c_runtime/swprintf/test13/CMakeLists.txt  |  2 +-
 .../swprintf/test13/{test13.c => test13.cpp}  |  0
 .../c_runtime/swprintf/test14/CMakeLists.txt  |  2 +-
 .../swprintf/test14/{test14.c => test14.cpp}  |  0
 .../c_runtime/swprintf/test15/CMakeLists.txt  |  2 +-
 .../swprintf/test15/{test15.c => test15.cpp}  |  0
 .../c_runtime/swprintf/test16/CMakeLists.txt  |  2 +-
 .../swprintf/test16/{test16.c => test16.cpp}  |  0
 .../c_runtime/swprintf/test17/CMakeLists.txt  |  2 +-
 .../swprintf/test17/{test17.c => test17.cpp}  |  0
 .../c_runtime/swprintf/test18/CMakeLists.txt  |  2 +-
 .../swprintf/test18/{test18.c => test18.cpp}  |  0
 .../c_runtime/swprintf/test19/CMakeLists.txt  |  2 +-
 .../swprintf/test19/{test19.c => test19.cpp}  |  6 +-
 .../c_runtime/swprintf/test2/CMakeLists.txt   |  2 +-
 .../swprintf/test2/{test2.c => test2.cpp}     |  0
 .../c_runtime/swprintf/test3/CMakeLists.txt   |  2 +-
 .../swprintf/test3/{test3.c => test3.cpp}     |  0
 .../c_runtime/swprintf/test4/CMakeLists.txt   |  2 +-
 .../swprintf/test4/{test4.c => test4.cpp}     |  0
 .../c_runtime/swprintf/test5/CMakeLists.txt   |  2 +-
 .../swprintf/test5/{test5.c => test5.cpp}     |  0
 .../c_runtime/swprintf/test6/CMakeLists.txt   |  2 +-
 .../swprintf/test6/{test6.c => test6.cpp}     |  0
 .../c_runtime/swprintf/test7/CMakeLists.txt   |  2 +-
 .../swprintf/test7/{test7.c => test7.cpp}     |  0
 .../c_runtime/swprintf/test8/CMakeLists.txt   |  2 +-
 .../swprintf/test8/{test8.c => test8.cpp}     |  0
 .../c_runtime/swprintf/test9/CMakeLists.txt   |  2 +-
 .../swprintf/test9/{test9.c => test9.cpp}     |  0
 .../palsuite/c_runtime/swscanf/swscanf.h      | 18 +++---
 .../c_runtime/swscanf/test1/CMakeLists.txt    |  2 +-
 .../swscanf/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/swscanf/test10/CMakeLists.txt   |  2 +-
 .../swscanf/test10/{test10.c => test10.cpp}   |  0
 .../c_runtime/swscanf/test11/CMakeLists.txt   |  2 +-
 .../swscanf/test11/{test11.c => test11.cpp}   |  0
 .../c_runtime/swscanf/test12/CMakeLists.txt   |  2 +-
 .../swscanf/test12/{test12.c => test12.cpp}   |  0
 .../c_runtime/swscanf/test13/CMakeLists.txt   |  2 +-
 .../swscanf/test13/{test13.c => test13.cpp}   |  0
 .../c_runtime/swscanf/test14/CMakeLists.txt   |  2 +-
 .../swscanf/test14/{test14.c => test14.cpp}   |  0
 .../c_runtime/swscanf/test15/CMakeLists.txt   |  2 +-
 .../swscanf/test15/{test15.c => test15.cpp}   |  0
 .../c_runtime/swscanf/test16/CMakeLists.txt   |  2 +-
 .../swscanf/test16/{test16.c => test16.cpp}   |  0
 .../c_runtime/swscanf/test17/CMakeLists.txt   |  2 +-
 .../swscanf/test17/{test17.c => test17.cpp}   |  0
 .../c_runtime/swscanf/test2/CMakeLists.txt    |  2 +-
 .../swscanf/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/swscanf/test3/CMakeLists.txt    |  2 +-
 .../swscanf/test3/{test3.c => test3.cpp}      |  0
 .../c_runtime/swscanf/test4/CMakeLists.txt    |  2 +-
 .../swscanf/test4/{test4.c => test4.cpp}      |  0
 .../c_runtime/swscanf/test5/CMakeLists.txt    |  2 +-
 .../swscanf/test5/{test5.c => test5.cpp}      |  0
 .../c_runtime/swscanf/test6/CMakeLists.txt    |  2 +-
 .../swscanf/test6/{test6.c => test6.cpp}      |  0
 .../c_runtime/swscanf/test7/CMakeLists.txt    |  2 +-
 .../swscanf/test7/{test7.c => test7.cpp}      |  0
 .../c_runtime/swscanf/test8/CMakeLists.txt    |  2 +-
 .../swscanf/test8/{test8.c => test8.cpp}      |  0
 .../c_runtime/swscanf/test9/CMakeLists.txt    |  2 +-
 .../swscanf/test9/{test9.c => test9.cpp}      |  0
 .../c_runtime/tan/test1/CMakeLists.txt        |  2 +-
 .../tan/test1/{test1.c => test1.cpp}          |  0
 .../c_runtime/tanh/test1/CMakeLists.txt       |  2 +-
 .../tanh/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/time/test1/CMakeLists.txt       |  2 +-
 .../time/test1/{test1.c => test1.cpp}         |  0
 .../c_runtime/tolower/test1/CMakeLists.txt    |  2 +-
 .../tolower/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/toupper/test1/CMakeLists.txt    |  2 +-
 .../toupper/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/towlower/test1/CMakeLists.txt   |  2 +-
 .../towlower/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/towupper/test1/CMakeLists.txt   |  2 +-
 .../towupper/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/ungetc/test1/CMakeLists.txt     |  2 +-
 .../ungetc/test1/{ungetc.c => ungetc.cpp}     |  0
 .../c_runtime/ungetc/test2/CMakeLists.txt     |  2 +-
 .../ungetc/test2/{ungetc.c => ungetc.cpp}     |  0
 .../c_runtime/vfprintf/test1/CMakeLists.txt   |  2 +-
 .../vfprintf/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/vfprintf/test10/CMakeLists.txt  |  2 +-
 .../vfprintf/test10/{test10.c => test10.cpp}  |  0
 .../c_runtime/vfprintf/test11/CMakeLists.txt  |  2 +-
 .../vfprintf/test11/{test11.c => test11.cpp}  |  0
 .../c_runtime/vfprintf/test12/CMakeLists.txt  |  2 +-
 .../vfprintf/test12/{test12.c => test12.cpp}  |  0
 .../c_runtime/vfprintf/test13/CMakeLists.txt  |  2 +-
 .../vfprintf/test13/{test13.c => test13.cpp}  |  0
 .../c_runtime/vfprintf/test14/CMakeLists.txt  |  2 +-
 .../vfprintf/test14/{test14.c => test14.cpp}  |  0
 .../c_runtime/vfprintf/test15/CMakeLists.txt  |  2 +-
 .../vfprintf/test15/{test15.c => test15.cpp}  |  0
 .../c_runtime/vfprintf/test16/CMakeLists.txt  |  2 +-
 .../vfprintf/test16/{test16.c => test16.cpp}  |  0
 .../c_runtime/vfprintf/test17/CMakeLists.txt  |  2 +-
 .../vfprintf/test17/{test17.c => test17.cpp}  |  0
 .../c_runtime/vfprintf/test18/CMakeLists.txt  |  2 +-
 .../vfprintf/test18/{test18.c => test18.cpp}  |  0
 .../c_runtime/vfprintf/test19/CMakeLists.txt  |  2 +-
 .../vfprintf/test19/{test19.c => test19.cpp}  |  6 +-
 .../c_runtime/vfprintf/test2/CMakeLists.txt   |  2 +-
 .../vfprintf/test2/{test2.c => test2.cpp}     |  0
 .../c_runtime/vfprintf/test3/CMakeLists.txt   |  2 +-
 .../vfprintf/test3/{test3.c => test3.cpp}     |  0
 .../c_runtime/vfprintf/test4/CMakeLists.txt   |  2 +-
 .../vfprintf/test4/{test4.c => test4.cpp}     |  0
 .../c_runtime/vfprintf/test5/CMakeLists.txt   |  2 +-
 .../vfprintf/test5/{test5.c => test5.cpp}     |  0
 .../c_runtime/vfprintf/test6/CMakeLists.txt   |  2 +-
 .../vfprintf/test6/{test6.c => test6.cpp}     |  0
 .../c_runtime/vfprintf/test7/CMakeLists.txt   |  2 +-
 .../vfprintf/test7/{test7.c => test7.cpp}     |  0
 .../c_runtime/vfprintf/test8/CMakeLists.txt   |  2 +-
 .../vfprintf/test8/{test8.c => test8.cpp}     |  0
 .../c_runtime/vfprintf/test9/CMakeLists.txt   |  2 +-
 .../vfprintf/test9/{test9.c => test9.cpp}     |  0
 .../palsuite/c_runtime/vfprintf/vfprintf.h    | 34 +++++-----
 .../c_runtime/vprintf/test1/CMakeLists.txt    |  2 +-
 .../vprintf/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/vprintf/test10/CMakeLists.txt   |  2 +-
 .../vprintf/test10/{test10.c => test10.cpp}   |  0
 .../c_runtime/vprintf/test11/CMakeLists.txt   |  2 +-
 .../vprintf/test11/{test11.c => test11.cpp}   |  0
 .../c_runtime/vprintf/test12/CMakeLists.txt   |  2 +-
 .../vprintf/test12/{test12.c => test12.cpp}   |  0
 .../c_runtime/vprintf/test13/CMakeLists.txt   |  2 +-
 .../vprintf/test13/{test13.c => test13.cpp}   |  0
 .../c_runtime/vprintf/test14/CMakeLists.txt   |  2 +-
 .../vprintf/test14/{test14.c => test14.cpp}   |  0
 .../c_runtime/vprintf/test15/CMakeLists.txt   |  2 +-
 .../vprintf/test15/{test15.c => test15.cpp}   |  0
 .../c_runtime/vprintf/test16/CMakeLists.txt   |  2 +-
 .../vprintf/test16/{test16.c => test16.cpp}   |  0
 .../c_runtime/vprintf/test17/CMakeLists.txt   |  2 +-
 .../vprintf/test17/{test17.c => test17.cpp}   |  0
 .../c_runtime/vprintf/test18/CMakeLists.txt   |  2 +-
 .../vprintf/test18/{test18.c => test18.cpp}   |  0
 .../c_runtime/vprintf/test19/CMakeLists.txt   |  2 +-
 .../vprintf/test19/{test19.c => test19.cpp}   |  6 +-
 .../c_runtime/vprintf/test2/CMakeLists.txt    |  2 +-
 .../vprintf/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/vprintf/test3/CMakeLists.txt    |  2 +-
 .../vprintf/test3/{test3.c => test3.cpp}      |  0
 .../c_runtime/vprintf/test4/CMakeLists.txt    |  2 +-
 .../vprintf/test4/{test4.c => test4.cpp}      |  0
 .../c_runtime/vprintf/test5/CMakeLists.txt    |  2 +-
 .../vprintf/test5/{test5.c => test5.cpp}      |  0
 .../c_runtime/vprintf/test6/CMakeLists.txt    |  2 +-
 .../vprintf/test6/{test6.c => test6.cpp}      |  0
 .../c_runtime/vprintf/test7/CMakeLists.txt    |  2 +-
 .../vprintf/test7/{test7.c => test7.cpp}      |  0
 .../c_runtime/vprintf/test8/CMakeLists.txt    |  2 +-
 .../vprintf/test8/{test8.c => test8.cpp}      |  0
 .../c_runtime/vprintf/test9/CMakeLists.txt    |  2 +-
 .../vprintf/test9/{test9.c => test9.cpp}      |  0
 .../palsuite/c_runtime/vprintf/vprintf.h      | 34 +++++-----
 .../c_runtime/vsprintf/test1/CMakeLists.txt   |  2 +-
 .../vsprintf/test1/{test1.c => test1.cpp}     |  0
 .../c_runtime/vsprintf/test10/CMakeLists.txt  |  2 +-
 .../vsprintf/test10/{test10.c => test10.cpp}  |  0
 .../c_runtime/vsprintf/test11/CMakeLists.txt  |  2 +-
 .../vsprintf/test11/{test11.c => test11.cpp}  |  0
 .../c_runtime/vsprintf/test12/CMakeLists.txt  |  2 +-
 .../vsprintf/test12/{test12.c => test12.cpp}  |  0
 .../c_runtime/vsprintf/test13/CMakeLists.txt  |  2 +-
 .../vsprintf/test13/{test13.c => test13.cpp}  |  0
 .../c_runtime/vsprintf/test14/CMakeLists.txt  |  2 +-
 .../vsprintf/test14/{test14.c => test14.cpp}  |  0
 .../c_runtime/vsprintf/test15/CMakeLists.txt  |  2 +-
 .../vsprintf/test15/{test15.c => test15.cpp}  |  0
 .../c_runtime/vsprintf/test16/CMakeLists.txt  |  2 +-
 .../vsprintf/test16/{test16.c => test16.cpp}  |  0
 .../c_runtime/vsprintf/test17/CMakeLists.txt  |  2 +-
 .../vsprintf/test17/{test17.c => test17.cpp}  |  0
 .../c_runtime/vsprintf/test18/CMakeLists.txt  |  2 +-
 .../vsprintf/test18/{test18.c => test18.cpp}  |  0
 .../c_runtime/vsprintf/test19/CMakeLists.txt  |  2 +-
 .../vsprintf/test19/{test19.c => test19.cpp}  |  4 +-
 .../c_runtime/vsprintf/test2/CMakeLists.txt   |  2 +-
 .../vsprintf/test2/{test2.c => test2.cpp}     |  0
 .../c_runtime/vsprintf/test3/CMakeLists.txt   |  2 +-
 .../vsprintf/test3/{test3.c => test3.cpp}     |  0
 .../c_runtime/vsprintf/test4/CMakeLists.txt   |  2 +-
 .../vsprintf/test4/{test4.c => test4.cpp}     |  0
 .../c_runtime/vsprintf/test5/CMakeLists.txt   |  2 +-
 .../vsprintf/test5/{test5.c => test5.cpp}     |  0
 .../c_runtime/vsprintf/test6/CMakeLists.txt   |  2 +-
 .../vsprintf/test6/{test6.c => test6.cpp}     |  0
 .../c_runtime/vsprintf/test7/CMakeLists.txt   |  2 +-
 .../vsprintf/test7/{test7.c => test7.cpp}     |  0
 .../c_runtime/vsprintf/test8/CMakeLists.txt   |  2 +-
 .../vsprintf/test8/{test8.c => test8.cpp}     |  0
 .../c_runtime/vsprintf/test9/CMakeLists.txt   |  2 +-
 .../vsprintf/test9/{test9.c => test9.cpp}     |  0
 .../palsuite/c_runtime/vsprintf/vsprintf.h    | 34 +++++-----
 .../c_runtime/vswprintf/test1/CMakeLists.txt  |  2 +-
 .../vswprintf/test1/{test1.c => test1.cpp}    |  0
 .../c_runtime/vswprintf/test10/CMakeLists.txt |  2 +-
 .../vswprintf/test10/{test10.c => test10.cpp} |  0
 .../c_runtime/vswprintf/test11/CMakeLists.txt |  2 +-
 .../vswprintf/test11/{test11.c => test11.cpp} |  0
 .../c_runtime/vswprintf/test12/CMakeLists.txt |  2 +-
 .../vswprintf/test12/{test12.c => test12.cpp} |  0
 .../c_runtime/vswprintf/test13/CMakeLists.txt |  2 +-
 .../vswprintf/test13/{test13.c => test13.cpp} |  0
 .../c_runtime/vswprintf/test14/CMakeLists.txt |  2 +-
 .../vswprintf/test14/{test14.c => test14.cpp} |  0
 .../c_runtime/vswprintf/test15/CMakeLists.txt |  2 +-
 .../vswprintf/test15/{test15.c => test15.cpp} |  0
 .../c_runtime/vswprintf/test16/CMakeLists.txt |  2 +-
 .../vswprintf/test16/{test16.c => test16.cpp} |  0
 .../c_runtime/vswprintf/test17/CMakeLists.txt |  2 +-
 .../vswprintf/test17/{test17.c => test17.cpp} |  0
 .../c_runtime/vswprintf/test18/CMakeLists.txt |  2 +-
 .../vswprintf/test18/{test18.c => test18.cpp} |  0
 .../c_runtime/vswprintf/test19/CMakeLists.txt |  2 +-
 .../vswprintf/test19/{test19.c => test19.cpp} |  2 +-
 .../c_runtime/vswprintf/test2/CMakeLists.txt  |  2 +-
 .../vswprintf/test2/{test2.c => test2.cpp}    |  0
 .../c_runtime/vswprintf/test3/CMakeLists.txt  |  2 +-
 .../vswprintf/test3/{test3.c => test3.cpp}    |  0
 .../c_runtime/vswprintf/test4/CMakeLists.txt  |  2 +-
 .../vswprintf/test4/{test4.c => test4.cpp}    |  0
 .../c_runtime/vswprintf/test5/CMakeLists.txt  |  2 +-
 .../vswprintf/test5/{test5.c => test5.cpp}    |  0
 .../c_runtime/vswprintf/test6/CMakeLists.txt  |  2 +-
 .../vswprintf/test6/{test6.c => test6.cpp}    |  0
 .../c_runtime/vswprintf/test7/CMakeLists.txt  |  2 +-
 .../vswprintf/test7/{test7.c => test7.cpp}    |  0
 .../c_runtime/vswprintf/test8/CMakeLists.txt  |  2 +-
 .../vswprintf/test8/{test8.c => test8.cpp}    |  0
 .../c_runtime/vswprintf/test9/CMakeLists.txt  |  2 +-
 .../vswprintf/test9/{test9.c => test9.cpp}    |  0
 .../palsuite/c_runtime/vswprintf/vswprintf.h  | 14 ++---
 .../c_runtime/wcscat/test1/CMakeLists.txt     |  2 +-
 .../wcscat/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcschr/test1/CMakeLists.txt     |  2 +-
 .../wcschr/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcscmp/test1/CMakeLists.txt     |  2 +-
 .../wcscmp/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcscpy/test1/CMakeLists.txt     |  2 +-
 .../wcscpy/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcslen/test1/CMakeLists.txt     |  2 +-
 .../wcslen/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcsncat/test1/CMakeLists.txt    |  2 +-
 .../wcsncat/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/wcsncmp/test1/CMakeLists.txt    |  2 +-
 .../wcsncmp/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/wcsncpy/test1/CMakeLists.txt    |  2 +-
 .../wcsncpy/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/wcspbrk/test1/CMakeLists.txt    |  2 +-
 .../wcspbrk/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/wcsrchr/test1/CMakeLists.txt    |  2 +-
 .../wcsrchr/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/wcsstr/test1/CMakeLists.txt     |  2 +-
 .../wcsstr/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcstod/test1/CMakeLists.txt     |  2 +-
 .../wcstod/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcstod/test2/CMakeLists.txt     |  2 +-
 .../wcstod/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/wcstok/test1/CMakeLists.txt     |  2 +-
 .../wcstok/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcstol/test1/CMakeLists.txt     |  2 +-
 .../wcstol/test1/{test1.c => test1.cpp}       |  0
 .../c_runtime/wcstol/test2/CMakeLists.txt     |  2 +-
 .../wcstol/test2/{test2.c => test2.cpp}       |  0
 .../c_runtime/wcstol/test3/CMakeLists.txt     |  2 +-
 .../wcstol/test3/{test3.c => test3.cpp}       |  0
 .../c_runtime/wcstol/test4/CMakeLists.txt     |  2 +-
 .../wcstol/test4/{test4.c => test4.cpp}       |  0
 .../c_runtime/wcstol/test5/CMakeLists.txt     |  2 +-
 .../wcstol/test5/{test5.c => test5.cpp}       |  0
 .../c_runtime/wcstol/test6/CMakeLists.txt     |  2 +-
 .../wcstol/test6/{test6.c => test6.cpp}       |  0
 .../c_runtime/wcstoul/test1/CMakeLists.txt    |  2 +-
 .../wcstoul/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/wcstoul/test2/CMakeLists.txt    |  2 +-
 .../wcstoul/test2/{test2.c => test2.cpp}      |  0
 .../c_runtime/wcstoul/test3/CMakeLists.txt    |  2 +-
 .../wcstoul/test3/{test3.c => test3.cpp}      |  0
 .../c_runtime/wcstoul/test4/CMakeLists.txt    |  2 +-
 .../wcstoul/test4/{test4.c => test4.cpp}      |  0
 .../c_runtime/wcstoul/test5/CMakeLists.txt    |  2 +-
 .../wcstoul/test5/{test5.c => test5.cpp}      |  0
 .../c_runtime/wcstoul/test6/CMakeLists.txt    |  2 +-
 .../wcstoul/test6/{test6.c => test6.cpp}      |  0
 .../c_runtime/wprintf/test1/CMakeLists.txt    |  2 +-
 .../wprintf/test1/{test1.c => test1.cpp}      |  0
 .../c_runtime/wprintf/test2/CMakeLists.txt    |  2 +-
 .../wprintf/test2/{test2.c => test2.cpp}      |  0
 .../palsuite/c_runtime/wprintf/wprintf.h      | 32 +++++-----
 src/pal/tests/palsuite/common/palsuite.h      |  4 +-
 .../event/nonshared/CMakeLists.txt            |  4 +-
 .../event/nonshared/{event.c => event.cpp}    |  0
 .../event/nonshared/{main.c => main.cpp}      |  0
 .../event/shared/CMakeLists.txt               |  4 +-
 .../event/shared/{event.c => event.cpp}       |  0
 .../event/shared/{main.c => main.cpp}         |  0
 .../mutex/nonshared/CMakeLists.txt            |  4 +-
 .../mutex/nonshared/{main.c => main.cpp}      |  0
 .../mutex/nonshared/{mutex.c => mutex.cpp}    |  0
 .../mutex/shared/CMakeLists.txt               |  4 +-
 .../mutex/shared/{main.c => main.cpp}         |  0
 .../mutex/shared/{mutex.c => mutex.cpp}       |  0
 .../semaphore/nonshared/CMakeLists.txt        |  4 +-
 .../semaphore/nonshared/{main.c => main.cpp}  |  0
 .../nonshared/{semaphore.c => semaphore.cpp}  |  0
 .../semaphore/shared/CMakeLists.txt           |  4 +-
 .../semaphore/shared/{main.c => main.cpp}     |  0
 .../shared/{semaphore.c => semaphore.cpp}     |  0
 .../criticalsection/CMakeLists.txt            |  4 +-
 ...{criticalsection.c => criticalsection.cpp} |  0
 .../{mainWrapper.c => mainWrapper.cpp}        |  0
 .../nativecriticalsection/CMakeLists.txt      |  2 +-
 ...ative_cs.c => pal_composite_native_cs.cpp} |  0
 .../nativecs_interlocked/CMakeLists.txt       |  2 +-
 ...ative_cs.c => pal_composite_native_cs.cpp} |  0
 .../threading/threadsuspension/CMakeLists.txt |  4 +-
 .../{mainWrapper.c => mainWrapper.cpp}        |  0
 ...hreadsuspension.c => threadsuspension.cpp} |  0
 .../CMakeLists.txt                            |  4 +-
 .../{mainWrapper.c => mainWrapper.cpp}        |  0
 ...hreadsuspension.c => threadsuspension.cpp} |  0
 .../palsuite/composite/wfmo/CMakeLists.txt    |  4 +-
 .../composite/wfmo/{main.c => main.cpp}       |  0
 .../composite/wfmo/{mutex.c => mutex.cpp}     |  0
 .../debug_api/DebugBreak/test1/CMakeLists.txt |  2 +-
 .../DebugBreak/test1/{test1.c => test1.cpp}   |  0
 .../OutputDebugStringA/test1/CMakeLists.txt   |  4 +-
 .../test1/{helper.c => helper.cpp}            |  0
 .../test1/{test1.c => test1.cpp}              |  0
 .../OutputDebugStringW/test1/CMakeLists.txt   |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../WriteProcessMemory/test1/CMakeLists.txt   |  4 +-
 .../test1/{helper.c => helper.cpp}            |  2 +-
 .../test1/{test1.c => test1.cpp}              |  2 +-
 .../WriteProcessMemory/test3/CMakeLists.txt   |  4 +-
 .../test3/{helper.c => helper.cpp}            |  0
 .../test3/{test3.c => test3.cpp}              |  2 +-
 .../WriteProcessMemory/test4/CMakeLists.txt   |  4 +-
 .../test4/{helper.c => helper.cpp}            |  0
 .../test4/{test4.c => test4.cpp}              |  0
 .../PAL_EXCEPT_FILTER/test1/CMakeLists.txt    |  2 +-
 ..._EXCEPT_FILTER.c => PAL_EXCEPT_FILTER.cpp} |  0
 .../PAL_EXCEPT_FILTER/test2/CMakeLists.txt    |  2 +-
 ..._except_filter.c => pal_except_filter.cpp} |  0
 .../PAL_EXCEPT_FILTER/test3/CMakeLists.txt    |  2 +-
 ..._except_filter.c => pal_except_filter.cpp} |  0
 .../PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt |  2 +-
 ...T_FILTER_EX.c => PAL_EXCEPT_FILTER_EX.cpp} |  0
 .../PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt |  2 +-
 ...t_filter_ex.c => pal_except_filter_ex.cpp} |  0
 .../PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt |  2 +-
 ..._except_filter.c => pal_except_filter.cpp} |  0
 .../PAL_TRY_EXCEPT/test1/CMakeLists.txt       |  2 +-
 .../{PAL_TRY_EXCEPT.c => PAL_TRY_EXCEPT.cpp}  |  0
 .../PAL_TRY_EXCEPT/test2/CMakeLists.txt       |  2 +-
 .../{PAL_TRY_EXCEPT.c => PAL_TRY_EXCEPT.cpp}  |  0
 .../PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt    |  2 +-
 ..._TRY_EXCEPT_EX.c => PAL_TRY_EXCEPT_EX.cpp} |  0
 .../PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt    |  2 +-
 ..._TRY_EXCEPT_EX.c => PAL_TRY_EXCEPT_EX.cpp} |  0
 .../PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt    |  2 +-
 ..._TRY_EXCEPT_EX.c => PAL_TRY_EXCEPT_EX.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 ...VE_FINALLY.c => PAL_TRY_LEAVE_FINALLY.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../pal_except/test1/CMakeLists.txt           |  2 +-
 .../pal_except/test1/{test1.c => test1.cpp}   |  0
 .../pal_except/test2/CMakeLists.txt           |  2 +-
 .../pal_except/test2/{test2.c => test2.cpp}   |  0
 .../pal_except/test3/CMakeLists.txt           |  2 +-
 .../pal_except/test3/{test3.c => test3.cpp}   |  0
 .../pal_except/test4/CMakeLists.txt           |  2 +-
 .../pal_except/test4/{test4.c => test4.cpp}   |  0
 .../pal_except/test5/CMakeLists.txt           |  2 +-
 .../pal_except/test5/{test5.c => test5.cpp}   |  0
 .../pal_except/test6/CMakeLists.txt           |  2 +-
 .../pal_except/test6/{test6.c => test6.cpp}   |  0
 .../pal_except/test7/CMakeLists.txt           |  2 +-
 .../pal_except/test7/{test7.c => test7.cpp}   |  0
 .../pal_finally/test1/CMakeLists.txt          |  2 +-
 .../test1/{pal_finally.c => pal_finally.cpp}  |  0
 ...{AreFileApisANSI.c => AreFileApisANSI.cpp} |  0
 .../AreFileApisANSI/test1/CMakeLists.txt      |  2 +-
 .../CompareFileTime/test1/CMakeLists.txt      |  2 +-
 ...{CompareFileTime.c => CompareFileTime.cpp} |  0
 .../file_io/CopyFileA/test1/CMakeLists.txt    |  2 +-
 .../test1/{CopyFileA.c => CopyFileA.cpp}      |  0
 .../file_io/CopyFileA/test2/CMakeLists.txt    |  2 +-
 .../CopyFileA/test2/{test2.c => test2.cpp}    |  0
 .../file_io/CopyFileA/test3/CMakeLists.txt    |  2 +-
 .../CopyFileA/test3/{test3.c => test3.cpp}    |  0
 .../file_io/CopyFileA/test4/CMakeLists.txt    |  2 +-
 .../CopyFileA/test4/{test4.c => test4.cpp}    |  0
 .../file_io/CopyFileW/test1/CMakeLists.txt    |  2 +-
 .../test1/{CopyFileW.c => CopyFileW.cpp}      |  0
 .../file_io/CopyFileW/test2/CMakeLists.txt    |  2 +-
 .../CopyFileW/test2/{test2.c => test2.cpp}    |  0
 .../file_io/CopyFileW/test3/CMakeLists.txt    |  2 +-
 .../CopyFileW/test3/{test3.c => test3.cpp}    |  0
 .../CreateDirectoryA/test1/CMakeLists.txt     |  2 +-
 ...reateDirectoryA.c => CreateDirectoryA.cpp} |  0
 .../CreateDirectoryA/test2/CMakeLists.txt     |  2 +-
 ...reatedirectorya.c => createdirectorya.cpp} |  0
 .../CreateDirectoryW/test1/CMakeLists.txt     |  2 +-
 ...reateDirectoryW.c => CreateDirectoryW.cpp} |  0
 .../CreateDirectoryW/test2/CMakeLists.txt     |  2 +-
 ...reatedirectoryw.c => createdirectoryw.cpp} |  0
 .../file_io/CreateFileA/test1/CMakeLists.txt  |  2 +-
 .../test1/{CreateFileA.c => CreateFileA.cpp}  |  0
 .../file_io/CreateFileW/test1/CMakeLists.txt  |  2 +-
 .../test1/{CreateFileW.c => CreateFileW.cpp}  |  0
 .../file_io/DeleteFileW/test1/CMakeLists.txt  |  2 +-
 .../test1/{DeleteFileW.c => DeleteFileW.cpp}  |  0
 .../FILECanonicalizePath/CMakeLists.txt       |  2 +-
 ...icalizePath.c => FILECanonicalizePath.cpp} |  2 +-
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../file_io/FindClose/test1/CMakeLists.txt    |  2 +-
 .../test1/{FindClose.c => FindClose.cpp}      |  0
 .../FindFirstFileA/test1/CMakeLists.txt       |  2 +-
 .../{FindFirstFileA.c => FindFirstFileA.cpp}  |  0
 .../FindFirstFileW/test1/CMakeLists.txt       |  2 +-
 .../{FindFirstFileW.c => FindFirstFileW.cpp}  |  0
 .../FindNextFileA/test1/CMakeLists.txt        |  2 +-
 .../{FindNextFileA.c => FindNextFileA.cpp}    |  0
 .../FindNextFileA/test2/CMakeLists.txt        |  2 +-
 .../{findnextfilea.c => findnextfilea.cpp}    |  0
 .../FindNextFileW/test1/CMakeLists.txt        |  2 +-
 .../{FindNextFileW.c => FindNextFileW.cpp}    |  0
 .../FindNextFileW/test2/CMakeLists.txt        |  2 +-
 .../{findnextfilew.c => findnextfilew.cpp}    |  0
 .../FlushFileBuffers/test1/CMakeLists.txt     |  2 +-
 ...lushFileBuffers.c => FlushFileBuffers.cpp} |  0
 .../file_io/GetConsoleCP/test1/CMakeLists.txt |  2 +-
 .../{GetConsoleCP.c => GetConsoleCP.cpp}      |  0
 .../GetConsoleOutputCP/test1/CMakeLists.txt   |  2 +-
 ...nsoleOutputCP.c => GetConsoleOutputCP.cpp} |  0
 .../GetCurrentDirectoryA/test1/CMakeLists.txt |  2 +-
 ...tDirectoryA.c => GetCurrentDirectoryA.cpp} |  0
 .../GetCurrentDirectoryW/test1/CMakeLists.txt |  2 +-
 ...tDirectoryW.c => GetCurrentDirectoryW.cpp} |  0
 .../GetDiskFreeSpaceW/test1/CMakeLists.txt    |  2 +-
 ...DiskFreeSpaceW.c => GetDiskFreeSpaceW.cpp} |  0
 .../GetDiskFreeSpaceW/test2/CMakeLists.txt    |  2 +-
 ...diskfreespacew.c => getdiskfreespacew.cpp} |  0
 .../GetFileAttributesA/test1/CMakeLists.txt   |  2 +-
 ...leAttributesA.c => GetFileAttributesA.cpp} |  0
 .../GetFileAttributesExW/test1/CMakeLists.txt |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../GetFileAttributesExW/test2/CMakeLists.txt |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../GetFileAttributesW/test1/CMakeLists.txt   |  2 +-
 ...leAttributesW.c => GetFileAttributesW.cpp} |  0
 .../file_io/GetFileSize/test1/CMakeLists.txt  |  2 +-
 .../test1/{GetFileSize.c => GetFileSize.cpp}  |  0
 .../GetFileSizeEx/test1/CMakeLists.txt        |  2 +-
 .../{GetFileSizeEx.c => GetFileSizeEx.cpp}    |  0
 .../file_io/GetFileTime/test1/CMakeLists.txt  |  2 +-
 .../test1/{GetFileTime.c => GetFileTime.cpp}  |  0
 .../file_io/GetFileTime/test2/CMakeLists.txt  |  2 +-
 .../test2/{GetFileTime.c => GetFileTime.cpp}  |  0
 .../file_io/GetFileTime/test3/CMakeLists.txt  |  2 +-
 .../test3/{GetFileTime.c => GetFileTime.cpp}  |  0
 .../file_io/GetFileTime/test4/CMakeLists.txt  |  2 +-
 .../test4/{GetFileTime.c => GetFileTime.cpp}  |  0
 .../file_io/GetFileTime/test5/CMakeLists.txt  |  2 +-
 .../test5/{getfiletime.c => getfiletime.cpp}  |  0
 .../file_io/GetFileTime/test6/CMakeLists.txt  |  2 +-
 .../test6/{getfiletime.c => getfiletime.cpp}  |  0
 .../file_io/GetFileTime/test7/CMakeLists.txt  |  2 +-
 .../test7/{getfiletime.c => getfiletime.cpp}  |  0
 .../file_io/GetFileType/test1/CMakeLists.txt  |  2 +-
 .../test1/{GetFileType.c => GetFileType.cpp}  |  0
 .../file_io/GetFileType/test2/CMakeLists.txt  |  2 +-
 .../test2/{getfiletype.c => getfiletype.cpp}  |  0
 .../file_io/GetFileType/test3/CMakeLists.txt  |  2 +-
 .../test3/{getfiletype.c => getfiletype.cpp}  |  0
 .../GetFullPathNameA/test1/CMakeLists.txt     |  2 +-
 ...etFullPathNameA.c => GetFullPathNameA.cpp} |  0
 .../GetFullPathNameA/test2/CMakeLists.txt     |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../GetFullPathNameA/test3/CMakeLists.txt     |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../GetFullPathNameA/test4/CMakeLists.txt     |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../GetFullPathNameW/test1/CMakeLists.txt     |  2 +-
 ...etFullPathNameW.c => GetFullPathNameW.cpp} |  0
 .../GetFullPathNameW/test2/CMakeLists.txt     |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../GetFullPathNameW/test3/CMakeLists.txt     |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../GetFullPathNameW/test4/CMakeLists.txt     |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../GetLongPathNameW/test1/CMakeLists.txt     |  2 +-
 ...etLongPathNameW.c => GetLongPathNameW.cpp} |  0
 .../GetLongPathNameW/test2/CMakeLists.txt     |  2 +-
 ...etlongpathnamew.c => getlongpathnamew.cpp} |  0
 .../file_io/GetStdHandle/test1/CMakeLists.txt |  2 +-
 .../{GetStdHandle.c => GetStdHandle.cpp}      |  0
 .../file_io/GetStdHandle/test2/CMakeLists.txt |  2 +-
 .../{GetStdHandle.c => GetStdHandle.cpp}      |  0
 .../GetSystemTime/test1/CMakeLists.txt        |  2 +-
 .../GetSystemTime/test1/{test.c => test.cpp}  |  0
 .../test1/CMakeLists.txt                      |  2 +-
 ...FileTime.c => GetSystemTimeAsFileTime.cpp} |  0
 .../GetTempFileNameA/test1/CMakeLists.txt     |  2 +-
 ...etTempFileNameA.c => GetTempFileNameA.cpp} |  0
 .../GetTempFileNameA/test2/CMakeLists.txt     |  2 +-
 ...etTempFileNameA.c => GetTempFileNameA.cpp} |  0
 .../GetTempFileNameA/test3/CMakeLists.txt     |  2 +-
 ...ettempfilenamea.c => gettempfilenamea.cpp} |  0
 .../GetTempFileNameW/test1/CMakeLists.txt     |  2 +-
 ...etTempFileNameW.c => GetTempFileNameW.cpp} |  0
 .../GetTempFileNameW/test2/CMakeLists.txt     |  2 +-
 ...etTempFileNameW.c => GetTempFileNameW.cpp} |  0
 .../GetTempFileNameW/test3/CMakeLists.txt     |  2 +-
 ...ettempfilenamew.c => gettempfilenamew.cpp} |  0
 .../file_io/GetTempPathW/test1/CMakeLists.txt |  2 +-
 .../{GetTempPathW.c => GetTempPathW.cpp}      |  6 +-
 .../file_io/MoveFileA/test1/CMakeLists.txt    |  2 +-
 .../test1/{MoveFileA.c => MoveFileA.cpp}      |  0
 .../file_io/MoveFileExA/test1/CMakeLists.txt  |  2 +-
 .../test1/{MoveFileExA.c => MoveFileExA.cpp}  |  0
 .../file_io/MoveFileExW/test1/CMakeLists.txt  |  2 +-
 .../test1/{MoveFileExW.c => MoveFileExW.cpp}  |  0
 .../file_io/MoveFileW/test1/CMakeLists.txt    |  2 +-
 .../test1/{MoveFileW.c => MoveFileW.cpp}      |  0
 .../file_io/ReadFile/test1/CMakeLists.txt     |  2 +-
 .../test1/{ReadFile.c => ReadFile.cpp}        |  0
 .../file_io/ReadFile/test2/CMakeLists.txt     |  2 +-
 .../test2/{ReadFile.c => ReadFile.cpp}        |  0
 .../file_io/ReadFile/test3/CMakeLists.txt     |  2 +-
 .../test3/{ReadFile.c => ReadFile.cpp}        |  0
 .../file_io/ReadFile/test4/CMakeLists.txt     |  2 +-
 .../test4/{readfile.c => readfile.cpp}        |  0
 .../RemoveDirectoryW/test1/CMakeLists.txt     |  2 +-
 ...emoveDirectoryW.c => RemoveDirectoryW.cpp} |  0
 .../file_io/SearchPathA/test1/CMakeLists.txt  |  2 +-
 .../test1/{SearchPathA.c => SearchPathA.cpp}  |  0
 .../file_io/SearchPathW/test1/CMakeLists.txt  |  2 +-
 .../test1/{SearchPathW.c => SearchPathW.cpp}  |  0
 .../SetCurrentDirectoryA/test1/CMakeLists.txt |  2 +-
 ...tDirectoryA.c => SetCurrentDirectoryA.cpp} |  0
 .../SetCurrentDirectoryA/test2/CMakeLists.txt |  2 +-
 ...tdirectorya.c => setcurrentdirectorya.cpp} |  0
 .../SetCurrentDirectoryA/test3/CMakeLists.txt |  2 +-
 ...tdirectorya.c => setcurrentdirectorya.cpp} |  0
 .../SetCurrentDirectoryW/test1/CMakeLists.txt |  2 +-
 ...tDirectoryW.c => SetCurrentDirectoryW.cpp} |  0
 .../SetCurrentDirectoryW/test2/CMakeLists.txt |  2 +-
 ...tdirectoryw.c => setcurrentdirectoryw.cpp} |  0
 .../SetCurrentDirectoryW/test3/CMakeLists.txt |  2 +-
 ...tdirectoryw.c => setcurrentdirectoryw.cpp} |  0
 .../file_io/SetEndOfFile/test1/CMakeLists.txt |  2 +-
 .../{SetEndOfFile.c => SetEndOfFile.cpp}      |  0
 .../file_io/SetEndOfFile/test2/CMakeLists.txt |  2 +-
 .../{SetEndOfFile.c => SetEndOfFile.cpp}      |  0
 .../file_io/SetEndOfFile/test3/CMakeLists.txt |  2 +-
 .../{SetEndOfFile.c => SetEndOfFile.cpp}      |  0
 .../file_io/SetEndOfFile/test4/CMakeLists.txt |  2 +-
 .../{setendoffile.c => setendoffile.cpp}      |  0
 .../file_io/SetEndOfFile/test5/CMakeLists.txt |  2 +-
 .../SetEndOfFile/test5/{test5.c => test5.cpp} |  0
 .../SetFileAttributesA/test1/CMakeLists.txt   |  2 +-
 ...leAttributesA.c => SetFileAttributesA.cpp} |  0
 .../SetFileAttributesA/test2/CMakeLists.txt   |  2 +-
 ...leAttributesA.c => SetFileAttributesA.cpp} |  0
 .../SetFileAttributesA/test3/CMakeLists.txt   |  2 +-
 ...leAttributesA.c => SetFileAttributesA.cpp} |  0
 .../SetFileAttributesA/test4/CMakeLists.txt   |  2 +-
 ...leAttributesA.c => SetFileAttributesA.cpp} |  0
 .../SetFileAttributesW/test1/CMakeLists.txt   |  2 +-
 ...leAttributesW.c => SetFileAttributesW.cpp} |  0
 .../SetFileAttributesW/test2/CMakeLists.txt   |  2 +-
 ...leAttributesW.c => SetFileAttributesW.cpp} |  0
 .../SetFileAttributesW/test3/CMakeLists.txt   |  2 +-
 ...leAttributesW.c => SetFileAttributesW.cpp} |  0
 .../SetFileAttributesW/test4/CMakeLists.txt   |  2 +-
 ...leAttributesW.c => SetFileAttributesW.cpp} |  0
 .../SetFilePointer/test1/CMakeLists.txt       |  2 +-
 .../{SetFilePointer.c => SetFilePointer.cpp}  |  0
 .../SetFilePointer/test2/CMakeLists.txt       |  2 +-
 .../{SetFilePointer.c => SetFilePointer.cpp}  |  0
 .../SetFilePointer/test3/CMakeLists.txt       |  2 +-
 .../{SetFilePointer.c => SetFilePointer.cpp}  |  0
 .../SetFilePointer/test4/CMakeLists.txt       |  2 +-
 .../{SetFilePointer.c => SetFilePointer.cpp}  |  0
 .../SetFilePointer/test5/CMakeLists.txt       |  2 +-
 .../{SetFilePointer.c => SetFilePointer.cpp}  |  0
 .../SetFilePointer/test6/CMakeLists.txt       |  2 +-
 .../{SetFilePointer.c => SetFilePointer.cpp}  |  0
 .../SetFilePointer/test7/CMakeLists.txt       |  2 +-
 .../{SetFilePointer.c => SetFilePointer.cpp}  |  0
 .../file_io/SetFileTime/test1/CMakeLists.txt  |  2 +-
 .../test1/{SetFileTime.c => SetFileTime.cpp}  |  0
 .../file_io/SetFileTime/test2/CMakeLists.txt  |  2 +-
 .../test2/{SetFileTime.c => SetFileTime.cpp}  |  0
 .../file_io/SetFileTime/test3/CMakeLists.txt  |  2 +-
 .../test3/{SetFileTime.c => SetFileTime.cpp}  |  0
 .../file_io/SetFileTime/test4/CMakeLists.txt  |  2 +-
 .../test4/{SetFileTime.c => SetFileTime.cpp}  |  0
 .../file_io/WriteFile/test1/CMakeLists.txt    |  2 +-
 .../test1/{WriteFile.c => WriteFile.cpp}      |  0
 .../file_io/WriteFile/test2/CMakeLists.txt    |  2 +-
 .../test2/{WriteFile.c => WriteFile.cpp}      |  0
 .../file_io/WriteFile/test3/CMakeLists.txt    |  2 +-
 .../test3/{WriteFile.c => WriteFile.cpp}      |  0
 .../file_io/WriteFile/test4/CMakeLists.txt    |  2 +-
 .../test4/{writefile.c => writefile.cpp}      |  0
 .../file_io/WriteFile/test5/CMakeLists.txt    |  2 +-
 .../test5/{writefile.c => writefile.cpp}      |  0
 .../errorpathnotfound/test1/CMakeLists.txt    |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../errorpathnotfound/test2/CMakeLists.txt    |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../errorpathnotfound/test3/CMakeLists.txt    |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../errorpathnotfound/test4/CMakeLists.txt    |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../file_io/gettemppatha/test1/CMakeLists.txt |  2 +-
 .../{gettemppatha.c => gettemppatha.cpp}      |  0
 .../CreateFileMappingA/test1/CMakeLists.txt   |  2 +-
 ...ateFileMapping.c => CreateFileMapping.cpp} |  0
 .../CreateFileMappingA/test3/CMakeLists.txt   |  2 +-
 ...ateFileMapping.c => CreateFileMapping.cpp} |  0
 .../CreateFileMappingA/test4/CMakeLists.txt   |  2 +-
 ...ateFileMapping.c => CreateFileMapping.cpp} |  0
 .../CreateFileMappingA/test5/CMakeLists.txt   |  2 +-
 ...ateFileMapping.c => CreateFileMapping.cpp} |  0
 .../CreateFileMappingA/test6/CMakeLists.txt   |  2 +-
 ...ateFileMapping.c => CreateFileMapping.cpp} |  0
 .../CreateFileMappingA/test7/CMakeLists.txt   |  2 +-
 ...atefilemapping.c => createfilemapping.cpp} |  0
 .../CreateFileMappingA/test8/CMakeLists.txt   |  2 +-
 ...atefilemapping.c => createfilemapping.cpp} |  0
 .../CreateFileMappingA/test9/CMakeLists.txt   |  2 +-
 ...atefilemapping.c => createfilemapping.cpp} |  0
 .../CreateFileMapping_neg1/CMakeLists.txt     |  2 +-
 ...apping_neg.c => CreateFileMapping_neg.cpp} |  0
 .../CreateFileMappingW/test1/CMakeLists.txt   |  2 +-
 ...eFileMappingW.c => CreateFileMappingW.cpp} |  0
 .../CreateFileMappingW/test2/CMakeLists.txt   |  2 +-
 ...eFileMappingW.c => CreateFileMappingW.cpp} |  0
 .../CreateFileMappingW/test3/CMakeLists.txt   |  2 +-
 ...eFileMappingW.c => CreateFileMappingW.cpp} |  0
 .../CreateFileMappingW/test4/CMakeLists.txt   |  2 +-
 ...eFileMappingW.c => CreateFileMappingW.cpp} |  0
 .../CreateFileMappingW/test5/CMakeLists.txt   |  2 +-
 ...eFileMappingW.c => CreateFileMappingW.cpp} |  0
 .../CreateFileMappingW/test6/CMakeLists.txt   |  2 +-
 ...eFileMappingW.c => CreateFileMappingW.cpp} |  0
 .../CreateFileMappingW/test7/CMakeLists.txt   |  2 +-
 ...atefilemapping.c => createfilemapping.cpp} |  0
 .../CreateFileMappingW/test8/CMakeLists.txt   |  2 +-
 ...atefilemapping.c => createfilemapping.cpp} |  0
 .../CreateFileMappingW/test9/CMakeLists.txt   |  2 +-
 ...atefilemapping.c => createfilemapping.cpp} |  0
 .../FreeLibrary/test1/CMakeLists.txt          |  4 +-
 .../test1/{FreeLibrary.c => FreeLibrary.cpp}  |  0
 .../test1/{dlltest.c => dlltest.cpp}          |  0
 .../FreeLibrary/test2/CMakeLists.txt          |  2 +-
 .../FreeLibrary/test2/{test2.c => test2.cpp}  |  0
 .../test1/CMakeLists.txt                      |  4 +-
 .../test1/{dlltest.c => dlltest.cpp}          |  0
 .../test1/{test1.c => test1.cpp}              |  4 +-
 .../GetModuleFileNameA/test1/CMakeLists.txt   |  2 +-
 ...duleFileNameA.c => GetModuleFileNameA.cpp} |  0
 .../GetModuleFileNameA/test2/CMakeLists.txt   |  2 +-
 ...duleFileNameA.c => GetModuleFileNameA.cpp} |  0
 .../GetModuleFileNameW/test1/CMakeLists.txt   |  2 +-
 ...duleFileNameW.c => GetModuleFileNameW.cpp} |  2 +-
 .../GetModuleFileNameW/test2/CMakeLists.txt   |  2 +-
 ...duleFileNameW.c => GetModuleFileNameW.cpp} |  2 +-
 .../GetProcAddress/test1/CMakeLists.txt       |  4 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../test1/{testlib.c => testlib.cpp}          |  0
 .../GetProcAddress/test2/CMakeLists.txt       |  4 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../test2/{testlib.c => testlib.cpp}          |  0
 .../GetProcessHeap/test1/CMakeLists.txt       |  2 +-
 .../{GetProcessHeap.c => GetProcessHeap.cpp}  |  0
 .../HeapAlloc/test1/CMakeLists.txt            |  2 +-
 .../test1/{HeapAlloc.c => HeapAlloc.cpp}      |  0
 .../HeapAlloc/test2/CMakeLists.txt            |  2 +-
 .../test2/{HeapAlloc.c => HeapAlloc.cpp}      |  0
 .../HeapAlloc/test3/CMakeLists.txt            |  2 +-
 .../test3/{HeapAlloc.c => HeapAlloc.cpp}      |  0
 .../HeapFree/test1/CMakeLists.txt             |  2 +-
 .../test1/{HeapFree.c => HeapFree.cpp}        |  0
 .../HeapReAlloc/test1/CMakeLists.txt          |  2 +-
 .../HeapReAlloc/test1/{test1.c => test1.cpp}  |  4 +-
 .../HeapReAlloc/test2/CMakeLists.txt          |  2 +-
 .../HeapReAlloc/test2/{test2.c => test2.cpp}  |  4 +-
 .../HeapReAlloc/test3/CMakeLists.txt          |  2 +-
 .../HeapReAlloc/test3/{test3.c => test3.cpp}  |  4 +-
 .../HeapReAlloc/test4/CMakeLists.txt          |  2 +-
 .../HeapReAlloc/test4/{test4.c => test4.cpp}  |  0
 .../HeapReAlloc/test5/CMakeLists.txt          |  2 +-
 .../HeapReAlloc/test5/{test5.c => test5.cpp}  |  6 +-
 .../LocalAlloc/test1/CMakeLists.txt           |  2 +-
 .../test1/{LocalAlloc.c => LocalAlloc.cpp}    |  0
 .../LocalFree/test1/CMakeLists.txt            |  2 +-
 .../test1/{LocalFree.c => LocalFree.cpp}      |  0
 .../LocalFree/test2/CMakeLists.txt            |  2 +-
 .../test2/{LocalFree.c => LocalFree.cpp}      |  0
 .../LockFile/test1/CMakeLists.txt             |  4 +-
 .../LockFile/test1/{helper.c => helper.cpp}   |  0
 .../LockFile/test1/{test1.c => test1.cpp}     |  0
 .../LockFile/test2/CMakeLists.txt             |  2 +-
 .../LockFile/test2/{test2.c => test2.cpp}     |  0
 .../LockFile/test3/CMakeLists.txt             |  4 +-
 .../LockFile/test3/{helper.c => helper.cpp}   |  0
 .../LockFile/test3/{test3.c => test3.cpp}     |  0
 .../LockFile/test4/CMakeLists.txt             |  2 +-
 .../LockFile/test4/{test4.c => test4.cpp}     |  0
 .../LockFile/test5/CMakeLists.txt             |  4 +-
 .../LockFile/test5/{helper.c => helper.cpp}   |  0
 .../LockFile/test5/{test5.c => test5.cpp}     |  0
 .../LockFile/test6/CMakeLists.txt             |  4 +-
 .../LockFile/test6/{helper.c => helper.cpp}   |  0
 .../LockFile/test6/{test6.c => test6.cpp}     |  0
 .../LockFile/test7/CMakeLists.txt             |  2 +-
 .../LockFile/test7/{test7.c => test7.cpp}     |  0
 .../MapViewOfFile/test1/CMakeLists.txt        |  2 +-
 .../{MapViewOfFile.c => MapViewOfFile.cpp}    |  0
 .../MapViewOfFile/test2/CMakeLists.txt        |  2 +-
 .../{MapViewOfFile.c => MapViewOfFile.cpp}    |  0
 .../MapViewOfFile/test3/CMakeLists.txt        |  2 +-
 .../{MapViewOfFile.c => MapViewOfFile.cpp}    |  0
 .../MapViewOfFile/test4/CMakeLists.txt        |  2 +-
 .../{mapviewoffile.c => mapviewoffile.cpp}    |  0
 .../MapViewOfFile/test5/CMakeLists.txt        |  2 +-
 .../{mapviewoffile.c => mapviewoffile.cpp}    |  0
 .../MapViewOfFile/test6/CMakeLists.txt        |  2 +-
 .../{mapviewoffile.c => mapviewoffile.cpp}    |  0
 .../OpenFileMappingA/test1/CMakeLists.txt     |  2 +-
 ...penFileMappingA.c => OpenFileMappingA.cpp} |  0
 .../OpenFileMappingA/test2/CMakeLists.txt     |  2 +-
 ...penFileMappingA.c => OpenFileMappingA.cpp} |  0
 .../OpenFileMappingA/test3/CMakeLists.txt     |  2 +-
 ...penFileMappingA.c => OpenFileMappingA.cpp} |  0
 .../OpenFileMappingW/test1/CMakeLists.txt     |  2 +-
 ...penFileMappingW.c => OpenFileMappingW.cpp} |  0
 .../OpenFileMappingW/test2/CMakeLists.txt     |  2 +-
 ...penFileMappingW.c => OpenFileMappingW.cpp} |  0
 .../OpenFileMappingW/test3/CMakeLists.txt     |  2 +-
 ...penFileMappingW.c => OpenFileMappingW.cpp} |  0
 .../ReadProcessMemory_neg1/CMakeLists.txt     |  2 +-
 ...Memory_neg.c => ReadProcessMemory_neg.cpp} |  0
 .../ReadProcessMemory/test1/CMakeLists.txt    |  2 +-
 ...dProcessMemory.c => ReadProcessMemory.cpp} |  0
 .../ReadProcessMemory/test2/CMakeLists.txt    |  4 +-
 .../test2/{helper.c => helper.cpp}            |  2 +-
 .../test2/{test2.c => test2.cpp}              |  4 +-
 .../RtlMoveMemory/test1/CMakeLists.txt        |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../RtlMoveMemory/test3/CMakeLists.txt        |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../RtlMoveMemory/test4/CMakeLists.txt        |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../RtlMoveMemory/test5/CMakeLists.txt        |  2 +-
 .../test5/{test5.c => test5.cpp}              |  0
 .../UnlockFile/test1/CMakeLists.txt           |  4 +-
 .../UnlockFile/test1/{helper.c => helper.cpp} |  0
 .../UnlockFile/test1/{test1.c => test1.cpp}   |  0
 .../UnlockFile/test2/CMakeLists.txt           |  2 +-
 .../UnlockFile/test2/{test2.c => test2.cpp}   |  0
 .../UnlockFile/test3/CMakeLists.txt           |  4 +-
 .../UnlockFile/test3/{helper.c => helper.cpp} |  0
 .../UnlockFile/test3/{test3.c => test3.cpp}   |  0
 .../UnlockFile/test4/CMakeLists.txt           |  2 +-
 .../UnlockFile/test4/{test4.c => test4.cpp}   |  0
 .../UnmapViewOfFile/test1/CMakeLists.txt      |  2 +-
 ...{UnmapViewOfFile.c => UnmapViewOfFile.cpp} |  0
 .../UnmapViewOfFile/test2/CMakeLists.txt      |  2 +-
 ...{unmapviewoffile.c => unmapviewoffile.cpp} |  0
 .../VirtualAlloc/test1/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test10/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test11/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test12/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test13/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test14/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test15/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test16/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test17/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test18/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test19/CMakeLists.txt        |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test2/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test20/CMakeLists.txt        |  2 +-
 .../{virtualalloc.c => virtualalloc.cpp}      |  0
 .../VirtualAlloc/test21/CMakeLists.txt        |  2 +-
 .../{virtualalloc.c => virtualalloc.cpp}      |  0
 .../VirtualAlloc/test3/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test4/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test5/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test6/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test7/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test8/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualAlloc/test9/CMakeLists.txt         |  2 +-
 .../{VirtualAlloc.c => VirtualAlloc.cpp}      |  0
 .../VirtualFree/test1/CMakeLists.txt          |  2 +-
 .../test1/{VirtualFree.c => VirtualFree.cpp}  |  0
 .../VirtualFree/test2/CMakeLists.txt          |  2 +-
 .../test2/{VirtualFree.c => VirtualFree.cpp}  |  0
 .../VirtualFree/test3/CMakeLists.txt          |  2 +-
 .../test3/{VirtualFree.c => VirtualFree.cpp}  |  0
 .../VirtualProtect/test1/CMakeLists.txt       |  2 +-
 .../{VirtualProtect.c => VirtualProtect.cpp}  |  0
 .../VirtualProtect/test2/CMakeLists.txt       |  2 +-
 .../{VirtualProtect.c => VirtualProtect.cpp}  |  0
 .../VirtualProtect/test3/CMakeLists.txt       |  2 +-
 .../{VirtualProtect.c => VirtualProtect.cpp}  |  0
 .../VirtualProtect/test4/CMakeLists.txt       |  2 +-
 .../{VirtualProtect.c => VirtualProtect.cpp}  |  0
 .../VirtualProtect/test6/CMakeLists.txt       |  2 +-
 .../{VirtualProtect.c => VirtualProtect.cpp}  |  0
 .../VirtualProtect/test7/CMakeLists.txt       |  2 +-
 .../{VirtualProtect.c => VirtualProtect.cpp}  |  0
 .../VirtualQuery/test1/CMakeLists.txt         |  2 +-
 .../{VirtualQuery.c => VirtualQuery.cpp}      |  0
 .../loader/LoadLibraryA/test1/CMakeLists.txt  |  2 +-
 .../{LoadLibraryA.c => LoadLibraryA.cpp}      |  0
 .../loader/LoadLibraryA/test2/CMakeLists.txt  |  2 +-
 .../{LoadLibraryA.c => LoadLibraryA.cpp}      |  0
 .../test2/{MyModule.c => MyModule.cpp}        |  0
 .../loader/LoadLibraryA/test3/CMakeLists.txt  |  2 +-
 .../{loadlibrarya.c => loadlibrarya.cpp}      |  0
 .../loader/LoadLibraryA/test5/CMakeLists.txt  |  2 +-
 .../{loadlibrarya.c => loadlibrarya.cpp}      |  0
 .../loader/LoadLibraryA/test6/CMakeLists.txt  |  4 +-
 .../test6/{dlltest.c => dlltest.cpp}          |  0
 .../{loadlibrarya.c => loadlibrarya.cpp}      |  0
 .../loader/LoadLibraryA/test7/CMakeLists.txt  |  2 +-
 .../{LoadLibraryA.c => LoadLibraryA.cpp}      |  0
 .../loader/LoadLibraryA/test8/CMakeLists.txt  |  4 +-
 .../test8/{dlltest.c => dlltest.cpp}          |  0
 .../{loadlibrarya.c => loadlibrarya.cpp}      |  0
 .../loader/LoadLibraryW/test1/CMakeLists.txt  |  2 +-
 .../{LoadLibraryW.c => LoadLibraryW.cpp}      |  0
 .../loader/LoadLibraryW/test2/CMakeLists.txt  |  2 +-
 .../{loadlibraryw.c => loadlibraryw.cpp}      |  0
 .../loader/LoadLibraryW/test3/CMakeLists.txt  |  2 +-
 .../{loadlibraryw.c => loadlibraryw.cpp}      |  0
 .../loader/LoadLibraryW/test5/CMakeLists.txt  |  2 +-
 .../{loadlibraryw.c => loadlibraryw.cpp}      |  0
 .../CompareStringA/test1/CMakeLists.txt       |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../CompareStringW/test1/CMakeLists.txt       |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../locale_info/GetACP/test1/CMakeLists.txt   |  2 +-
 .../GetACP/test1/{test1.c => test1.cpp}       |  0
 .../GetCPInfo/test1/CMakeLists.txt            |  2 +-
 .../GetCPInfo/test1/{test1.c => test1.cpp}    |  0
 .../GetCPInfo/test2/CMakeLists.txt            |  2 +-
 .../GetCPInfo/test2/{test2.c => test2.cpp}    |  0
 .../GetCPInfo/test3/CMakeLists.txt            |  2 +-
 .../GetCPInfo/test3/{test3.c => test3.cpp}    |  0
 .../GetLocaleInfoW/test1/CMakeLists.txt       |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../GetLocaleInfoW/test2/CMakeLists.txt       |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../GetStringTypeExW/test1/CMakeLists.txt     |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../GetStringTypeExW/test2/CMakeLists.txt     |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../GetThreadLocale/test1/CMakeLists.txt      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../GetUserDefaultLCID/test1/CMakeLists.txt   |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../GetUserDefaultLangID/test1/CMakeLists.txt |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../IsDBCSLeadByte/test1/CMakeLists.txt       |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../IsDBCSLeadByteEx/test1/CMakeLists.txt     |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../IsValidCodePage/test1/CMakeLists.txt      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../IsValidCodePage/test2/CMakeLists.txt      |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../IsValidLocale/test1/CMakeLists.txt        |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../MultiByteToWideChar/test1/CMakeLists.txt  |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../MultiByteToWideChar/test2/CMakeLists.txt  |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../MultiByteToWideChar/test3/CMakeLists.txt  |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../MultiByteToWideChar/test4/CMakeLists.txt  |  2 +-
 .../test4/{test4.c => test4.cpp}              |  4 +-
 .../SetThreadLocale/test1/CMakeLists.txt      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../WideCharToMultiByte/test1/CMakeLists.txt  |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../WideCharToMultiByte/test2/CMakeLists.txt  |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../WideCharToMultiByte/test3/CMakeLists.txt  |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../WideCharToMultiByte/test4/CMakeLists.txt  |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../WideCharToMultiByte/test5/CMakeLists.txt  |  2 +-
 .../test5/{test5.c => test5.cpp}              |  4 +-
 .../CharNextA/test1/CMakeLists.txt            |  2 +-
 .../CharNextA/test1/{test.c => test.cpp}      |  0
 .../CharNextA/test2/CMakeLists.txt            |  2 +-
 .../CharNextA/test2/{test.c => test.cpp}      |  0
 .../CharNextExA/test1/CMakeLists.txt          |  2 +-
 .../CharNextExA/test1/{test.c => test.cpp}    |  0
 .../CharNextExA/test2/CMakeLists.txt          |  2 +-
 .../CharNextExA/test2/{test.c => test.cpp}    |  0
 .../CloseHandle/test1/CMakeLists.txt          |  2 +-
 .../CloseHandle/test1/{test.c => test.cpp}    |  2 +-
 .../CloseHandle/test2/CMakeLists.txt          |  2 +-
 .../CloseHandle/test2/{test.c => test.cpp}    |  0
 .../CreatePipe/test1/CMakeLists.txt           |  2 +-
 .../CreatePipe/test1/{test1.c => test1.cpp}   |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../FormatMessageW/test1/CMakeLists.txt       |  2 +-
 .../FormatMessageW/test1/{test.c => test.cpp} |  0
 .../FormatMessageW/test2/CMakeLists.txt       |  2 +-
 .../FormatMessageW/test2/{test.c => test.cpp} |  0
 .../FormatMessageW/test3/CMakeLists.txt       |  2 +-
 .../FormatMessageW/test3/{test.c => test.cpp} |  0
 .../FormatMessageW/test4/CMakeLists.txt       |  2 +-
 .../FormatMessageW/test4/{test.c => test.cpp} |  0
 .../FormatMessageW/test5/CMakeLists.txt       |  2 +-
 .../FormatMessageW/test5/{test.c => test.cpp} |  0
 .../FormatMessageW/test6/CMakeLists.txt       |  2 +-
 .../FormatMessageW/test6/{test.c => test.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test.c => test.cpp}                |  0
 .../test2/CMakeLists.txt                      |  2 +-
 .../test2/{test.c => test.cpp}                |  0
 .../GetCalendarInfoW/test1/CMakeLists.txt     |  2 +-
 ...etCalendarInfoW.c => GetCalendarInfoW.cpp} |  0
 .../GetCalendarInfoW/test2/CMakeLists.txt     |  2 +-
 ...etCalendarInfoW.c => GetCalendarInfoW.cpp} |  0
 .../GetCommandLineW/test1/CMakeLists.txt      |  2 +-
 .../test1/{test.c => test.cpp}                |  2 +-
 .../GetComputerNameW/test1/CMakeLists.txt     |  2 +-
 .../test1/{test.c => test.cpp}                |  0
 .../GetDateFormatW_neg1/CMakeLists.txt        |  2 +-
 ...teFormatW_neg.c => GetDateFormatW_neg.cpp} |  2 +-
 .../GetDateFormatW_neg2/CMakeLists.txt        |  2 +-
 ...teFormatW_neg.c => GetDateFormatW_neg.cpp} |  2 +-
 .../GetDateFormatW/test1/CMakeLists.txt       |  2 +-
 .../{GetDateFormatW.c => GetDateFormatW.cpp}  |  2 +-
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test.c => test.cpp}                |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test.c => test.cpp}                |  2 +-
 .../test2/CMakeLists.txt                      |  2 +-
 .../test2/{test.c => test.cpp}                |  0
 .../test3/CMakeLists.txt                      |  2 +-
 .../test3/{test.c => test.cpp}                |  0
 .../test4/CMakeLists.txt                      |  2 +-
 .../test4/{test.c => test.cpp}                |  2 +-
 .../test5/CMakeLists.txt                      |  2 +-
 .../test5/{test5.c => test5.cpp}              |  4 +-
 .../test6/CMakeLists.txt                      |  2 +-
 .../test6/{test6.c => test6.cpp}              |  2 +-
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test.c => test.cpp}                |  2 +-
 .../test2/CMakeLists.txt                      |  2 +-
 .../test2/{test.c => test.cpp}                |  0
 .../test3/CMakeLists.txt                      |  2 +-
 .../test3/{test.c => test.cpp}                |  0
 .../test4/CMakeLists.txt                      |  2 +-
 .../test4/{test.c => test.cpp}                |  2 +-
 .../test5/CMakeLists.txt                      |  2 +-
 .../test5/{test5.c => test5.cpp}              |  4 +-
 .../test6/CMakeLists.txt                      |  2 +-
 .../test6/{test6.c => test6.cpp}              |  2 +-
 .../GetLastError/test1/CMakeLists.txt         |  2 +-
 .../GetLastError/test1/{test.c => test.cpp}   |  0
 .../GetSystemInfo/test1/CMakeLists.txt        |  2 +-
 .../GetSystemInfo/test1/{test.c => test.cpp}  |  0
 .../GetTickCount/test1/CMakeLists.txt         |  2 +-
 .../GetTickCount/test1/{test.c => test.cpp}   |  0
 .../GetUserNameW/test1/CMakeLists.txt         |  2 +-
 .../GetUserNameW/test1/{test.c => test.cpp}   |  0
 .../GetVersionExA/test1/CMakeLists.txt        |  2 +-
 .../GetVersionExA/test1/{test.c => test.cpp}  |  0
 .../GetVersionExW/test1/CMakeLists.txt        |  2 +-
 .../GetVersionExW/test1/{test.c => test.cpp}  |  0
 .../IsBadCodePtr/test1/CMakeLists.txt         |  2 +-
 .../IsBadCodePtr/test1/{test1.c => test1.cpp} |  0
 .../IsBadReadPtr/test1/CMakeLists.txt         |  2 +-
 .../IsBadReadPtr/test1/{test.c => test.cpp}   |  0
 .../IsBadWritePtr/test1/CMakeLists.txt        |  2 +-
 .../IsBadWritePtr/test1/{test.c => test.cpp}  |  0
 .../IsBadWritePtr/test2/CMakeLists.txt        |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../IsBadWritePtr/test3/CMakeLists.txt        |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../MessageBoxW/test1/CMakeLists.txt          |  2 +-
 .../MessageBoxW/test1/{test.c => test.cpp}    |  0
 .../MessageBoxW/test2/CMakeLists.txt          |  2 +-
 .../MessageBoxW/test2/{test.c => test.cpp}    |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../test2/CMakeLists.txt                      |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../test3/CMakeLists.txt                      |  2 +-
 .../test3/{test3.c => test3.cpp}              |  4 +-
 .../test4/CMakeLists.txt                      |  2 +-
 .../test4/{test4.c => test4.cpp}              |  2 +-
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test.c => test.cpp}                |  0
 .../test2/CMakeLists.txt                      |  2 +-
 .../test2/{test.c => test.cpp}                |  0
 .../test3/CMakeLists.txt                      |  2 +-
 .../test3/{test3.c => test3.cpp}              |  4 +-
 .../test4/CMakeLists.txt                      |  2 +-
 .../test4/{test4.c => test4.cpp}              |  2 +-
 .../SetLastError/test1/CMakeLists.txt         |  2 +-
 .../SetLastError/test1/{test.c => test.cpp}   |  0
 .../_i64tow/test1/CMakeLists.txt              |  2 +-
 .../_i64tow/test1/{test1.c => test1.cpp}      |  0
 .../_ui64tow/test1/CMakeLists.txt             |  2 +-
 .../test1/{_ui64tow.c => _ui64tow.cpp}        |  6 +-
 .../_ui64tow/test2/CMakeLists.txt             |  2 +-
 .../test2/{_ui64tow.c => _ui64tow.cpp}        |  0
 .../lstrcatW/test1/CMakeLists.txt             |  2 +-
 .../lstrcatW/test1/{test.c => test.cpp}       |  0
 .../lstrcatW/test2/CMakeLists.txt             |  2 +-
 .../lstrcatW/test2/{test2.c => test2.cpp}     |  0
 .../lstrcatW/test3/CMakeLists.txt             |  2 +-
 .../lstrcatW/test3/{test3.c => test3.cpp}     |  0
 .../lstrcatW/test4/CMakeLists.txt             |  2 +-
 .../lstrcatW/test4/{test4.c => test4.cpp}     |  0
 .../lstrcpyW/test1/CMakeLists.txt             |  2 +-
 .../lstrcpyW/test1/{test.c => test.cpp}       |  0
 .../lstrcpynW/test1/CMakeLists.txt            |  2 +-
 .../lstrcpynW/test1/{test.c => test.cpp}      |  0
 .../lstrlenA/test1/CMakeLists.txt             |  2 +-
 .../lstrlenA/test1/{test.c => test.cpp}       |  0
 .../lstrlenW/test1/CMakeLists.txt             |  2 +-
 .../lstrlenW/test1/{test.c => test.cpp}       |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../wsprintfA/test1/CMakeLists.txt            |  2 +-
 .../wsprintfA/test1/{test.c => test.cpp}      |  0
 .../wsprintfA/test11/CMakeLists.txt           |  2 +-
 .../wsprintfA/test11/{test.c => test.cpp}     |  0
 .../wsprintfA/test12/CMakeLists.txt           |  2 +-
 .../wsprintfA/test12/{test.c => test.cpp}     |  0
 .../wsprintfA/test13/CMakeLists.txt           |  2 +-
 .../wsprintfA/test13/{test.c => test.cpp}     |  0
 .../wsprintfA/test2/CMakeLists.txt            |  2 +-
 .../wsprintfA/test2/{test.c => test.cpp}      |  0
 .../wsprintfA/test3/CMakeLists.txt            |  2 +-
 .../wsprintfA/test3/{test.c => test.cpp}      |  0
 .../wsprintfA/test6/CMakeLists.txt            |  2 +-
 .../wsprintfA/test6/{test.c => test.cpp}      |  0
 .../wsprintfA/test7/CMakeLists.txt            |  2 +-
 .../wsprintfA/test7/{test.c => test.cpp}      |  0
 .../wsprintfA/test8/CMakeLists.txt            |  2 +-
 .../wsprintfA/test8/{test.c => test.cpp}      |  0
 .../wsprintfA/test9/CMakeLists.txt            |  2 +-
 .../wsprintfA/test9/{test.c => test.cpp}      |  0
 .../wsprintfW/test1/CMakeLists.txt            |  2 +-
 .../wsprintfW/test1/{test.c => test.cpp}      |  0
 .../wsprintfW/test11/CMakeLists.txt           |  2 +-
 .../wsprintfW/test11/{test.c => test.cpp}     |  0
 .../wsprintfW/test12/CMakeLists.txt           |  2 +-
 .../wsprintfW/test12/{test.c => test.cpp}     |  0
 .../wsprintfW/test13/CMakeLists.txt           |  2 +-
 .../wsprintfW/test13/{test.c => test.cpp}     |  0
 .../wsprintfW/test2/CMakeLists.txt            |  2 +-
 .../wsprintfW/test2/{test.c => test.cpp}      |  0
 .../wsprintfW/test3/CMakeLists.txt            |  2 +-
 .../wsprintfW/test3/{test.c => test.cpp}      |  0
 .../wsprintfW/test6/CMakeLists.txt            |  2 +-
 .../wsprintfW/test6/{test.c => test.cpp}      |  0
 .../wsprintfW/test7/CMakeLists.txt            |  2 +-
 .../wsprintfW/test7/{test.c => test.cpp}      |  0
 .../wsprintfW/test8/CMakeLists.txt            |  2 +-
 .../wsprintfW/test8/{test.c => test.cpp}      |  0
 .../wsprintfW/test9/CMakeLists.txt            |  2 +-
 .../wsprintfW/test9/{test.c => test.cpp}      |  0
 .../PAL_GetPALDirectoryW/test1/CMakeLists.txt |  2 +-
 ...LDirectoryW.c => PAL_GetPALDirectoryW.cpp} |  2 +-
 .../test1/CMakeLists.txt                      |  2 +-
 ...ctoryW.c => PAL_GetUserTempDirectoryW.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 ...rminate.c => PAL_Initialize_Terminate.cpp} |  0
 .../test2/CMakeLists.txt                      |  2 +-
 ...alize_twice.c => pal_initialize_twice.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 ...L_RegisterLibraryW_UnregisterLibraryW.cpp} |  0
 .../test2_neg/CMakeLists.txt                  |  2 +-
 ...raryw_neg.c => reg_unreg_libraryw_neg.cpp} |  0
 .../PAL_errno/test1/CMakeLists.txt            |  2 +-
 .../test1/{PAL_errno.c => PAL_errno.cpp}      |  0
 .../PAL_get_stderr/test1/CMakeLists.txt       |  2 +-
 .../{PAL_get_stderr.c => PAL_get_stderr.cpp}  |  0
 .../PAL_get_stdin/test1/CMakeLists.txt        |  2 +-
 .../{PAL_get_stdin.c => PAL_get_stdin.cpp}    |  0
 .../PAL_get_stdout/test1/CMakeLists.txt       |  2 +-
 .../{PAL_get_stdout.c => PAL_get_stdout.cpp}  |  0
 .../pal_entrypoint/test1/CMakeLists.txt       |  2 +-
 .../{pal_entrypoint.c => pal_entrypoint.cpp}  |  0
 .../pal_initializedebug/test1/CMakeLists.txt  |  2 +-
 ...tializedebug.c => pal_initializedebug.cpp} |  0
 .../palsuite/samples/test1/CMakeLists.txt     |  2 +-
 .../samples/test1/{test.c => test.cpp}        |  0
 .../palsuite/samples/test2/CMakeLists.txt     |  2 +-
 .../samples/test2/{test.c => test.cpp}        |  0
 .../CreateEventA/test1/CMakeLists.txt         |  2 +-
 .../CreateEventA/test1/{test1.c => test1.cpp} |  0
 .../CreateEventA/test2/CMakeLists.txt         |  2 +-
 .../CreateEventA/test2/{test2.c => test2.cpp} |  0
 .../CreateEventA/test3/CMakeLists.txt         |  2 +-
 .../CreateEventA/test3/{test3.c => test3.cpp} |  0
 .../CreateEventW/test1/CMakeLists.txt         |  2 +-
 .../CreateEventW/test1/{test1.c => test1.cpp} |  0
 .../CreateEventW/test2/CMakeLists.txt         |  2 +-
 .../CreateEventW/test2/{test2.c => test2.cpp} |  0
 .../CreateEventW/test3/CMakeLists.txt         |  2 +-
 .../CreateEventW/test3/{test3.c => test3.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../{CreateMutexA.c => CreateMutexA.cpp}      |  0
 .../test2/CMakeLists.txt                      |  2 +-
 .../{CreateMutexA.c => CreateMutexA.cpp}      |  4 +-
 .../test1/CMakeLists.txt                      |  2 +-
 .../{CreateMutexW.c => CreateMutexW.cpp}      |  0
 .../test2/CMakeLists.txt                      |  2 +-
 .../{CreateMutexW.c => CreateMutexW.cpp}      |  0
 .../CreateProcessA/test1/CMakeLists.txt       |  4 +-
 .../{childProcess.c => childProcess.cpp}      |  0
 .../{parentProcess.c => parentProcess.cpp}    |  0
 .../CreateProcessA/test2/CMakeLists.txt       |  4 +-
 .../{childprocess.c => childprocess.cpp}      |  0
 .../{parentprocess.c => parentprocess.cpp}    |  0
 .../CreateProcessW/test1/CMakeLists.txt       |  4 +-
 .../{childProcess.c => childProcess.cpp}      |  2 +-
 .../{parentProcess.c => parentProcess.cpp}    |  0
 .../CreateProcessW/test2/CMakeLists.txt       |  4 +-
 .../{childprocess.c => childprocess.cpp}      |  0
 .../{parentprocess.c => parentprocess.cpp}    |  0
 .../test1/CMakeLists.txt                      |  2 +-
 ...{CreateSemaphore.c => CreateSemaphore.cpp} |  0
 .../test2/CMakeLists.txt                      |  2 +-
 ...{CreateSemaphore.c => CreateSemaphore.cpp} |  0
 .../test3/CMakeLists.txt                      |  2 +-
 ...{createsemaphore.c => createsemaphore.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 ...{CreateSemaphore.c => CreateSemaphore.cpp} |  0
 .../test2/CMakeLists.txt                      |  2 +-
 ...{CreateSemaphore.c => CreateSemaphore.cpp} |  0
 .../test3/CMakeLists.txt                      |  2 +-
 ...{createsemaphore.c => createsemaphore.cpp} |  0
 .../CreateThread/test1/CMakeLists.txt         |  2 +-
 .../CreateThread/test1/{test1.c => test1.cpp} |  2 +-
 .../CreateThread/test2/CMakeLists.txt         |  2 +-
 .../CreateThread/test2/{test2.c => test2.cpp} |  8 +--
 .../CreateThread/test3/CMakeLists.txt         |  2 +-
 .../CreateThread/test3/{test3.c => test3.cpp} |  0
 .../test1/CMakeLists.txt                      |  2 +-
 ...ection.c => InitializeCriticalSection.cpp} |  0
 .../test2/CMakeLists.txt                      |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../test3/CMakeLists.txt                      |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../test4/CMakeLists.txt                      |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../test5/CMakeLists.txt                      |  2 +-
 .../test5/{test5.c => test5.cpp}              |  0
 .../test6/CMakeLists.txt                      |  2 +-
 .../test6/{test6.c => test6.cpp}              |  0
 .../test7/CMakeLists.txt                      |  2 +-
 .../test7/{test7.c => test7.cpp}              |  0
 .../test8/CMakeLists.txt                      |  2 +-
 .../test8/{test8.c => test8.cpp}              |  0
 .../test1/{test1.c => test1.cpp}              |  0
 .../test1/{testlib.c => testlib.cpp}          |  0
 .../test2/{dllmain1.c => dllmain1.cpp}        |  0
 .../test2/{dllmain2.c => dllmain2.cpp}        |  0
 .../test2/{test2.c => test2.cpp}              |  0
 .../DuplicateHandle/test1/CMakeLists.txt      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../DuplicateHandle/test10/CMakeLists.txt     |  2 +-
 .../test10/{test10.c => test10.cpp}           |  0
 .../DuplicateHandle/test11/CMakeLists.txt     |  4 +-
 .../{childprocess.c => childprocess.cpp}      |  0
 .../test11/{test11.c => test11.cpp}           |  0
 .../DuplicateHandle/test12/CMakeLists.txt     |  2 +-
 .../test12/{test12.c => test12.cpp}           |  0
 .../DuplicateHandle/test2/CMakeLists.txt      |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../DuplicateHandle/test3/CMakeLists.txt      |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../DuplicateHandle/test4/CMakeLists.txt      |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../DuplicateHandle/test5/CMakeLists.txt      |  2 +-
 .../test5/{test5.c => test5.cpp}              |  0
 .../DuplicateHandle/test6/CMakeLists.txt      |  2 +-
 .../test6/{test6.c => test6.cpp}              |  0
 .../DuplicateHandle/test7/CMakeLists.txt      |  2 +-
 .../test7/{test7.c => test7.cpp}              |  0
 .../DuplicateHandle/test8/CMakeLists.txt      |  2 +-
 .../test8/{test8.c => test8.cpp}              |  0
 .../DuplicateHandle/test9/CMakeLists.txt      |  2 +-
 .../test9/{test9.c => test9.cpp}              |  0
 .../ExitProcess/test1/CMakeLists.txt          |  2 +-
 .../test1/{ExitProcess.c => ExitProcess.cpp}  |  0
 .../ExitProcess/test2/CMakeLists.txt          |  2 +-
 .../ExitProcess/test2/{test2.c => test2.cpp}  |  0
 .../ExitProcess/test3/CMakeLists.txt          |  2 +-
 .../ExitProcess/test3/{test3.c => test3.cpp}  |  0
 .../threading/ExitThread/test1/CMakeLists.txt |  2 +-
 .../ExitThread/test1/{test1.c => test1.cpp}   |  0
 .../threading/ExitThread/test2/CMakeLists.txt |  4 +-
 .../{childprocess.c => childprocess.cpp}      |  0
 .../ExitThread/test2/{test2.c => test2.cpp}   |  0
 .../test3/{dllmain.c => dllmain.cpp}          |  0
 .../ExitThread/test3/{test3.c => test3.cpp}   |  0
 .../GetCurrentProcess/test1/CMakeLists.txt    |  2 +-
 .../test1/{process.c => process.cpp}          |  0
 .../GetCurrentProcessId/test1/CMakeLists.txt  |  2 +-
 .../test1/{processId.c => processId.cpp}      |  0
 .../GetCurrentThread/test1/CMakeLists.txt     |  2 +-
 .../test1/{thread.c => thread.cpp}            |  0
 .../GetCurrentThread/test2/CMakeLists.txt     |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../GetCurrentThreadId/test1/CMakeLists.txt   |  2 +-
 .../test1/{threadId.c => threadId.cpp}        |  0
 .../GetExitCodeProcess/test1/CMakeLists.txt   |  4 +-
 .../{childProcess.c => childProcess.cpp}      |  0
 .../test1/{test1.c => test1.cpp}              |  0
 .../GetProcessTimes/test2/CMakeLists.txt      |  2 +-
 .../test2/{test2.c => test2.cpp}              |  2 +-
 .../GetThreadTimes/test1/CMakeLists.txt       |  2 +-
 .../test1/{test1.c => test1.cpp}              |  4 +-
 .../threading/OpenEventW/test1/CMakeLists.txt |  2 +-
 .../OpenEventW/test1/{test1.c => test1.cpp}   |  0
 .../threading/OpenEventW/test2/CMakeLists.txt |  2 +-
 .../OpenEventW/test2/{test2.c => test2.cpp}   |  0
 .../threading/OpenEventW/test3/CMakeLists.txt |  4 +-
 .../{childprocess.c => childprocess.cpp}      |  0
 .../OpenEventW/test3/{test3.c => test3.cpp}   |  0
 .../threading/OpenEventW/test4/CMakeLists.txt |  2 +-
 .../OpenEventW/test4/{test4.c => test4.cpp}   |  0
 .../threading/OpenEventW/test5/CMakeLists.txt |  2 +-
 .../OpenEventW/test5/{test5.c => test5.cpp}   |  0
 .../OpenProcess/test1/CMakeLists.txt          |  4 +-
 .../{childProcess.c => childProcess.cpp}      |  0
 .../OpenProcess/test1/{test1.c => test1.cpp}  |  0
 .../QueryThreadCycleTime/test1/CMakeLists.txt |  2 +-
 .../test1/{test1.c => test1.cpp}              |  4 +-
 .../QueueUserAPC/test1/CMakeLists.txt         |  2 +-
 .../QueueUserAPC/test1/{test1.c => test1.cpp} |  0
 .../QueueUserAPC/test2/CMakeLists.txt         |  2 +-
 .../QueueUserAPC/test2/{test2.c => test2.cpp} |  0
 .../QueueUserAPC/test3/CMakeLists.txt         |  2 +-
 .../QueueUserAPC/test3/{test3.c => test3.cpp} |  0
 .../QueueUserAPC/test4/CMakeLists.txt         |  2 +-
 .../QueueUserAPC/test4/{test4.c => test4.cpp} |  0
 .../QueueUserAPC/test5/CMakeLists.txt         |  2 +-
 .../QueueUserAPC/test5/{test5.c => test5.cpp} |  0
 .../QueueUserAPC/test6/CMakeLists.txt         |  2 +-
 .../QueueUserAPC/test6/{test6.c => test6.cpp} |  0
 .../QueueUserAPC/test7/CMakeLists.txt         |  2 +-
 .../QueueUserAPC/test7/{test7.c => test7.cpp} |  0
 .../ReleaseMutex/test3/CMakeLists.txt         |  2 +-
 .../{ReleaseMutex.c => ReleaseMutex.cpp}      |  0
 .../threading/ResetEvent/test1/CMakeLists.txt |  2 +-
 .../ResetEvent/test1/{test1.c => test1.cpp}   |  0
 .../threading/ResetEvent/test2/CMakeLists.txt |  2 +-
 .../ResetEvent/test2/{test2.c => test2.cpp}   |  0
 .../threading/ResetEvent/test3/CMakeLists.txt |  2 +-
 .../ResetEvent/test3/{test3.c => test3.cpp}   |  0
 .../threading/ResetEvent/test4/CMakeLists.txt |  2 +-
 .../ResetEvent/test4/{test4.c => test4.cpp}   |  0
 .../ResumeThread/test1/CMakeLists.txt         |  2 +-
 .../ResumeThread/test1/{test1.c => test1.cpp} |  0
 .../SetErrorMode/test1/CMakeLists.txt         |  2 +-
 .../SetErrorMode/test1/{test1.c => test1.cpp} |  0
 .../threading/SetEvent/test1/CMakeLists.txt   |  2 +-
 .../SetEvent/test1/{test1.c => test1.cpp}     |  0
 .../threading/SetEvent/test2/CMakeLists.txt   |  2 +-
 .../SetEvent/test2/{test2.c => test2.cpp}     |  0
 .../threading/SetEvent/test3/CMakeLists.txt   |  2 +-
 .../SetEvent/test3/{test3.c => test3.cpp}     |  0
 .../threading/SetEvent/test4/CMakeLists.txt   |  2 +-
 .../SetEvent/test4/{test4.c => test4.cpp}     |  0
 .../threading/Sleep/test1/CMakeLists.txt      |  2 +-
 .../Sleep/test1/{Sleep.c => Sleep.cpp}        |  0
 .../threading/Sleep/test2/CMakeLists.txt      |  2 +-
 .../Sleep/test2/{sleep.c => sleep.cpp}        |  0
 .../threading/SleepEx/test1/CMakeLists.txt    |  2 +-
 .../SleepEx/test1/{test1.c => test1.cpp}      |  0
 .../threading/SleepEx/test2/CMakeLists.txt    |  2 +-
 .../SleepEx/test2/{test2.c => test2.cpp}      |  0
 .../SwitchToThread/test1/CMakeLists.txt       |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../threading/TLS/test1/CMakeLists.txt        |  2 +-
 .../threading/TLS/test1/{TLS.c => TLS.cpp}    |  0
 .../threading/TLS/test2/CMakeLists.txt        |  2 +-
 .../threading/TLS/test2/{TLS.c => TLS.cpp}    |  0
 .../threading/TLS/test3/CMakeLists.txt        |  2 +-
 .../threading/TLS/test3/{TLS.c => TLS.cpp}    |  0
 .../threading/TLS/test4/CMakeLists.txt        |  2 +-
 .../TLS/test4/{test4.c => test4.cpp}          |  0
 .../threading/TLS/test5/CMakeLists.txt        |  2 +-
 .../TLS/test5/{test5.c => test5.cpp}          |  0
 .../TLS/test6_optimizedtls/CMakeLists.txt     |  2 +-
 .../test6_optimizedtls/{test.c => test.cpp}   |  0
 .../TerminateProcess/test1/CMakeLists.txt     |  2 +-
 ...erminateProcess.c => TerminateProcess.cpp} |  0
 .../ThreadPriority/test1/CMakeLists.txt       |  2 +-
 .../{ThreadPriority.c => ThreadPriority.cpp}  |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../test1/CMakeLists.txt                      |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../test2/CMakeLists.txt                      |  2 +-
 .../test2/{test2.c => test2.cpp}              |  0
 .../test3/CMakeLists.txt                      |  2 +-
 .../test3/{test3.c => test3.cpp}              |  0
 .../test4/CMakeLists.txt                      |  2 +-
 .../test4/{test4.c => test4.cpp}              |  0
 .../test5/CMakeLists.txt                      |  4 +-
 .../test5/{helper.c => helper.cpp}            |  0
 .../test5/{test5.c => test5.cpp}              |  0
 .../test6/CMakeLists.txt                      |  4 +-
 .../test6/{child6.c => child6.cpp}            |  0
 .../test6/{test6.c => test6.cpp}              |  0
 .../WFSOExMutexTest/CMakeLists.txt            |  2 +-
 ...{WFSOExMutexTest.c => WFSOExMutexTest.cpp} |  0
 .../WFSOExSemaphoreTest/CMakeLists.txt        |  2 +-
 ...emaphoreTest.c => WFSOExSemaphoreTest.cpp} |  0
 .../WFSOExThreadTest/CMakeLists.txt           |  2 +-
 ...FSOExThreadTest.c => WFSOExThreadTest.cpp} |  0
 .../WFSOMutexTest/CMakeLists.txt              |  2 +-
 .../{WFSOMutexTest.c => WFSOMutexTest.cpp}    |  0
 .../WFSOProcessTest/CMakeLists.txt            |  4 +-
 .../{ChildProcess.c => ChildProcess.cpp}      |  0
 ...{WFSOProcessTest.c => WFSOProcessTest.cpp} |  0
 .../WFSOSemaphoreTest/CMakeLists.txt          |  2 +-
 ...OSemaphoreTest.c => WFSOSemaphoreTest.cpp} |  0
 .../WFSOThreadTest/CMakeLists.txt             |  2 +-
 .../{WFSOThreadTest.c => WFSOThreadTest.cpp}  |  0
 .../WaitForSingleObject/test1/CMakeLists.txt  |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../YieldProcessor/test1/CMakeLists.txt       |  2 +-
 .../test1/{test1.c => test1.cpp}              |  0
 .../releasesemaphore/test1/CMakeLists.txt     |  2 +-
 .../test1/{test.c => test.cpp}                |  0
 src/vm/microsoft.comservices_i.c              | 14 ++---
 2098 files changed, 1405 insertions(+), 1396 deletions(-)
 rename src/ilasm/prebuilt/{asmparse.c => asmparse.cpp} (100%)
 rename src/inc/{xmlparser_i.c => xmlparser_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{clrdata_i.c => clrdata_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{clrinternal_i.c => clrinternal_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{clrprivappxhosting_i.c => clrprivappxhosting_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{clrprivbinding_i.c => clrprivbinding_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{clrprivhosting_i.c => clrprivhosting_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{clrprivruntimebinders_i.c => clrprivruntimebinders_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{cordebug_i.c => cordebug_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{corprof_i.c => corprof_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{corpub_i.c => corpub_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{corsym_i.c => corsym_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{fusionpriv_i.c => fusionpriv_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{gchost_i.c => gchost_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{ivalidator_i.c => ivalidator_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{ivehandler_i.c => ivehandler_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{mscorsvc_i.c => mscorsvc_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{sospriv_i.c => sospriv_i.cpp} (99%)
 rename src/pal/prebuilt/idl/{tlbimpexp_i.c => tlbimpexp_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{xclrdata_i.c => xclrdata_i.cpp} (100%)
 rename src/pal/prebuilt/idl/{xcordebug_i.c => xcordebug_i.cpp} (100%)
 rename src/pal/src/examples/{example1.c => example1.cpp} (100%)
 rename src/pal/src/safecrt/{makepath_s.c => makepath_s.cpp} (100%)
 rename src/pal/src/safecrt/{mbusafecrt.c => mbusafecrt.cpp} (100%)
 rename src/pal/src/safecrt/{memcpy_s.c => memcpy_s.cpp} (100%)
 rename src/pal/src/safecrt/{memmove_s.c => memmove_s.cpp} (100%)
 rename src/pal/src/safecrt/{safecrt_input_s.c => safecrt_input_s.cpp} (100%)
 rename src/pal/src/safecrt/{safecrt_output_l.c => safecrt_output_l.cpp} (100%)
 rename src/pal/src/safecrt/{safecrt_output_s.c => safecrt_output_s.cpp} (100%)
 rename src/pal/src/safecrt/{safecrt_winput_s.c => safecrt_winput_s.cpp} (100%)
 rename src/pal/src/safecrt/{safecrt_woutput_s.c => safecrt_woutput_s.cpp} (100%)
 rename src/pal/src/safecrt/{snprintf.c => snprintf.cpp} (100%)
 rename src/pal/src/safecrt/{splitpath_s.c => splitpath_s.cpp} (100%)
 rename src/pal/src/safecrt/{sprintf.c => sprintf.cpp} (100%)
 rename src/pal/src/safecrt/{sscanf.c => sscanf.cpp} (98%)
 rename src/pal/src/safecrt/{strcat_s.c => strcat_s.cpp} (100%)
 rename src/pal/src/safecrt/{strcpy_s.c => strcpy_s.cpp} (100%)
 rename src/pal/src/safecrt/{strlen_s.c => strlen_s.cpp} (95%)
 rename src/pal/src/safecrt/{strncat_s.c => strncat_s.cpp} (100%)
 rename src/pal/src/safecrt/{strncpy_s.c => strncpy_s.cpp} (100%)
 rename src/pal/src/safecrt/{strtok_s.c => strtok_s.cpp} (100%)
 rename src/pal/src/safecrt/{swprintf.c => swprintf.cpp} (100%)
 rename src/pal/src/safecrt/{vsprintf.c => vsprintf.cpp} (100%)
 rename src/pal/src/safecrt/{vswprint.c => vswprint.cpp} (100%)
 rename src/pal/src/safecrt/{wcscat_s.c => wcscat_s.cpp} (100%)
 rename src/pal/src/safecrt/{wcscpy_s.c => wcscpy_s.cpp} (100%)
 rename src/pal/src/safecrt/{wcslen_s.c => wcslen_s.cpp} (100%)
 rename src/pal/src/safecrt/{wcsncat_s.c => wcsncat_s.cpp} (100%)
 rename src/pal/src/safecrt/{wcsncpy_s.c => wcsncpy_s.cpp} (100%)
 rename src/pal/src/safecrt/{wcstok_s.c => wcstok_s.cpp} (100%)
 rename src/pal/src/safecrt/{wmakepath_s.c => wmakepath_s.cpp} (100%)
 rename src/pal/src/safecrt/{wsplitpath_s.c => wsplitpath_s.cpp} (100%)
 rename src/pal/src/safecrt/{xtoa_s.c => xtoa_s.cpp} (100%)
 rename src/pal/src/safecrt/{xtow_s.c => xtow_s.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/__iscsym/test1/{__iscsym.c => __iscsym.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_alloca/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_ecvt/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_fdopen/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_finite/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_fullpath/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_gcvt/test1/{_gcvt.c => _gcvt.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_gcvt/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_getw/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_isnan/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_itow/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_makepath/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_mbsdec/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_mbsinc/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_mbslen/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_mbsninc/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_putenv/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_putenv/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_putenv/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_putenv/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_putw/test1/{test1.c => test1.cpp} (98%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test19/{test19.c => test19.cpp} (92%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test19/{test19.c => test19.cpp} (94%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_snwprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_splitpath/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_stricmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_strlwr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_strnicmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_swab/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/{test19.c => test19.cpp} (96%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/{test19.c => test19.cpp} (98%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wcslwr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wfopen/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wfopen/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wfopen/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wfopen/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wfopen/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wfopen/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wfopen/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wmakepath/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/_wtoi/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/abs/test1/{abs.c => abs.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/acos/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/asin/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/atan/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/atan2/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/atof/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/atoi/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/atol/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/bsearch/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/bsearch/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/ceil/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/cos/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/cosh/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/ctime/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/errno/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/errno/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/exit/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/exit/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/exp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fabs/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fabsf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fclose/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fclose/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/feof/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/ferror/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/ferror/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fflush/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fgets/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fgets/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fgets/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/floor/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fmod/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fmodf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fopen/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fopen/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fopen/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fopen/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fopen/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fopen/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fopen/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test19/{test19.c => test19.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fputs/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fputs/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fread/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fread/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fread/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/free/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fseek/test1/{test1.c => test1.cpp} (99%)
 rename src/pal/tests/palsuite/c_runtime/ftell/test1/{ftell.c => ftell.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test19/{test19.c => test19.cpp} (92%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/fwrite/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/getc/test1/{getc.c => getc.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/getenv/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/getenv/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/getenv/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isalnum/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isalpha/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isdigit/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/islower/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isprint/test1/{isprint.c => isprint.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isprint/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isspace/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isupper/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/iswdigit/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/iswprint/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/iswspace/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/iswupper/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/iswxdigit/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/isxdigit/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/labs/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/llabs/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/localtime/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/log/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/log10/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/malloc/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/malloc/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/memchr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/memcmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/memcpy/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/memmove/test1/{test1.c => test1.cpp} (95%)
 rename src/pal/tests/palsuite/c_runtime/memset/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/modf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/modff/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/pow/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test19/{test19.c => test19.cpp} (92%)
 rename src/pal/tests/palsuite/c_runtime/printf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/printf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/qsort/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/qsort/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/rand_srand/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/realloc/test1/{test1.c => test1.cpp} (97%)
 rename src/pal/tests/palsuite/c_runtime/sin/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sinh/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test19/{test19.c => test19.cpp} (92%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sqrt/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/sscanf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strcat/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strchr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strcmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strcpy/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strcspn/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strlen/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strncat/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strncmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strncpy/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strpbrk/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strrchr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strspn/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strstr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strtod/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strtod/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strtok/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/strtoul/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test19/{test19.c => test19.cpp} (95%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/swscanf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/tan/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/tanh/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/time/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/tolower/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/toupper/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/towlower/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/towupper/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/ungetc/test1/{ungetc.c => ungetc.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/ungetc/test2/{ungetc.c => ungetc.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test19/{test19.c => test19.cpp} (92%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vfprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test19/{test19.c => test19.cpp} (92%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test19/{test19.c => test19.cpp} (94%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vsprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test13/{test13.c => test13.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test14/{test14.c => test14.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test15/{test15.c => test15.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test16/{test16.c => test16.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test17/{test17.c => test17.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test18/{test18.c => test18.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test19/{test19.c => test19.cpp} (98%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/vswprintf/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcscat/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcschr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcscmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcscpy/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcslen/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcsncat/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcsncmp/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcsncpy/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcspbrk/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcsrchr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcsstr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstod/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstod/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstok/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstol/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstol/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstol/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstol/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstol/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstol/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstoul/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstoul/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstoul/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstoul/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstoul/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wcstoul/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wprintf/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/c_runtime/wprintf/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/event/nonshared/{event.c => event.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/event/nonshared/{main.c => main.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/event/shared/{event.c => event.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/event/shared/{main.c => main.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/mutex/nonshared/{main.c => main.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/mutex/nonshared/{mutex.c => mutex.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/mutex/shared/{main.c => main.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/mutex/shared/{mutex.c => mutex.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/{main.c => main.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/{semaphore.c => semaphore.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/semaphore/shared/{main.c => main.cpp} (100%)
 rename src/pal/tests/palsuite/composite/object_management/semaphore/shared/{semaphore.c => semaphore.cpp} (100%)
 rename src/pal/tests/palsuite/composite/synchronization/criticalsection/{criticalsection.c => criticalsection.cpp} (100%)
 rename src/pal/tests/palsuite/composite/synchronization/criticalsection/{mainWrapper.c => mainWrapper.cpp} (100%)
 rename src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/{pal_composite_native_cs.c => pal_composite_native_cs.cpp} (100%)
 rename src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/{pal_composite_native_cs.c => pal_composite_native_cs.cpp} (100%)
 rename src/pal/tests/palsuite/composite/threading/threadsuspension/{mainWrapper.c => mainWrapper.cpp} (100%)
 rename src/pal/tests/palsuite/composite/threading/threadsuspension/{threadsuspension.c => threadsuspension.cpp} (100%)
 rename src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/{mainWrapper.c => mainWrapper.cpp} (100%)
 rename src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/{threadsuspension.c => threadsuspension.cpp} (100%)
 rename src/pal/tests/palsuite/composite/wfmo/{main.c => main.cpp} (100%)
 rename src/pal/tests/palsuite/composite/wfmo/{mutex.c => mutex.cpp} (100%)
 rename src/pal/tests/palsuite/debug_api/DebugBreak/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/{helper.c => helper.cpp} (99%)
 rename src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/{test1.c => test1.cpp} (99%)
 rename src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/{test3.c => test3.cpp} (99%)
 rename src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/{PAL_EXCEPT_FILTER.c => PAL_EXCEPT_FILTER.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/{pal_except_filter.c => pal_except_filter.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/{pal_except_filter.c => pal_except_filter.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/{PAL_EXCEPT_FILTER_EX.c => PAL_EXCEPT_FILTER_EX.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/{pal_except_filter_ex.c => pal_except_filter_ex.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/{pal_except_filter.c => pal_except_filter.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/{PAL_TRY_EXCEPT.c => PAL_TRY_EXCEPT.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/{PAL_TRY_EXCEPT.c => PAL_TRY_EXCEPT.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/{PAL_TRY_EXCEPT_EX.c => PAL_TRY_EXCEPT_EX.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/{PAL_TRY_EXCEPT_EX.c => PAL_TRY_EXCEPT_EX.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/{PAL_TRY_EXCEPT_EX.c => PAL_TRY_EXCEPT_EX.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/{PAL_TRY_LEAVE_FINALLY.c => PAL_TRY_LEAVE_FINALLY.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_except/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_except/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_except/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_except/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_except/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_except/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_except/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/exception_handling/pal_finally/test1/{pal_finally.c => pal_finally.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/{AreFileApisANSI.c => AreFileApisANSI.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CompareFileTime/test1/{CompareFileTime.c => CompareFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CopyFileA/test1/{CopyFileA.c => CopyFileA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CopyFileA/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CopyFileA/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CopyFileA/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CopyFileW/test1/{CopyFileW.c => CopyFileW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CopyFileW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CopyFileW/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/{CreateDirectoryA.c => CreateDirectoryA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/{createdirectorya.c => createdirectorya.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/{CreateDirectoryW.c => CreateDirectoryW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/{createdirectoryw.c => createdirectoryw.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CreateFileA/test1/{CreateFileA.c => CreateFileA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/CreateFileW/test1/{CreateFileW.c => CreateFileW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/DeleteFileW/test1/{DeleteFileW.c => DeleteFileW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FILECanonicalizePath/{FILECanonicalizePath.c => FILECanonicalizePath.cpp} (97%)
 rename src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FindClose/test1/{FindClose.c => FindClose.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FindFirstFileA/test1/{FindFirstFileA.c => FindFirstFileA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FindFirstFileW/test1/{FindFirstFileW.c => FindFirstFileW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FindNextFileA/test1/{FindNextFileA.c => FindNextFileA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FindNextFileA/test2/{findnextfilea.c => findnextfilea.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FindNextFileW/test1/{FindNextFileW.c => FindNextFileW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FindNextFileW/test2/{findnextfilew.c => findnextfilew.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/{FlushFileBuffers.c => FlushFileBuffers.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetConsoleCP/test1/{GetConsoleCP.c => GetConsoleCP.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/{GetConsoleOutputCP.c => GetConsoleOutputCP.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/{GetCurrentDirectoryA.c => GetCurrentDirectoryA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/{GetCurrentDirectoryW.c => GetCurrentDirectoryW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/{GetDiskFreeSpaceW.c => GetDiskFreeSpaceW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/{getdiskfreespacew.c => getdiskfreespacew.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/{GetFileAttributesA.c => GetFileAttributesA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/{GetFileAttributesW.c => GetFileAttributesW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileSize/test1/{GetFileSize.c => GetFileSize.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/{GetFileSizeEx.c => GetFileSizeEx.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileTime/test1/{GetFileTime.c => GetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileTime/test2/{GetFileTime.c => GetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileTime/test3/{GetFileTime.c => GetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileTime/test4/{GetFileTime.c => GetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileTime/test5/{getfiletime.c => getfiletime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileTime/test6/{getfiletime.c => getfiletime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileTime/test7/{getfiletime.c => getfiletime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileType/test1/{GetFileType.c => GetFileType.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileType/test2/{getfiletype.c => getfiletype.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFileType/test3/{getfiletype.c => getfiletype.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/{GetFullPathNameA.c => GetFullPathNameA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/{GetFullPathNameW.c => GetFullPathNameW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/{GetLongPathNameW.c => GetLongPathNameW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/{getlongpathnamew.c => getlongpathnamew.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetStdHandle/test1/{GetStdHandle.c => GetStdHandle.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetStdHandle/test2/{GetStdHandle.c => GetStdHandle.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetSystemTime/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/{GetSystemTimeAsFileTime.c => GetSystemTimeAsFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/{GetTempFileNameA.c => GetTempFileNameA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/{GetTempFileNameA.c => GetTempFileNameA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/{gettempfilenamea.c => gettempfilenamea.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/{GetTempFileNameW.c => GetTempFileNameW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/{GetTempFileNameW.c => GetTempFileNameW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/{gettempfilenamew.c => gettempfilenamew.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/GetTempPathW/test1/{GetTempPathW.c => GetTempPathW.cpp} (93%)
 rename src/pal/tests/palsuite/file_io/MoveFileA/test1/{MoveFileA.c => MoveFileA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/MoveFileExA/test1/{MoveFileExA.c => MoveFileExA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/MoveFileExW/test1/{MoveFileExW.c => MoveFileExW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/MoveFileW/test1/{MoveFileW.c => MoveFileW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/ReadFile/test1/{ReadFile.c => ReadFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/ReadFile/test2/{ReadFile.c => ReadFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/ReadFile/test3/{ReadFile.c => ReadFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/ReadFile/test4/{readfile.c => readfile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/{RemoveDirectoryW.c => RemoveDirectoryW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SearchPathA/test1/{SearchPathA.c => SearchPathA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SearchPathW/test1/{SearchPathW.c => SearchPathW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/{SetCurrentDirectoryA.c => SetCurrentDirectoryA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/{setcurrentdirectorya.c => setcurrentdirectorya.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/{setcurrentdirectorya.c => setcurrentdirectorya.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/{SetCurrentDirectoryW.c => SetCurrentDirectoryW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/{setcurrentdirectoryw.c => setcurrentdirectoryw.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/{setcurrentdirectoryw.c => setcurrentdirectoryw.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetEndOfFile/test1/{SetEndOfFile.c => SetEndOfFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetEndOfFile/test2/{SetEndOfFile.c => SetEndOfFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetEndOfFile/test3/{SetEndOfFile.c => SetEndOfFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetEndOfFile/test4/{setendoffile.c => setendoffile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetEndOfFile/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/{SetFileAttributesA.c => SetFileAttributesA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/{SetFileAttributesA.c => SetFileAttributesA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/{SetFileAttributesA.c => SetFileAttributesA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/{SetFileAttributesA.c => SetFileAttributesA.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/{SetFileAttributesW.c => SetFileAttributesW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/{SetFileAttributesW.c => SetFileAttributesW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/{SetFileAttributesW.c => SetFileAttributesW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/{SetFileAttributesW.c => SetFileAttributesW.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFilePointer/test1/{SetFilePointer.c => SetFilePointer.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFilePointer/test2/{SetFilePointer.c => SetFilePointer.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFilePointer/test3/{SetFilePointer.c => SetFilePointer.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFilePointer/test4/{SetFilePointer.c => SetFilePointer.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFilePointer/test5/{SetFilePointer.c => SetFilePointer.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFilePointer/test6/{SetFilePointer.c => SetFilePointer.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFilePointer/test7/{SetFilePointer.c => SetFilePointer.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileTime/test1/{SetFileTime.c => SetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileTime/test2/{SetFileTime.c => SetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileTime/test3/{SetFileTime.c => SetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/SetFileTime/test4/{SetFileTime.c => SetFileTime.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/WriteFile/test1/{WriteFile.c => WriteFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/WriteFile/test2/{WriteFile.c => WriteFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/WriteFile/test3/{WriteFile.c => WriteFile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/WriteFile/test4/{writefile.c => writefile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/WriteFile/test5/{writefile.c => writefile.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/errorpathnotfound/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/errorpathnotfound/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/errorpathnotfound/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/errorpathnotfound/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/file_io/gettemppatha/test1/{gettemppatha.c => gettemppatha.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/{CreateFileMapping.c => CreateFileMapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/{CreateFileMapping.c => CreateFileMapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/{CreateFileMapping.c => CreateFileMapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/{CreateFileMapping.c => CreateFileMapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/{CreateFileMapping.c => CreateFileMapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/{createfilemapping.c => createfilemapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/{createfilemapping.c => createfilemapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/{createfilemapping.c => createfilemapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/{CreateFileMapping_neg.c => CreateFileMapping_neg.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/{CreateFileMappingW.c => CreateFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/{CreateFileMappingW.c => CreateFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/{CreateFileMappingW.c => CreateFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/{CreateFileMappingW.c => CreateFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/{CreateFileMappingW.c => CreateFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/{CreateFileMappingW.c => CreateFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/{createfilemapping.c => createfilemapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/{createfilemapping.c => createfilemapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/{createfilemapping.c => createfilemapping.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/{FreeLibrary.c => FreeLibrary.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/{dlltest.c => dlltest.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/{dlltest.c => dlltest.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/{test1.c => test1.cpp} (98%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/{GetModuleFileNameA.c => GetModuleFileNameA.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/{GetModuleFileNameA.c => GetModuleFileNameA.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/{GetModuleFileNameW.c => GetModuleFileNameW.cpp} (97%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/{GetModuleFileNameW.c => GetModuleFileNameW.cpp} (94%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/{testlib.c => testlib.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/{testlib.c => testlib.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/{GetProcessHeap.c => GetProcessHeap.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/{HeapAlloc.c => HeapAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/{HeapAlloc.c => HeapAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/{HeapAlloc.c => HeapAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/{HeapFree.c => HeapFree.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/{test1.c => test1.cpp} (93%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/{test2.c => test2.cpp} (94%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/{test3.c => test3.cpp} (94%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/{test5.c => test5.cpp} (89%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/{LocalAlloc.c => LocalAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/{LocalFree.c => LocalFree.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/{LocalFree.c => LocalFree.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/{MapViewOfFile.c => MapViewOfFile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/{MapViewOfFile.c => MapViewOfFile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/{MapViewOfFile.c => MapViewOfFile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/{mapviewoffile.c => mapviewoffile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/{mapviewoffile.c => mapviewoffile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/{mapviewoffile.c => mapviewoffile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/{OpenFileMappingA.c => OpenFileMappingA.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/{OpenFileMappingA.c => OpenFileMappingA.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/{OpenFileMappingA.c => OpenFileMappingA.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/{OpenFileMappingW.c => OpenFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/{OpenFileMappingW.c => OpenFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/{OpenFileMappingW.c => OpenFileMappingW.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/{ReadProcessMemory_neg.c => ReadProcessMemory_neg.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/{ReadProcessMemory.c => ReadProcessMemory.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/{helper.c => helper.cpp} (99%)
 rename src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/{test2.c => test2.cpp} (98%)
 rename src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/{UnmapViewOfFile.c => UnmapViewOfFile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/{unmapviewoffile.c => unmapviewoffile.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/{virtualalloc.c => virtualalloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/{virtualalloc.c => virtualalloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/{VirtualAlloc.c => VirtualAlloc.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/{VirtualFree.c => VirtualFree.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/{VirtualFree.c => VirtualFree.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/{VirtualFree.c => VirtualFree.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/{VirtualProtect.c => VirtualProtect.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/{VirtualProtect.c => VirtualProtect.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/{VirtualProtect.c => VirtualProtect.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/{VirtualProtect.c => VirtualProtect.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/{VirtualProtect.c => VirtualProtect.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/{VirtualProtect.c => VirtualProtect.cpp} (100%)
 rename src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/{VirtualQuery.c => VirtualQuery.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test1/{LoadLibraryA.c => LoadLibraryA.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test2/{LoadLibraryA.c => LoadLibraryA.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test2/{MyModule.c => MyModule.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test3/{loadlibrarya.c => loadlibrarya.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test5/{loadlibrarya.c => loadlibrarya.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test6/{dlltest.c => dlltest.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test6/{loadlibrarya.c => loadlibrarya.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test7/{LoadLibraryA.c => LoadLibraryA.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test8/{dlltest.c => dlltest.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryA/test8/{loadlibrarya.c => loadlibrarya.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryW/test1/{LoadLibraryW.c => LoadLibraryW.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryW/test2/{loadlibraryw.c => loadlibraryw.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryW/test3/{loadlibraryw.c => loadlibraryw.cpp} (100%)
 rename src/pal/tests/palsuite/loader/LoadLibraryW/test5/{loadlibraryw.c => loadlibraryw.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/CompareStringA/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/CompareStringW/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetACP/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetCPInfo/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetCPInfo/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetCPInfo/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/IsValidLocale/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/{test4.c => test4.cpp} (99%)
 rename src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/{test5.c => test5.cpp} (99%)
 rename src/pal/tests/palsuite/miscellaneous/CharNextA/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/CharNextA/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/{test.c => test.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/{GetCalendarInfoW.c => GetCalendarInfoW.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/{GetCalendarInfoW.c => GetCalendarInfoW.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/{test.c => test.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/{GetDateFormatW_neg.c => GetDateFormatW_neg.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/{GetDateFormatW_neg.c => GetDateFormatW_neg.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/{GetDateFormatW.c => GetDateFormatW.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/{test.c => test.cpp} (98%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/{test.c => test.cpp} (98%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/{test5.c => test5.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/{test6.c => test6.cpp} (98%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/{test.c => test.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/{test.c => test.cpp} (96%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/{test5.c => test5.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/{test6.c => test6.cpp} (98%)
 rename src/pal/tests/palsuite/miscellaneous/GetLastError/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/{test3.c => test3.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/{test4.c => test4.cpp} (98%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/{test3.c => test3.cpp} (97%)
 rename src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/{test4.c => test4.cpp} (98%)
 rename src/pal/tests/palsuite/miscellaneous/SetLastError/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/_i64tow/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/{_ui64tow.c => _ui64tow.cpp} (94%)
 rename src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/{_ui64tow.c => _ui64tow.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/{PAL_GetPALDirectoryW.c => PAL_GetPALDirectoryW.cpp} (97%)
 rename src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/{PAL_GetUserTempDirectoryW.c => PAL_GetUserTempDirectoryW.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/{PAL_Initialize_Terminate.c => PAL_Initialize_Terminate.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/{pal_initialize_twice.c => pal_initialize_twice.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/{PAL_RegisterLibraryW_UnregisterLibraryW.c => PAL_RegisterLibraryW_UnregisterLibraryW.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/{reg_unreg_libraryw_neg.c => reg_unreg_libraryw_neg.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_errno/test1/{PAL_errno.c => PAL_errno.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/{PAL_get_stderr.c => PAL_get_stderr.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/{PAL_get_stdin.c => PAL_get_stdin.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/{PAL_get_stdout.c => PAL_get_stdout.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/{pal_entrypoint.c => pal_entrypoint.cpp} (100%)
 rename src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/{pal_initializedebug.c => pal_initializedebug.cpp} (100%)
 rename src/pal/tests/palsuite/samples/test1/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/samples/test2/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateEventA/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateEventA/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateEventA/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateEventW/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateEventW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateEventW/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/{CreateMutexA.c => CreateMutexA.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/{CreateMutexA.c => CreateMutexA.cpp} (99%)
 rename src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/{CreateMutexW.c => CreateMutexW.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/{CreateMutexW.c => CreateMutexW.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateProcessA/test1/{childProcess.c => childProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateProcessA/test1/{parentProcess.c => parentProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateProcessA/test2/{childprocess.c => childprocess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateProcessA/test2/{parentprocess.c => parentprocess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateProcessW/test1/{childProcess.c => childProcess.cpp} (98%)
 rename src/pal/tests/palsuite/threading/CreateProcessW/test1/{parentProcess.c => parentProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateProcessW/test2/{childprocess.c => childprocess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateProcessW/test2/{parentprocess.c => parentprocess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/{CreateSemaphore.c => CreateSemaphore.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/{CreateSemaphore.c => CreateSemaphore.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/{createsemaphore.c => createsemaphore.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/{CreateSemaphore.c => CreateSemaphore.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/{CreateSemaphore.c => CreateSemaphore.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/{createsemaphore.c => createsemaphore.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CreateThread/test1/{test1.c => test1.cpp} (98%)
 rename src/pal/tests/palsuite/threading/CreateThread/test2/{test2.c => test2.cpp} (96%)
 rename src/pal/tests/palsuite/threading/CreateThread/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/{InitializeCriticalSection.c => InitializeCriticalSection.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/{testlib.c => testlib.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/{dllmain1.c => dllmain1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/{dllmain2.c => dllmain2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test10/{test10.c => test10.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test11/{childprocess.c => childprocess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test11/{test11.c => test11.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test12/{test12.c => test12.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test8/{test8.c => test8.cpp} (100%)
 rename src/pal/tests/palsuite/threading/DuplicateHandle/test9/{test9.c => test9.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitProcess/test1/{ExitProcess.c => ExitProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitProcess/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitProcess/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitThread/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitThread/test2/{childprocess.c => childprocess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitThread/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitThread/test3/{dllmain.c => dllmain.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ExitThread/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetCurrentProcess/test1/{process.c => process.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/{processId.c => processId.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetCurrentThread/test1/{thread.c => thread.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetCurrentThread/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/{threadId.c => threadId.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/{childProcess.c => childProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/GetProcessTimes/test2/{test2.c => test2.cpp} (98%)
 rename src/pal/tests/palsuite/threading/GetThreadTimes/test1/{test1.c => test1.cpp} (99%)
 rename src/pal/tests/palsuite/threading/OpenEventW/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/OpenEventW/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/OpenEventW/test3/{childprocess.c => childprocess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/OpenEventW/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/OpenEventW/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/OpenEventW/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/threading/OpenProcess/test1/{childProcess.c => childProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/OpenProcess/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/{test1.c => test1.cpp} (99%)
 rename src/pal/tests/palsuite/threading/QueueUserAPC/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/QueueUserAPC/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/QueueUserAPC/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/QueueUserAPC/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/QueueUserAPC/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/threading/QueueUserAPC/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/threading/QueueUserAPC/test7/{test7.c => test7.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ReleaseMutex/test3/{ReleaseMutex.c => ReleaseMutex.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ResetEvent/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ResetEvent/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ResetEvent/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ResetEvent/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ResumeThread/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SetErrorMode/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SetEvent/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SetEvent/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SetEvent/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SetEvent/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/Sleep/test1/{Sleep.c => Sleep.cpp} (100%)
 rename src/pal/tests/palsuite/threading/Sleep/test2/{sleep.c => sleep.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SleepEx/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SleepEx/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/SwitchToThread/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/TLS/test1/{TLS.c => TLS.cpp} (100%)
 rename src/pal/tests/palsuite/threading/TLS/test2/{TLS.c => TLS.cpp} (100%)
 rename src/pal/tests/palsuite/threading/TLS/test3/{TLS.c => TLS.cpp} (100%)
 rename src/pal/tests/palsuite/threading/TLS/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/TLS/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/{test.c => test.cpp} (100%)
 rename src/pal/tests/palsuite/threading/TerminateProcess/test1/{TerminateProcess.c => TerminateProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/ThreadPriority/test1/{ThreadPriority.c => ThreadPriority.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/{test2.c => test2.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/{test3.c => test3.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/{test4.c => test4.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/{helper.c => helper.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/{test5.c => test5.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/{child6.c => child6.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/{test6.c => test6.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/{WFSOExMutexTest.c => WFSOExMutexTest.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/{WFSOExSemaphoreTest.c => WFSOExSemaphoreTest.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/{WFSOExThreadTest.c => WFSOExThreadTest.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/{WFSOMutexTest.c => WFSOMutexTest.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/{ChildProcess.c => ChildProcess.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/{WFSOProcessTest.c => WFSOProcessTest.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/{WFSOSemaphoreTest.c => WFSOSemaphoreTest.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/{WFSOThreadTest.c => WFSOThreadTest.cpp} (100%)
 rename src/pal/tests/palsuite/threading/WaitForSingleObject/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/YieldProcessor/test1/{test1.c => test1.cpp} (100%)
 rename src/pal/tests/palsuite/threading/releasesemaphore/test1/{test.c => test.cpp} (100%)

diff --git a/src/ilasm/CMakeLists.txt b/src/ilasm/CMakeLists.txt
index 34ec7997c4b0..9e99d02bb2d7 100644
--- a/src/ilasm/CMakeLists.txt
+++ b/src/ilasm/CMakeLists.txt
@@ -22,25 +22,23 @@ set(ILASM_SOURCES
   asmman.cpp
   main.cpp
   assembler.cpp
-  prebuilt/asmparse.c
+  prebuilt/asmparse.cpp
 )
 if(WIN32)
   set(ILASM_RESOURCES Native.rc)
   add_definitions(-DFX_VER_INTERNALNAME_STR=ilasm.exe)
 endif(WIN32)
 
-set_source_files_properties( prebuilt/asmparse.c PROPERTIES LANGUAGE CXX )
 
 if(CLR_CMAKE_PLATFORM_UNIX)
-  add_compile_options(-x c++)
-  # Need generate a right form of asmparse.c to avoid the following options.
+  # Need generate a right form of asmparse.cpp to avoid the following options.
   # Clang also produces a bad-codegen on this prebuilt file with optimization.
   # https://github.com/dotnet/coreclr/issues/2305
   add_compile_options(-Wno-delete-non-virtual-dtor)
   add_compile_options(-Wno-deprecated-register)
   add_compile_options(-Wno-array-bounds)
   add_compile_options(-Wno-unused-label)
-  set_source_files_properties( prebuilt/asmparse.c PROPERTIES COMPILE_FLAGS -O0 )
+  set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )
 endif(CLR_CMAKE_PLATFORM_UNIX)
 
 _add_executable(ilasm
@@ -82,4 +80,5 @@ else()
   )
 endif(CLR_CMAKE_PLATFORM_UNIX)
 
-install_clr(ilasm)
\ No newline at end of file
+install_clr(ilasm)
+
diff --git a/src/ilasm/prebuilt/asmparse.c b/src/ilasm/prebuilt/asmparse.cpp
similarity index 100%
rename from src/ilasm/prebuilt/asmparse.c
rename to src/ilasm/prebuilt/asmparse.cpp
diff --git a/src/inc/CMakeLists.txt b/src/inc/CMakeLists.txt
index 803ca3bcc7e5..d38fa4077327 100644
--- a/src/inc/CMakeLists.txt
+++ b/src/inc/CMakeLists.txt
@@ -50,23 +50,22 @@ add_compile_options(/TC)
 
 else()
 
-#The MIDL tool exists for Windows only, so for other systems, we have the prebuilt xxx_i.c files checked in
+#The MIDL tool exists for Windows only, so for other systems, we have the prebuilt xxx_i.cpp files checked in
 
 # The prebuilt files contain extra '!_MIDL_USE_GUIDDEF_' after the #endif, but not in the comment.
 # In order to not to have to modify these prebuilt files, we disable the extra tokens warning.
 add_compile_options(-Wno-extra-tokens)
-
+add_compile_options(-D_MIDL_USE_GUIDDEF_)
 foreach(IDL_SOURCE IN LISTS CORGUIDS_IDL_SOURCES)
    get_filename_component(IDLNAME ${IDL_SOURCE} NAME_WE)
-   set(C_SOURCE ../pal/prebuilt/idl/${IDLNAME}_i.c)
+   set(C_SOURCE ../pal/prebuilt/idl/${IDLNAME}_i.cpp)
    list(APPEND CORGUIDS_SOURCES ${C_SOURCE})
 endforeach(IDL_SOURCE)
 
 add_compile_options(-fPIC)
-
 endif(WIN32)
 
-# Compile *_i.c to lib
+# Compile *_i.cpp to lib
 _add_library(corguids ${CORGUIDS_SOURCES})
 
 # Binplace the inc files for packaging later.
diff --git a/src/inc/xmlparser_i.c b/src/inc/xmlparser_i.cpp
similarity index 100%
rename from src/inc/xmlparser_i.c
rename to src/inc/xmlparser_i.cpp
diff --git a/src/pal/inc/mbusafecrt.h b/src/pal/inc/mbusafecrt.h
index c25676c499f5..ea3b2cb88f2a 100644
--- a/src/pal/inc/mbusafecrt.h
+++ b/src/pal/inc/mbusafecrt.h
@@ -65,7 +65,7 @@ extern WCHAR* wcstok_s( WCHAR* inString, const WCHAR* inControl, WCHAR** ioConte
 
 // strnlen is not required unless the source string is completely untrusted (e.g. anonymous input on a website)
 #ifndef SUPPRESS_STRNLEN
-    extern size_t strnlen( const char* inString, size_t inMaxSize );
+    extern size_t PAL_strnlen( const char* inString, size_t inMaxSize );
     extern size_t wcsnlen( const WCHAR* inString, size_t inMaxSize );
 #endif
 
diff --git a/src/pal/inc/pal.h b/src/pal/inc/pal.h
index 260528285e4b..792e24e07cbb 100644
--- a/src/pal/inc/pal.h
+++ b/src/pal/inc/pal.h
@@ -5802,6 +5802,7 @@ CoCreateGuid(OUT GUID * pguid);
 #define _wcstoui64    PAL__wcstoui64
 #define _flushall     PAL__flushall
 #define _vsnprintf    PAL__vsnprintf
+#define strnlen       PAL_strnlen
 
 #ifdef _AMD64_ 
 #define _mm_getcsr    PAL__mm_getcsr
diff --git a/src/pal/inc/pal_char16.h b/src/pal/inc/pal_char16.h
index b118e98e31d0..4600cc7ff6af 100644
--- a/src/pal/inc/pal_char16.h
+++ b/src/pal/inc/pal_char16.h
@@ -37,7 +37,8 @@ This file is used to define the wchar_t type as a 16-bit type on Unix.
 // Set up the wchar_t type (which got preprocessed to __wchar_16_cpp__).
 // In C++11, the standard gives us char16_t, which is what we want (and matches types with u"")
 // In C, this doesn't exist, so use unsigned short.
-
+// **** WARNING: Linking C and C++ objects will break with -fstrict-aliasing with GCC/Clang
+//               due to conditional typedef
 #if !defined(_WCHAR_T_DEFINED) || !defined(_MSC_VER)
 #if defined (PLATFORM_UNIX)
 #if defined(__cplusplus)
diff --git a/src/pal/inc/pal_mstypes.h b/src/pal/inc/pal_mstypes.h
index df17767747d1..64534701d810 100644
--- a/src/pal/inc/pal_mstypes.h
+++ b/src/pal/inc/pal_mstypes.h
@@ -215,6 +215,9 @@ extern "C" {
 // Defined in gnu's types.h. For non PAL_IMPLEMENTATION system
 // includes are not included, so we need to define them.
 #ifndef PAL_IMPLEMENTATION
+
+// OS X already defines these types in 64 bit
+#if !defined(_TARGET_MAC64)
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 typedef __int32 int32_t;
@@ -223,6 +226,8 @@ typedef __int16 int16_t;
 typedef unsigned __int16 uint16_t;
 typedef __int8 int8_t;
 typedef unsigned __int8 uint8_t;
+#endif
+
 #endif // PAL_IMPLEMENTATION
 
 #ifndef _MSC_VER
diff --git a/src/pal/inc/rt/palrt.h b/src/pal/inc/rt/palrt.h
index 336a13f52959..3ae1a8a76004 100644
--- a/src/pal/inc/rt/palrt.h
+++ b/src/pal/inc/rt/palrt.h
@@ -1076,6 +1076,7 @@ _SAFECRT__EXTERN_C
 errno_t __cdecl _itow_s(int _Value, WCHAR *_Dst, size_t _SizeInWords, int _Radix);
 
 #if defined(__cplusplus) && _SAFECRT_USE_CPP_OVERLOADS
+extern "C++"
 template <size_t _SizeInWords>
 inline
 errno_t __cdecl _itow_s(int _Value, WCHAR (&_Dst)[_SizeInWords], int _Radix)
@@ -1104,6 +1105,7 @@ _SAFECRT__EXTERN_C
 errno_t __cdecl _i64tow_s(__int64 _Value, WCHAR *_Dst, size_t _SizeInWords, int _Radix);
 
 #if defined(__cplusplus) && _SAFECRT_USE_CPP_OVERLOADS
+extern "C++"
 template <size_t _SizeInWords>
 inline
 errno_t __cdecl _i64tow_s(__int64 _Value, WCHAR (&_Dst)[_SizeInWords], int _Radix)
@@ -1135,6 +1137,7 @@ _SAFECRT__EXTERN_C
 errno_t __cdecl getenv_s(size_t *_ReturnValue, char *_Dst, size_t _SizeInWords, const char *_Name);
 
 #if defined(__cplusplus) && _SAFECRT_USE_CPP_OVERLOADS
+extern "C++"
 template <size_t _SizeInWords>
 inline
 errno_t __cdecl getenv_s(size_t *_ReturnValue, char *_Dst, size_t _SizeInWords, const char *_Name)
@@ -1247,6 +1250,7 @@ namespace std
     typedef decltype(nullptr) nullptr_t;
 }
 
+extern "C++"
 template< class T >
 typename std::remove_reference<T>::type&& move( T&& t );
 #endif // __cplusplus
diff --git a/src/pal/prebuilt/idl/clrdata_i.c b/src/pal/prebuilt/idl/clrdata_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/clrdata_i.c
rename to src/pal/prebuilt/idl/clrdata_i.cpp
diff --git a/src/pal/prebuilt/idl/clrinternal_i.c b/src/pal/prebuilt/idl/clrinternal_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/clrinternal_i.c
rename to src/pal/prebuilt/idl/clrinternal_i.cpp
diff --git a/src/pal/prebuilt/idl/clrprivappxhosting_i.c b/src/pal/prebuilt/idl/clrprivappxhosting_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/clrprivappxhosting_i.c
rename to src/pal/prebuilt/idl/clrprivappxhosting_i.cpp
diff --git a/src/pal/prebuilt/idl/clrprivbinding_i.c b/src/pal/prebuilt/idl/clrprivbinding_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/clrprivbinding_i.c
rename to src/pal/prebuilt/idl/clrprivbinding_i.cpp
diff --git a/src/pal/prebuilt/idl/clrprivhosting_i.c b/src/pal/prebuilt/idl/clrprivhosting_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/clrprivhosting_i.c
rename to src/pal/prebuilt/idl/clrprivhosting_i.cpp
diff --git a/src/pal/prebuilt/idl/clrprivruntimebinders_i.c b/src/pal/prebuilt/idl/clrprivruntimebinders_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/clrprivruntimebinders_i.c
rename to src/pal/prebuilt/idl/clrprivruntimebinders_i.cpp
diff --git a/src/pal/prebuilt/idl/cordebug_i.c b/src/pal/prebuilt/idl/cordebug_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/cordebug_i.c
rename to src/pal/prebuilt/idl/cordebug_i.cpp
diff --git a/src/pal/prebuilt/idl/corprof_i.c b/src/pal/prebuilt/idl/corprof_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/corprof_i.c
rename to src/pal/prebuilt/idl/corprof_i.cpp
diff --git a/src/pal/prebuilt/idl/corpub_i.c b/src/pal/prebuilt/idl/corpub_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/corpub_i.c
rename to src/pal/prebuilt/idl/corpub_i.cpp
diff --git a/src/pal/prebuilt/idl/corsym_i.c b/src/pal/prebuilt/idl/corsym_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/corsym_i.c
rename to src/pal/prebuilt/idl/corsym_i.cpp
diff --git a/src/pal/prebuilt/idl/fusionpriv_i.c b/src/pal/prebuilt/idl/fusionpriv_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/fusionpriv_i.c
rename to src/pal/prebuilt/idl/fusionpriv_i.cpp
diff --git a/src/pal/prebuilt/idl/gchost_i.c b/src/pal/prebuilt/idl/gchost_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/gchost_i.c
rename to src/pal/prebuilt/idl/gchost_i.cpp
diff --git a/src/pal/prebuilt/idl/ivalidator_i.c b/src/pal/prebuilt/idl/ivalidator_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/ivalidator_i.c
rename to src/pal/prebuilt/idl/ivalidator_i.cpp
diff --git a/src/pal/prebuilt/idl/ivehandler_i.c b/src/pal/prebuilt/idl/ivehandler_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/ivehandler_i.c
rename to src/pal/prebuilt/idl/ivehandler_i.cpp
diff --git a/src/pal/prebuilt/idl/mscorsvc_i.c b/src/pal/prebuilt/idl/mscorsvc_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/mscorsvc_i.c
rename to src/pal/prebuilt/idl/mscorsvc_i.cpp
diff --git a/src/pal/prebuilt/idl/sospriv_i.c b/src/pal/prebuilt/idl/sospriv_i.cpp
similarity index 99%
rename from src/pal/prebuilt/idl/sospriv_i.c
rename to src/pal/prebuilt/idl/sospriv_i.cpp
index 7fee909ca371..3584b761d27b 100644
--- a/src/pal/prebuilt/idl/sospriv_i.c
+++ b/src/pal/prebuilt/idl/sospriv_i.cpp
@@ -20,15 +20,13 @@
 
 #pragma warning( disable: 4049 )  /* more than 64k source lines */
 
+#include <rpc.h>
+#include <rpcndr.h>
 
 #ifdef __cplusplus
 extern "C"{
 #endif 
 
-
-#include <rpc.h>
-#include <rpcndr.h>
-
 #ifdef _MIDL_USE_GUIDDEF_
 
 #ifndef INITGUID
diff --git a/src/pal/prebuilt/idl/tlbimpexp_i.c b/src/pal/prebuilt/idl/tlbimpexp_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/tlbimpexp_i.c
rename to src/pal/prebuilt/idl/tlbimpexp_i.cpp
diff --git a/src/pal/prebuilt/idl/xclrdata_i.c b/src/pal/prebuilt/idl/xclrdata_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/xclrdata_i.c
rename to src/pal/prebuilt/idl/xclrdata_i.cpp
diff --git a/src/pal/prebuilt/idl/xcordebug_i.c b/src/pal/prebuilt/idl/xcordebug_i.cpp
similarity index 100%
rename from src/pal/prebuilt/idl/xcordebug_i.c
rename to src/pal/prebuilt/idl/xcordebug_i.cpp
diff --git a/src/pal/src/CMakeLists.txt b/src/pal/src/CMakeLists.txt
index 7df0aaf36074..b09922792cf7 100644
--- a/src/pal/src/CMakeLists.txt
+++ b/src/pal/src/CMakeLists.txt
@@ -160,37 +160,37 @@ set(SOURCES
   objmgr/palobjbase.cpp
   objmgr/shmobject.cpp
   objmgr/shmobjectmanager.cpp
-  safecrt/makepath_s.c
-  safecrt/memcpy_s.c
-  safecrt/memmove_s.c
-  safecrt/mbusafecrt.c
-  safecrt/safecrt_input_s.c
-  safecrt/safecrt_output_l.c
-  safecrt/safecrt_output_s.c
-  safecrt/safecrt_winput_s.c
-  safecrt/safecrt_woutput_s.c
-  safecrt/splitpath_s.c
-  safecrt/sprintf.c
-  safecrt/sscanf.c
-  safecrt/strcat_s.c
-  safecrt/strcpy_s.c
-  safecrt/strlen_s.c
-  safecrt/strncat_s.c
-  safecrt/strncpy_s.c
-  safecrt/strtok_s.c
-  safecrt/swprintf.c
-  safecrt/vsprintf.c
-  safecrt/vswprint.c
-  safecrt/wcscat_s.c
-  safecrt/wcscpy_s.c
-  safecrt/wcslen_s.c
-  safecrt/wcsncat_s.c
-  safecrt/wcsncpy_s.c
-  safecrt/wcstok_s.c
-  safecrt/wmakepath_s.c
-  safecrt/wsplitpath_s.c
-  safecrt/xtoa_s.c
-  safecrt/xtow_s.c
+  safecrt/makepath_s.cpp
+  safecrt/memcpy_s.cpp
+  safecrt/memmove_s.cpp
+  safecrt/mbusafecrt.cpp
+  safecrt/safecrt_input_s.cpp
+  safecrt/safecrt_output_l.cpp
+  safecrt/safecrt_output_s.cpp
+  safecrt/safecrt_winput_s.cpp
+  safecrt/safecrt_woutput_s.cpp
+  safecrt/splitpath_s.cpp
+  safecrt/sprintf.cpp
+  safecrt/sscanf.cpp
+  safecrt/strcat_s.cpp
+  safecrt/strcpy_s.cpp
+  safecrt/strlen_s.cpp
+  safecrt/strncat_s.cpp
+  safecrt/strncpy_s.cpp
+  safecrt/strtok_s.cpp
+  safecrt/swprintf.cpp
+  safecrt/vsprintf.cpp
+  safecrt/vswprint.cpp
+  safecrt/wcscat_s.cpp
+  safecrt/wcscpy_s.cpp
+  safecrt/wcslen_s.cpp
+  safecrt/wcsncat_s.cpp
+  safecrt/wcsncpy_s.cpp
+  safecrt/wcstok_s.cpp
+  safecrt/wmakepath_s.cpp
+  safecrt/wsplitpath_s.cpp
+  safecrt/xtoa_s.cpp
+  safecrt/xtow_s.cpp
   sharedmemory/sharedmemory.cpp
   shmemory/shmemory.cpp
   sync/cs.cpp
diff --git a/src/pal/src/examples/CMakeLists.txt b/src/pal/src/examples/CMakeLists.txt
index 2cef91489237..3797d89b6808 100644
--- a/src/pal/src/examples/CMakeLists.txt
+++ b/src/pal/src/examples/CMakeLists.txt
@@ -4,7 +4,7 @@ project(palexmpl)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  example1.c
+  example1.cpp
 )
 
 add_executable(palexmpl
diff --git a/src/pal/src/examples/example1.c b/src/pal/src/examples/example1.cpp
similarity index 100%
rename from src/pal/src/examples/example1.c
rename to src/pal/src/examples/example1.cpp
diff --git a/src/pal/src/include/pal/palinternal.h b/src/pal/src/include/pal/palinternal.h
index 7348192e6d88..823e3db40f6f 100644
--- a/src/pal/src/include/pal/palinternal.h
+++ b/src/pal/src/include/pal/palinternal.h
@@ -169,7 +169,6 @@ function_name() to call the system's implementation
 #define memmove DUMMY_memmove 
 #define memchr DUMMY_memchr
 #define strlen DUMMY_strlen
-#define strnlen DUMMY_strnlen
 #define stricmp DUMMY_stricmp 
 #define strstr DUMMY_strstr 
 #define strcmp DUMMY_strcmp 
diff --git a/src/pal/src/safecrt/makepath_s.c b/src/pal/src/safecrt/makepath_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/makepath_s.c
rename to src/pal/src/safecrt/makepath_s.cpp
diff --git a/src/pal/src/safecrt/mbusafecrt.c b/src/pal/src/safecrt/mbusafecrt.cpp
similarity index 100%
rename from src/pal/src/safecrt/mbusafecrt.c
rename to src/pal/src/safecrt/mbusafecrt.cpp
diff --git a/src/pal/src/safecrt/memcpy_s.c b/src/pal/src/safecrt/memcpy_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/memcpy_s.c
rename to src/pal/src/safecrt/memcpy_s.cpp
diff --git a/src/pal/src/safecrt/memmove_s.c b/src/pal/src/safecrt/memmove_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/memmove_s.c
rename to src/pal/src/safecrt/memmove_s.cpp
diff --git a/src/pal/src/safecrt/safecrt_input_s.c b/src/pal/src/safecrt/safecrt_input_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/safecrt_input_s.c
rename to src/pal/src/safecrt/safecrt_input_s.cpp
diff --git a/src/pal/src/safecrt/safecrt_output_l.c b/src/pal/src/safecrt/safecrt_output_l.cpp
similarity index 100%
rename from src/pal/src/safecrt/safecrt_output_l.c
rename to src/pal/src/safecrt/safecrt_output_l.cpp
diff --git a/src/pal/src/safecrt/safecrt_output_s.c b/src/pal/src/safecrt/safecrt_output_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/safecrt_output_s.c
rename to src/pal/src/safecrt/safecrt_output_s.cpp
diff --git a/src/pal/src/safecrt/safecrt_winput_s.c b/src/pal/src/safecrt/safecrt_winput_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/safecrt_winput_s.c
rename to src/pal/src/safecrt/safecrt_winput_s.cpp
diff --git a/src/pal/src/safecrt/safecrt_woutput_s.c b/src/pal/src/safecrt/safecrt_woutput_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/safecrt_woutput_s.c
rename to src/pal/src/safecrt/safecrt_woutput_s.cpp
diff --git a/src/pal/src/safecrt/snprintf.c b/src/pal/src/safecrt/snprintf.cpp
similarity index 100%
rename from src/pal/src/safecrt/snprintf.c
rename to src/pal/src/safecrt/snprintf.cpp
diff --git a/src/pal/src/safecrt/splitpath_s.c b/src/pal/src/safecrt/splitpath_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/splitpath_s.c
rename to src/pal/src/safecrt/splitpath_s.cpp
diff --git a/src/pal/src/safecrt/sprintf.c b/src/pal/src/safecrt/sprintf.cpp
similarity index 100%
rename from src/pal/src/safecrt/sprintf.c
rename to src/pal/src/safecrt/sprintf.cpp
diff --git a/src/pal/src/safecrt/sscanf.c b/src/pal/src/safecrt/sscanf.cpp
similarity index 98%
rename from src/pal/src/safecrt/sscanf.c
rename to src/pal/src/safecrt/sscanf.cpp
index 94b5148875c4..d6c21e8ecacd 100644
--- a/src/pal/src/safecrt/sscanf.c
+++ b/src/pal/src/safecrt/sscanf.cpp
@@ -20,7 +20,7 @@
 #include "mbusafecrt_internal.h"
 
 typedef int (*INPUTFN)(miniFILE *, const unsigned char*, va_list);
-typedef int (*WINPUTFN)(miniFILE *, const unsigned short*, va_list);
+typedef int (*WINPUTFN)(miniFILE *, const wchar_t*, va_list);
 
 
 /***
diff --git a/src/pal/src/safecrt/strcat_s.c b/src/pal/src/safecrt/strcat_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/strcat_s.c
rename to src/pal/src/safecrt/strcat_s.cpp
diff --git a/src/pal/src/safecrt/strcpy_s.c b/src/pal/src/safecrt/strcpy_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/strcpy_s.c
rename to src/pal/src/safecrt/strcpy_s.cpp
diff --git a/src/pal/src/safecrt/strlen_s.c b/src/pal/src/safecrt/strlen_s.cpp
similarity index 95%
rename from src/pal/src/safecrt/strlen_s.c
rename to src/pal/src/safecrt/strlen_s.cpp
index 34c1308d5c54..3f1e1cf1aec9 100644
--- a/src/pal/src/safecrt/strlen_s.c
+++ b/src/pal/src/safecrt/strlen_s.cpp
@@ -42,7 +42,7 @@
 *
 *******************************************************************************/
 
-size_t __cdecl strnlen(const char *str, size_t maxsize)
+size_t __cdecl PAL_strnlen(const char *str, size_t maxsize)
 {
     size_t n;
 
diff --git a/src/pal/src/safecrt/strncat_s.c b/src/pal/src/safecrt/strncat_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/strncat_s.c
rename to src/pal/src/safecrt/strncat_s.cpp
diff --git a/src/pal/src/safecrt/strncpy_s.c b/src/pal/src/safecrt/strncpy_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/strncpy_s.c
rename to src/pal/src/safecrt/strncpy_s.cpp
diff --git a/src/pal/src/safecrt/strtok_s.c b/src/pal/src/safecrt/strtok_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/strtok_s.c
rename to src/pal/src/safecrt/strtok_s.cpp
diff --git a/src/pal/src/safecrt/swprintf.c b/src/pal/src/safecrt/swprintf.cpp
similarity index 100%
rename from src/pal/src/safecrt/swprintf.c
rename to src/pal/src/safecrt/swprintf.cpp
diff --git a/src/pal/src/safecrt/vsprintf.c b/src/pal/src/safecrt/vsprintf.cpp
similarity index 100%
rename from src/pal/src/safecrt/vsprintf.c
rename to src/pal/src/safecrt/vsprintf.cpp
diff --git a/src/pal/src/safecrt/vswprint.c b/src/pal/src/safecrt/vswprint.cpp
similarity index 100%
rename from src/pal/src/safecrt/vswprint.c
rename to src/pal/src/safecrt/vswprint.cpp
diff --git a/src/pal/src/safecrt/wcscat_s.c b/src/pal/src/safecrt/wcscat_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wcscat_s.c
rename to src/pal/src/safecrt/wcscat_s.cpp
diff --git a/src/pal/src/safecrt/wcscpy_s.c b/src/pal/src/safecrt/wcscpy_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wcscpy_s.c
rename to src/pal/src/safecrt/wcscpy_s.cpp
diff --git a/src/pal/src/safecrt/wcslen_s.c b/src/pal/src/safecrt/wcslen_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wcslen_s.c
rename to src/pal/src/safecrt/wcslen_s.cpp
diff --git a/src/pal/src/safecrt/wcsncat_s.c b/src/pal/src/safecrt/wcsncat_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wcsncat_s.c
rename to src/pal/src/safecrt/wcsncat_s.cpp
diff --git a/src/pal/src/safecrt/wcsncpy_s.c b/src/pal/src/safecrt/wcsncpy_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wcsncpy_s.c
rename to src/pal/src/safecrt/wcsncpy_s.cpp
diff --git a/src/pal/src/safecrt/wcstok_s.c b/src/pal/src/safecrt/wcstok_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wcstok_s.c
rename to src/pal/src/safecrt/wcstok_s.cpp
diff --git a/src/pal/src/safecrt/wmakepath_s.c b/src/pal/src/safecrt/wmakepath_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wmakepath_s.c
rename to src/pal/src/safecrt/wmakepath_s.cpp
diff --git a/src/pal/src/safecrt/wsplitpath_s.c b/src/pal/src/safecrt/wsplitpath_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/wsplitpath_s.c
rename to src/pal/src/safecrt/wsplitpath_s.cpp
diff --git a/src/pal/src/safecrt/xtoa_s.c b/src/pal/src/safecrt/xtoa_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/xtoa_s.c
rename to src/pal/src/safecrt/xtoa_s.cpp
diff --git a/src/pal/src/safecrt/xtow_s.c b/src/pal/src/safecrt/xtow_s.cpp
similarity index 100%
rename from src/pal/src/safecrt/xtow_s.c
rename to src/pal/src/safecrt/xtow_s.cpp
diff --git a/src/pal/tests/CMakeLists.txt b/src/pal/tests/CMakeLists.txt
index a6d1ba4d5b21..2da2c9aa5296 100644
--- a/src/pal/tests/CMakeLists.txt
+++ b/src/pal/tests/CMakeLists.txt
@@ -26,7 +26,12 @@ else()
   message(FATAL_ERROR "Only ARM, ARM64 and AMD64 is supported")
 endif()
 
+# C++ emits errors and warnings for c-string literal fed into char* parameter
+# this is just to take care of the warnings
+add_compile_options(-Wno-writable-strings)
+
 add_compile_options(-Wno-empty-body)
 
 add_subdirectory(palsuite)
 
+
diff --git a/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt
index a283161f7d89..b4421e77a1ea 100644
--- a/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/__iscsym/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  __iscsym.c
+  __iscsym.cpp
 )
 
 add_executable(paltest_iscsym_test1
diff --git a/src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.c b/src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.c
rename to src/pal/tests/palsuite/c_runtime/__iscsym/test1/__iscsym.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt
index 236b35618522..434633be2045 100644
--- a/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_alloca/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_alloca_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_alloca/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt
index 86f4547b2bf8..e78a8027239f 100644
--- a/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_ecvt/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_ecvt_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_ecvt/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_ecvt/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_ecvt/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_ecvt/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt
index 441d32bd5c53..60b036f44d40 100644
--- a/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_fdopen/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fdopen_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_fdopen/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt
index 8aca58a8dc54..ac2f25d85aae 100644
--- a/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_finite/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_finite_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_finite/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_finite/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_finite/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_finite/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt
index 9306efa7001b..0c9029f6e24e 100644
--- a/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_fullpath/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fullpath_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_fullpath/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_fullpath/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_fullpath/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_fullpath/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt
index 33eb5cf19cbc..47dcb9575452 100644
--- a/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_gcvt/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  _gcvt.c
+  _gcvt.cpp
 )
 
 add_executable(paltest_gcvt_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.c b/src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.c
rename to src/pal/tests/palsuite/c_runtime/_gcvt/test1/_gcvt.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt
index 05641b9b78dc..5b0f5608f3fa 100644
--- a/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_gcvt/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_gcvt_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_gcvt/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt
index d44477b23292..4f763bed6b3b 100644
--- a/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_getw/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getw_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_getw/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_getw/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt
index e14d0cc64b8e..106ccb93d745 100644
--- a/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_isnan/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isnan_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_isnan/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt
index bd37f3121697..2c5d57bd3433 100644
--- a/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_itow/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_itow_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_itow/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_itow/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_itow/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_itow/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_makepath/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_makepath/test1/CMakeLists.txt
index 9fd81cce1a79..9fcb8ba0082e 100644
--- a/src/pal/tests/palsuite/c_runtime/_makepath/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_makepath/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_makepath_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_makepath/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_makepath/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_makepath/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_makepath/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt
index 064f241f24d8..b016f2798274 100644
--- a/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_mbsdec_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_mbsdec/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_mbsdec/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_mbsdec/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt
index 531ba8e7931e..c7325b9513e2 100644
--- a/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_mbsinc_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_mbsinc/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_mbsinc/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_mbsinc/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_mbslen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbslen/test1/CMakeLists.txt
index 38aa6fb16e3a..63d6b647d0ba 100644
--- a/src/pal/tests/palsuite/c_runtime/_mbslen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_mbslen/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_mbslen_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_mbslen/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_mbslen/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_mbslen/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_mbslen/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt
index 7285ce229e0b..81c6c23a5373 100644
--- a/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_mbsninc_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_mbsninc/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_mbsninc/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_mbsninc/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt
index e9a3e2919251..f4fedb61aee1 100644
--- a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_open_osfhandle_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_open_osfhandle/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt
index 1031ec1df95b..6086868de272 100644
--- a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_open_osfhandle_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_open_osfhandle/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt
index 0a75b4111310..9096bc1033f1 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_putenv_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_putenv/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt
index e0539681cd45..ad99eba373c6 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_putenv_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_putenv/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt
index a67241022b3b..fc97b951b3c9 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_putenv_test3
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.c b/src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/_putenv/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt
index 518282ccc723..3881626d012e 100644
--- a/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putenv/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_putenv_test4
diff --git a/src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.c b/src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/_putenv/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt
index c3018ad322f0..78833d4e13a7 100644
--- a/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_putw/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_putw_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp
similarity index 98%
rename from src/pal/tests/palsuite/c_runtime/_putw/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp
index ecfc9046acad..02b7cc7a4904 100644
--- a/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.c
+++ b/src/pal/tests/palsuite/c_runtime/_putw/test1/test1.cpp
@@ -26,7 +26,7 @@ const char testFileName[] = "test.dat";
 
 static void Cleanup(HANDLE hFile)
 {
-    if (fclose(hFile))
+    if (fclose((PAL_FILE*)hFile))
     {
         Trace("_putw: ERROR -> Unable to close file \"%s\".\n", 
             testFileName);
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/_snprintf.h b/src/pal/tests/palsuite/c_runtime/_snprintf/_snprintf.h
index 84abf62f0b60..b3655b2b2b87 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/_snprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/_snprintf.h
@@ -14,7 +14,7 @@
 #ifndef __STRINGTEST_H__
 #define __STRINGTEST_H__
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -27,7 +27,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     }    
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -41,7 +41,7 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
 }
 
 
-void DoPointerTest(char *formatstr, void* param, char* paramstr, char
+void DoPointerTest(const char *formatstr, void* param, char* paramstr, char
                    *checkstr1)
 {
     char buf[256] = { 0 };
@@ -55,7 +55,7 @@ void DoPointerTest(char *formatstr, void* param, char* paramstr, char
     }    
 }
 
-void DoCountTest(char *formatstr, int param, char *checkstr)
+void DoCountTest(const char *formatstr, int param, const char *checkstr)
 {
     char buf[512] = { 0 };
     int n = -1;
@@ -73,7 +73,7 @@ void DoCountTest(char *formatstr, int param, char *checkstr)
     }    
 }
 
-void DoShortCountTest(char *formatstr, int param, char *checkstr)
+void DoShortCountTest(const char *formatstr, int param, const char *checkstr)
 {
     char buf[256] = { 0 };
     short int n = -1;
@@ -91,7 +91,7 @@ void DoShortCountTest(char *formatstr, int param, char *checkstr)
     }    
 }
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -104,7 +104,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     }    
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -117,7 +117,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     }    
 }
 
-void DoNumTest(char *formatstr, int value, char *checkstr)
+void DoNumTest(const char *formatstr, int value, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -130,7 +130,7 @@ void DoNumTest(char *formatstr, int value, char *checkstr)
     }    
 }
 
-void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1)
+void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1)
 {
     char buf[256] = { 0 };
 
@@ -143,7 +143,7 @@ void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1)
     }    
 }
 
-void DoDoubleTest(char *formatstr, double value, char *checkstr1, char 
+void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char 
 *checkstr2)
 {
     char buf[256] = { 0 };
@@ -158,8 +158,8 @@ void DoDoubleTest(char *formatstr, double value, char *checkstr1, char
     }    
 }
 
-void DoArgumentPrecTest(char *formatstr, int precision, void *param, char 
-*paramstr, char *checkstr1, char*checkstr2)
+void DoArgumentPrecTest(const char *formatstr, int precision, void *param, char 
+*paramstr, const char *checkstr1, const char *checkstr2)
 {
     char buf[256];
 
@@ -174,8 +174,8 @@ void DoArgumentPrecTest(char *formatstr, int precision, void *param, char
             
 }
 
-void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param, 
-char *checkstr1, char *checkstr2)
+void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, 
+const char *checkstr1, const char *checkstr2)
 {
     char buf[256];
 
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test1/CMakeLists.txt
index ab126fc59d0b..9e4c671ec81e 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_snprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test10/CMakeLists.txt
index e8e930884956..57e7fb16d3da 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_snprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test11/CMakeLists.txt
index ccf3dc257299..4fc179c5a84b 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_snprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test12/CMakeLists.txt
index 68b442f1d9d4..a35609eb5767 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_snprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test13/CMakeLists.txt
index 832b3fefbf0f..3bf986e851e5 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_snprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test14/CMakeLists.txt
index c2e3be148d85..985303ecf8b5 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_snprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test15/CMakeLists.txt
index 1bd24d5ccdd5..c7f579608901 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_snprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test16/CMakeLists.txt
index 952192e56003..9a224bc23b14 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_snprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test17/CMakeLists.txt
index ce5cc1623ee7..3a8a349c8416 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_snprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test18/CMakeLists.txt
index bb9c9c37cc77..96e39e8f4164 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_snprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test19/CMakeLists.txt
index f3fbb9501334..be3570f16350 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_snprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test19/test19.cpp
similarity index 92%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test19/test19.cpp
index 26dffd921474..a644071ea747 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test19/test19.cpp
@@ -29,9 +29,9 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    DoArgumentPrecTest("%.*s", 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*S", 2, convert("bar"), "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*n", 3, &n, "pointer to int", "", "");
+    DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*n", 3, (void*)&n, "pointer to int", "", "");
     if (n != 0)
     {
         Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test2/CMakeLists.txt
index 8c617df10871..11d18e61c38f 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_snprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test3/CMakeLists.txt
index 13330464a7ee..b8d41789625d 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_snprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test4/CMakeLists.txt
index 5132aa02de98..568b7122decb 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_snprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test5/CMakeLists.txt
index 07e441cee027..7319680b9462 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_snprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test6/CMakeLists.txt
index 9ee5d9054447..820cc66d554e 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_snprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test7/CMakeLists.txt
index f7651218e0c3..a2af7c4a8c90 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_snprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test8/CMakeLists.txt
index 26af119852c6..53545c5dbf34 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_snprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snprintf/test9/CMakeLists.txt
index 484075919e03..33ca9db7a8bb 100644
--- a/src/pal/tests/palsuite/c_runtime/_snprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_snprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/_snprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/_snprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/_snprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/_snwprintf.h b/src/pal/tests/palsuite/c_runtime/_snwprintf/_snwprintf.h
index 73bf4d6c1296..1682db81393b 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/_snwprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/_snwprintf.h
@@ -14,7 +14,7 @@
 #ifndef ___SNWPRINTF_H__
 #define ___SNWPRINTF_H__
 
-void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
+void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -28,7 +28,7 @@ void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
     }
 }
 
-void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
+void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -42,7 +42,7 @@ void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
     }
 }
 
-void DoPointerTest(WCHAR *formatstr, void* param, WCHAR *checkstr1)
+void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1)
 {
     WCHAR buf[256] = { 0 };
 
@@ -55,7 +55,7 @@ void DoPointerTest(WCHAR *formatstr, void* param, WCHAR *checkstr1)
     }    
 }
 
-void DoCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
+void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
 {
     WCHAR buf[512] = { 0 };
     int n = -1;
@@ -75,7 +75,7 @@ void DoCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
     }
 }
 
-void DoShortCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
+void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
     short int n = -1;
@@ -95,7 +95,7 @@ void DoShortCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
     }
 }
 
-void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
+void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -108,7 +108,7 @@ void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
     }
 }
 
-void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
+void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -121,7 +121,7 @@ void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
     }
 }
 
-void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
+void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -135,8 +135,8 @@ void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
 }
 
 
-void DoI64Test(WCHAR *formatstr, INT64 param, char *paramdesc,
-               WCHAR *checkstr1)
+void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc,
+               const WCHAR *checkstr1)
 {
     WCHAR buf[256] = { 0 };
 
@@ -149,8 +149,8 @@ void DoI64Test(WCHAR *formatstr, INT64 param, char *paramdesc,
     }
 }
 
-void DoDoubleTest(WCHAR *formatstr, double value, WCHAR *checkstr1,
-                  WCHAR *checkstr2)
+void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1,
+                  const WCHAR *checkstr2)
 {
     WCHAR buf[256] = { 0 };
 
@@ -165,8 +165,8 @@ void DoDoubleTest(WCHAR *formatstr, double value, WCHAR *checkstr1,
     }
 }
 
-void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param,
-                        char *paramstr, WCHAR *checkstr1, WCHAR *checkstr2)
+void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param,
+                        char *paramstr, const WCHAR *checkstr1, const WCHAR *checkstr2)
 {
     WCHAR buf[256];
 
@@ -181,8 +181,8 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param,
     }
 }
 
-void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param,
-                              WCHAR *checkstr)
+void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param,
+                              const WCHAR *checkstr)
 {
     WCHAR buf[256];
 
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test1/CMakeLists.txt
index b4ab6d51616e..eac86f30e4fa 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_snwprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test10/CMakeLists.txt
index 27aaca3bb90f..82ee73958706 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_snwprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test11/CMakeLists.txt
index e18ad4a31bdb..f7d78455710b 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_snwprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test12/CMakeLists.txt
index f2ae07c1b03c..5b926fb548e6 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_snwprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test13/CMakeLists.txt
index 42847b6bcdae..52a3c75a156c 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_snwprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test14/CMakeLists.txt
index e5cdbfad87a6..d557a30b4218 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_snwprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test15/CMakeLists.txt
index dc7b4d66e900..2e5ee362fc83 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_snwprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test16/CMakeLists.txt
index f147ad7e673b..f4ce409dcbfe 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_snwprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test17/CMakeLists.txt
index e40d3f4106b9..159e15dafeed 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_snwprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test18/CMakeLists.txt
index 68a014cb66b2..5964e849a4b2 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_snwprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/CMakeLists.txt
index 6dc30b4d33b0..5d84847ec1a1 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_snwprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/test19.cpp
similarity index 94%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test19/test19.cpp
index efb222c6ba26..584e66f8c782 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test19/test19.cpp
@@ -25,11 +25,11 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    DoArgumentPrecTest(convert("%.*s"), 2, convert("bar"), "bar",
+    DoArgumentPrecTest(convert("%.*s"), 2, (void*)convert("bar"), "bar",
                        convert("ba"), convert("ba"));
-    DoArgumentPrecTest(convert("%.*S"), 2, "bar", "bar",
+    DoArgumentPrecTest(convert("%.*S"), 2, (void*)"bar", "bar",
                        convert("ba"), convert("ba"));
-    DoArgumentPrecTest(convert("%.*n"), 3, &n, "pointer to int",
+    DoArgumentPrecTest(convert("%.*n"), 3, (void*)&n, "pointer to int",
                        convert(""), convert(""));
     if (n != 0)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test2/CMakeLists.txt
index 9e0d950885a1..ea33d48bd578 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_snwprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test3/CMakeLists.txt
index 4d5a28b0fed1..5095b1a12ee9 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_snwprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test4/CMakeLists.txt
index 0102b0acea96..9cf81ea1bd23 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_snwprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test5/CMakeLists.txt
index c835c9484530..1ad16d257239 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_snwprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test6/CMakeLists.txt
index 37a415ed8612..4996c7716f95 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_snwprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test7/CMakeLists.txt
index b1a07eeaa4ff..0e55fbf4d77f 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_snwprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test8/CMakeLists.txt
index 063ee2b9b64b..8f7fbda5a011 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_snwprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_snwprintf/test9/CMakeLists.txt
index 8d5e41131d5f..f769c9eaa53f 100644
--- a/src/pal/tests/palsuite/c_runtime/_snwprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_snwprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_snwprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/_snwprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/_snwprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_snwprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/_snwprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_splitpath/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_splitpath/test1/CMakeLists.txt
index 361b9084d713..a72f2939c2e0 100644
--- a/src/pal/tests/palsuite/c_runtime/_splitpath/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_splitpath/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_splitpath_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_splitpath/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_splitpath/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_splitpath/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_splitpath/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt
index 766660ccfc90..03aa3a523e18 100644
--- a/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_stricmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_stricmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_stricmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt
index 3a9394ca601f..ca26961b3c5c 100644
--- a/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_strlwr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strlwr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_strlwr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_strlwr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_strlwr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_strlwr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt
index 6a387475926e..03f999219819 100644
--- a/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strnicmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_strnicmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_swab/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_swab/test1/CMakeLists.txt
index fc7fbef8b4e1..67f52ee9ca13 100644
--- a/src/pal/tests/palsuite/c_runtime/_swab/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_swab/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_swab_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_swab/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_swab/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_swab/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_swab/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h b/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h
index 240a72f01762..30e70648c3c3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/_vsnprintf.h
@@ -28,7 +28,7 @@ int Testvsnprintf(char* buf, size_t count, const char* format, ...)
 }
 
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -41,7 +41,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     }
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -55,7 +55,7 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
 }
 
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -68,7 +68,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     }
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -81,7 +81,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     }
 }
 
-void DoNumTest(char *formatstr, int value, char *checkstr)
+void DoNumTest(const char *formatstr, int value, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -94,7 +94,7 @@ void DoNumTest(char *formatstr, int value, char *checkstr)
     }
 }
 
-void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr)
+void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -106,7 +106,7 @@ void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr)
             valuestr, formatstr, checkstr, buf);
     }
 }
-void DoDoubleTest(char *formatstr, double value, char *checkstr1, char
+void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char
  *checkstr2)
 {
     char buf[256] = { 0 };
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt
index 7c346a463828..489b7bf566f7 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_vsnprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt
index 00dccc260d15..bc35dbd0c217 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_vsnprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt
index fd709f2a3131..bf3dd9a53486 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_vsnprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt
index 02dac0cb91df..9fceeaf7a559 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_vsnprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt
index 52562c99f843..7e805f6ad46d 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_vsnprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt
index 3fc8c814a6e7..6e4566b57775 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_vsnprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt
index f6bdc83779b4..d9039b39b7a4 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_vsnprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt
index b7b06d19bbd9..b298df318bdb 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_vsnprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt
index 2c91cccd4a69..b195f334d3e6 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_vsnprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt
index 1a06ce01ee44..f0f6d1124eea 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_vsnprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt
index 6f2e42cc6bc1..44b38902ef50 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_vsnprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp
similarity index 96%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp
index 075a528abaf1..211354bc3a76 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test19/test19.cpp
@@ -63,8 +63,8 @@ int __cdecl main(int argc, char *argv[])
     }
 
 
-    DoArgumentPrecTest("%.*s", 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*S", 2, convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba");
     DoArgumentPrecTest("%.*c", 0, (void*)'a', "a", "a", "a");
     DoArgumentPrecTest("%.*c", 4, (void*)'a', "a", "a", "a");
     DoArgumentPrecTest("%.*C", 0, (void*)'a', "a", "a", "a");
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt
index a3871d64cfcd..1d3910e70c9b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_vsnprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt
index 1beae06277b2..62d765ec5fb3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_vsnprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt
index daf7757ddb95..5662bd57adeb 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_vsnprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt
index c255b07b42be..92540541f3e4 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_vsnprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt
index 8e041f4af843..d80d433c2209 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_vsnprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt
index 01f9620184a7..a1dc0a7c2c93 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_vsnprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt
index 9c525de15aca..1ca4732492dd 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_vsnprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt
index bfe2572a6dda..583971fe5a1d 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_vsnprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/_vsnprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/_vsnwprintf.h b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/_vsnwprintf.h
index a3a932f822bf..2be13983312e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/_vsnwprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/_vsnwprintf.h
@@ -28,7 +28,7 @@ int TestVsnwprintf(wchar_t* buf, size_t count, const wchar_t* format, ...)
 }
 
 
-void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
+void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -43,7 +43,7 @@ void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
     }
 }
 
-void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
+void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -58,7 +58,7 @@ void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
     }
 }
 
-void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
+void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -72,7 +72,7 @@ void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
     }
 }
 
-void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
+void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -86,7 +86,7 @@ void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
     }    
 }
 
-void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
+void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -99,7 +99,7 @@ void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
     }    
 }
 
-void DoI64NumTest(WCHAR *formatstr, INT64 value, char *valuestr, WCHAR*checkstr)
+void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -111,8 +111,8 @@ void DoI64NumTest(WCHAR *formatstr, INT64 value, char *valuestr, WCHAR*checkstr)
             convertC(checkstr), convertC(buf));
     }    
 }
-void DoDoubleTest(WCHAR *formatstr, double value,
-                  WCHAR *checkstr1, WCHAR *checkstr2)
+void DoDoubleTest(const WCHAR *formatstr, double value,
+                  const WCHAR *checkstr1, const WCHAR *checkstr2)
 {
     WCHAR buf[256] = { 0 };
 
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/CMakeLists.txt
index 52c442d57222..d1245168f39b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_vsnwprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/CMakeLists.txt
index 86ea1a316078..6367964f1d32 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_vsnwprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/CMakeLists.txt
index c6011dc1de81..b45fd0ed1ec7 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_vsnwprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/CMakeLists.txt
index bd9652c2fbac..2a15b198c00f 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_vsnwprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/CMakeLists.txt
index c608ab84e37f..01ab97cc62b4 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_vsnwprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/CMakeLists.txt
index 3bf157a2b323..c6c990312fdb 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_vsnwprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/CMakeLists.txt
index eedc7bb9db2f..e1a32b18250d 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_vsnwprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/CMakeLists.txt
index a469c497e92e..9e2b25b30894 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_vsnwprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/CMakeLists.txt
index f429e9441752..2d8ba31a088b 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_vsnwprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/CMakeLists.txt
index 25dd6a2c5b26..503856c2f3e9 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_vsnwprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/CMakeLists.txt
index 9c636b8b0a1f..68485eff12ee 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_vsnwprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/test19.cpp
similarity index 98%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/test19.cpp
index fea275a24243..adbb9961d81c 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test19/test19.cpp
@@ -69,7 +69,7 @@ int __cdecl main(int argc, char *argv[])
         return(FAIL);
     }
 
-    DoArgumentPrecTest(convert("%.*s"), 2, convert("bar"), convert("bar"),
+    DoArgumentPrecTest(convert("%.*s"), 2, (void*)convert("bar"), convert("bar"),
         convert("ba"), convert("ba"));
     DoArgumentPrecTest(convert("%.*c"), 0, (void*)'a', convert("a"),
         convert("a"), convert("a"));
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/CMakeLists.txt
index 817657ea618d..a512be6e476d 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_vsnwprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/CMakeLists.txt
index 4af3e36f3bae..7991c25afcaa 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_vsnwprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/CMakeLists.txt
index b7ff9e7bb3b6..18f5d02df2d3 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_vsnwprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/CMakeLists.txt
index 9b316b9f90f3..34787e4a51d6 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_vsnwprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/CMakeLists.txt
index d3fad0359799..c431da4a0065 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_vsnwprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/CMakeLists.txt
index cede86135893..5759b836b50e 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_vsnwprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/CMakeLists.txt
index 846e7b921976..5e8a6284a5af 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_vsnwprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/CMakeLists.txt
index e25eded172a9..323365dcd919 100644
--- a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_vsnwprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/_vsnwprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt
index 5f085cc7233e..023b777cabbd 100644
--- a/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcsicmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_wcsicmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt
index a78098f86aad..b9df132d29d9 100644
--- a/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcslwr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_wcslwr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt
index afd3560b1051..ea22daa4770c 100644
--- a/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcsnicmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_wcsnicmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt
index 96df58ee5441..f7aa22d5b276 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wfopen_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_wfopen/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt
index 47203d86d511..3159889f0aa3 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_wfopen_test2
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.c b/src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/_wfopen/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt
index deec8bbfe699..06d0941471b0 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_wfopen_test3
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.c b/src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/_wfopen/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt
index e93cdd58de5f..8253d75d8ddd 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_wfopen_test4
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.c b/src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/_wfopen/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt
index 153041679592..8b3d064ec618 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_wfopen_test5
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.c b/src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/_wfopen/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt
index c401c6f40fc0..bf1eaeca27f9 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_wfopen_test6
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.c b/src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/_wfopen/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt
index 47f4804b4372..5d04528a2149 100644
--- a/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wfopen/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_wfopen_test7
diff --git a/src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.c b/src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/_wfopen/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wmakepath/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wmakepath/test1/CMakeLists.txt
index 343cb41f51d2..048b4cc8b099 100644
--- a/src/pal/tests/palsuite/c_runtime/_wmakepath/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wmakepath/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wmakepath_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_wmakepath/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_wmakepath/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wmakepath/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_wmakepath/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/CMakeLists.txt
index ee9a7a8e9612..bbfc2c0faca5 100644
--- a/src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wsplitpath_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_wsplitpath/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt
index 9e6610fc0ffe..ed02fec3afbf 100644
--- a/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/_wtoi/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wtoi_test1
diff --git a/src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.c b/src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/_wtoi/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt
index c8a8595d011d..b01d97ff2fe8 100644
--- a/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/abs/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  abs.c
+  abs.cpp
 )
 
 add_executable(paltest_abs_test1
diff --git a/src/pal/tests/palsuite/c_runtime/abs/test1/abs.c b/src/pal/tests/palsuite/c_runtime/abs/test1/abs.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/abs/test1/abs.c
rename to src/pal/tests/palsuite/c_runtime/abs/test1/abs.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt
index 978ab427e848..5bd3ae06e811 100644
--- a/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/acos/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_acos_test1
diff --git a/src/pal/tests/palsuite/c_runtime/acos/test1/test1.c b/src/pal/tests/palsuite/c_runtime/acos/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/acos/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/acos/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt
index a3aec3f60fad..510b543a591e 100644
--- a/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/asin/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_asin_test1
diff --git a/src/pal/tests/palsuite/c_runtime/asin/test1/test1.c b/src/pal/tests/palsuite/c_runtime/asin/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/asin/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/asin/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt
index b0b84e7c077b..ace64e48bc2c 100644
--- a/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atan/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_atan_test1
diff --git a/src/pal/tests/palsuite/c_runtime/atan/test1/test1.c b/src/pal/tests/palsuite/c_runtime/atan/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/atan/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/atan/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt
index 8bd69da2faa7..cafa09f7fea1 100644
--- a/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atan2/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_atan2_test1
diff --git a/src/pal/tests/palsuite/c_runtime/atan2/test1/test1.c b/src/pal/tests/palsuite/c_runtime/atan2/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/atan2/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/atan2/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt
index 1f34b7ebf577..12e584b9a0cb 100644
--- a/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atof/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_atof_test1
diff --git a/src/pal/tests/palsuite/c_runtime/atof/test1/test1.c b/src/pal/tests/palsuite/c_runtime/atof/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/atof/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/atof/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt
index 3549aca7374d..225052213f91 100644
--- a/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atoi/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_atoi_test1
diff --git a/src/pal/tests/palsuite/c_runtime/atoi/test1/test1.c b/src/pal/tests/palsuite/c_runtime/atoi/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/atoi/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/atoi/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt
index 4fea187ad862..29643aae6b6f 100644
--- a/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/atol/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_atol_test1
diff --git a/src/pal/tests/palsuite/c_runtime/atol/test1/test1.c b/src/pal/tests/palsuite/c_runtime/atol/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/atol/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/atol/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt
index d2018f33252e..c5aab7b84dd8 100644
--- a/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/bsearch/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_bsearch_test1
diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.c b/src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/bsearch/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt
index dc6556019612..7ad33b12e5f2 100644
--- a/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/bsearch/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_bsearch_test2
diff --git a/src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.c b/src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/bsearch/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt
index c73ad1dbbe51..f83491454568 100644
--- a/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ceil/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_ceil_test1
diff --git a/src/pal/tests/palsuite/c_runtime/ceil/test1/test1.c b/src/pal/tests/palsuite/c_runtime/ceil/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/ceil/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/ceil/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt
index 1dda9a25634f..536664c128b3 100644
--- a/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/cos/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_cos_test1
diff --git a/src/pal/tests/palsuite/c_runtime/cos/test1/test1.c b/src/pal/tests/palsuite/c_runtime/cos/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/cos/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/cos/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt
index bea7b7a3b702..e1fff0e9f1b3 100644
--- a/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/cosh/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_cosh_test1
diff --git a/src/pal/tests/palsuite/c_runtime/cosh/test1/test1.c b/src/pal/tests/palsuite/c_runtime/cosh/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/cosh/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/cosh/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt
index aa64a71d1ee2..3eeffb0e3996 100644
--- a/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ctime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_ctime_test1
diff --git a/src/pal/tests/palsuite/c_runtime/ctime/test1/test1.c b/src/pal/tests/palsuite/c_runtime/ctime/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/ctime/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/ctime/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt
index 89b25a4fac37..91b8d094b1ea 100644
--- a/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/errno/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_errno_test1
diff --git a/src/pal/tests/palsuite/c_runtime/errno/test1/test1.c b/src/pal/tests/palsuite/c_runtime/errno/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/errno/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/errno/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt
index edd4cf7975ab..ab7c4a27f2d4 100644
--- a/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/errno/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_errno_test2
diff --git a/src/pal/tests/palsuite/c_runtime/errno/test2/test2.c b/src/pal/tests/palsuite/c_runtime/errno/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/errno/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/errno/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt
index eb9ca4e7808b..bb2cbccb9b48 100644
--- a/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/exit/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_exit_test1
diff --git a/src/pal/tests/palsuite/c_runtime/exit/test1/test1.c b/src/pal/tests/palsuite/c_runtime/exit/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/exit/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/exit/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt
index 47d3a44c85dc..8a74e75ed53a 100644
--- a/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/exit/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_exit_test2
diff --git a/src/pal/tests/palsuite/c_runtime/exit/test2/test2.c b/src/pal/tests/palsuite/c_runtime/exit/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/exit/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/exit/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt
index 9cdd4ec5ed6e..3377ed22f254 100644
--- a/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/exp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_exp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/exp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/exp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/exp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/exp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt
index ab27230ac28a..fa01a34dd9d2 100644
--- a/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fabs/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fabs_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fabs/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fabs/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fabs/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fabs/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt
index 06512ebd7c84..a1823e25e5c2 100644
--- a/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fabsf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fabsf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fabsf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt
index 55ed7c674e70..64cfef0e1806 100644
--- a/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fclose/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fclose_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fclose/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fclose/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fclose/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt
index 178dc7d19a9f..3b5538608fda 100644
--- a/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fclose/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_fclose_test2
diff --git a/src/pal/tests/palsuite/c_runtime/fclose/test2/test2.c b/src/pal/tests/palsuite/c_runtime/fclose/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fclose/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/fclose/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt
index ee1389deb02a..9f689503e605 100644
--- a/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/feof/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_feof_test1
diff --git a/src/pal/tests/palsuite/c_runtime/feof/test1/test1.c b/src/pal/tests/palsuite/c_runtime/feof/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/feof/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/feof/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt
index 2ab12b5db33e..cd1fe52381bf 100644
--- a/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ferror/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_ferror_test1
diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test1/test1.c b/src/pal/tests/palsuite/c_runtime/ferror/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/ferror/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/ferror/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt
index 077dde0bc6f5..05bd7fd2f19b 100644
--- a/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ferror/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_ferror_test2
diff --git a/src/pal/tests/palsuite/c_runtime/ferror/test2/test2.c b/src/pal/tests/palsuite/c_runtime/ferror/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/ferror/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/ferror/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt
index 743f1d2111cd..58c7c5a3a49f 100644
--- a/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fflush/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fflush_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fflush/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fflush/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fflush/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fflush/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt
index 672d910c8531..d327d6882a5e 100644
--- a/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fgets/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fgets_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fgets/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fgets/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fgets/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt
index d39401536b67..23bcdef686f5 100644
--- a/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fgets/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_fgets_test2
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test2/test2.c b/src/pal/tests/palsuite/c_runtime/fgets/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fgets/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/fgets/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt
index 50f0901ee179..0833ad013005 100644
--- a/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fgets/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_fgets_test3
diff --git a/src/pal/tests/palsuite/c_runtime/fgets/test3/test3.c b/src/pal/tests/palsuite/c_runtime/fgets/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fgets/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/fgets/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt
index dbc5abde5b38..3222ed8ba3ee 100644
--- a/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/floor/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_floor_test1
diff --git a/src/pal/tests/palsuite/c_runtime/floor/test1/test1.c b/src/pal/tests/palsuite/c_runtime/floor/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/floor/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/floor/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt
index c76df1f0bf7e..33fbfb265325 100644
--- a/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fmod/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fmod_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fmod/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fmod/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fmod/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fmod/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt
index d1ea238a98c3..487b3adda431 100644
--- a/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fmodf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fmodf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fmodf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt
index 6578c4365948..7603fc623edc 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fopen_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fopen/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fopen/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fopen/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt
index 4458ed21d8e6..b8569921de2a 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_fopen_test2
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test2/test2.c b/src/pal/tests/palsuite/c_runtime/fopen/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fopen/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/fopen/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt
index 2c80f72ae7b4..5b28caf4bad2 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_fopen_test3
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test3/test3.c b/src/pal/tests/palsuite/c_runtime/fopen/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fopen/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/fopen/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt
index 92e0ef0bd8a7..db5779f282c3 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_fopen_test4
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test4/test4.c b/src/pal/tests/palsuite/c_runtime/fopen/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fopen/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/fopen/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt
index 82529b9aabd3..6341e4a7d2a2 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_fopen_test5
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test5/test5.c b/src/pal/tests/palsuite/c_runtime/fopen/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fopen/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/fopen/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt
index 9a01cfb9a8e7..39cf9158bb3c 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_fopen_test6
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test6/test6.c b/src/pal/tests/palsuite/c_runtime/fopen/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fopen/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/fopen/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt
index 168a5aff535d..ee22e347d6d3 100644
--- a/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fopen/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_fopen_test7
diff --git a/src/pal/tests/palsuite/c_runtime/fopen/test7/test7.c b/src/pal/tests/palsuite/c_runtime/fopen/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fopen/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/fopen/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h b/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h
index 380eb0a0b3eb..87ee0d12323f 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/fprintf.h
@@ -11,7 +11,7 @@ function with this as a return type.
 #ifndef __FPRINTF_H__
 #define __FPRINTF_H__
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     FILE *fp;    
     char buf[256] = { 0 };
@@ -34,7 +34,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     fclose(fp);
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -58,7 +58,7 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
 }
 
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -81,7 +81,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     fclose(fp);
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -104,7 +104,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     fclose(fp);
 }
 
-void DoNumTest(char *formatstr, int value, char *checkstr)
+void DoNumTest(const char *formatstr, int value, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -127,7 +127,7 @@ void DoNumTest(char *formatstr, int value, char *checkstr)
     fclose(fp);
 }
 
-void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1, char *checkstr2)
+void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1, const char *checkstr2)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -151,7 +151,7 @@ void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1, ch
     fclose(fp);
 }
 
-void DoDoubleTest(char *formatstr, double value, char *checkstr1, char *checkstr2)
+void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, const char *checkstr2)
 {
     FILE *fp;
     char buf[256] = { 0 };
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt
index ab4176563d77..60ffd49cf565 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt
index f718ad793448..3fb57c217c00 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_fprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt
index 6ccd58ddd2f9..d325ce225e9c 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_fprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt
index 17bc7f100bf4..8bd3970e8018 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_fprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt
index c6eb0f907574..702058b7977f 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_fprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt
index 6bb281bc62c8..b92ede7c87ac 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_fprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt
index ce1a8b61114f..20f1e42aab75 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_fprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt
index 011cd13fb183..8d7242121086 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_fprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt
index 4516f4b7699c..82d1f84f3109 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_fprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt
index fc035020caad..1ca54e42b79b 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_fprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt
index 3781b426f272..2c662398012a 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_fprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test19/test19.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt
index 0ef44b6b7dc0..ae1d9dc64db9 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_fprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt
index adfd36fce723..4b10c4c407c7 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_fprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt
index 7d471b1b9ce8..292bdb6625a2 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_fprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt
index 1e3a5685134a..370ed3329ad1 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_fprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt
index 89620dd453e7..bd1cbda92441 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_fprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt
index 3dc10dd6dc20..38429e7900dd 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_fprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt
index f6dd984af9dd..990eca26b0ae 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_fprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt
index 62aa85e6ff32..715d38a43121 100644
--- a/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_fprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/fprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt
index e4a92d5966eb..d0f1aca0e6ad 100644
--- a/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fputs/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fputs_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fputs/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fputs/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fputs/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt
index 6e939f3346bc..9242ea16e56c 100644
--- a/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fputs/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_fputs_test2
diff --git a/src/pal/tests/palsuite/c_runtime/fputs/test2/test2.c b/src/pal/tests/palsuite/c_runtime/fputs/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fputs/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/fputs/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt
index a2e09579b110..1bd84b5c62e9 100644
--- a/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fread/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fread_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fread/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fread/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fread/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt
index 0538e0c3af28..93e0394832e8 100644
--- a/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fread/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_fread_test2
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test2/test2.c b/src/pal/tests/palsuite/c_runtime/fread/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fread/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/fread/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt
index f3c636f3dfad..285608bc3dd9 100644
--- a/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fread/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_fread_test3
diff --git a/src/pal/tests/palsuite/c_runtime/fread/test3/test3.c b/src/pal/tests/palsuite/c_runtime/fread/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fread/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/fread/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt
index bd94cb573399..92ee9896c724 100644
--- a/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/free/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_free_test1
diff --git a/src/pal/tests/palsuite/c_runtime/free/test1/test1.c b/src/pal/tests/palsuite/c_runtime/free/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/free/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/free/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt
index fb55bd1051d9..59ee8b4563cb 100644
--- a/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fseek/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fseek_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.cpp
similarity index 99%
rename from src/pal/tests/palsuite/c_runtime/fseek/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fseek/test1/test1.cpp
index 8496289a01a5..dd1e87ea8d4f 100644
--- a/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.c
+++ b/src/pal/tests/palsuite/c_runtime/fseek/test1/test1.cpp
@@ -23,7 +23,7 @@ static BOOL Cleanup(HANDLE hFile)
 {
     BOOL result= TRUE;
 
-    if (fclose(hFile))
+    if (fclose((PAL_FILE*)hFile))
     {
         Trace("fseek: ERROR -> Unable to close file \"%s\".\n", 
             filename);
diff --git a/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt
index 7ea9a511114f..a1f350d0c299 100644
--- a/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ftell/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ftell.c
+  ftell.cpp
 )
 
 add_executable(paltest_ftell_test1
diff --git a/src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.c b/src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.c
rename to src/pal/tests/palsuite/c_runtime/ftell/test1/ftell.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h b/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h
index 36756636cf3c..eed0e7648477 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/fwprintf.h
@@ -14,7 +14,7 @@
 #ifndef __fwprintf_H__
 #define __fwprintf_H__
 
-void DoStrTest(WCHAR *formatstr, char* param, char *checkstr)
+void DoStrTest(const WCHAR *formatstr, char* param, const char *checkstr)
 {
     FILE *fp;    
     char buf[256] = { 0 };
@@ -45,7 +45,7 @@ void DoStrTest(WCHAR *formatstr, char* param, char *checkstr)
     fclose(fp);
 }
 
-void DoWStrTest(WCHAR *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const WCHAR *formatstr, WCHAR* param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -77,8 +77,8 @@ void DoWStrTest(WCHAR *formatstr, WCHAR* param, char *checkstr)
 }
 
 
-void DoPointerTest(WCHAR *formatstr, void* param, char* paramstr, 
-                   char *checkstr1, char *checkstr2)
+void DoPointerTest(const WCHAR *formatstr, void* param, char* paramstr, 
+                   const char *checkstr1, const char *checkstr2)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -119,7 +119,7 @@ void DoPointerTest(WCHAR *formatstr, void* param, char* paramstr,
 
 
 
-void DoCountTest(WCHAR *formatstr, int param, char *checkstr)
+void DoCountTest(const WCHAR *formatstr, int param, const char *checkstr)
 {
     FILE *fp;
     char buf[512] = { 0 };
@@ -162,7 +162,7 @@ void DoCountTest(WCHAR *formatstr, int param, char *checkstr)
     }
 }
 
-void DoShortCountTest(WCHAR *formatstr, int param, char *checkstr)
+void DoShortCountTest(const WCHAR *formatstr, int param, const char *checkstr)
 {
     FILE *fp;
     char buf[512] = { 0 };
@@ -206,7 +206,7 @@ void DoShortCountTest(WCHAR *formatstr, int param, char *checkstr)
 }
 
 
-void DoCharTest(WCHAR *formatstr, char param, char *checkstr)
+void DoCharTest(const WCHAR *formatstr, char param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -237,7 +237,7 @@ void DoCharTest(WCHAR *formatstr, char param, char *checkstr)
     fclose(fp);
 }
 
-void DoWCharTest(WCHAR *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const WCHAR *formatstr, WCHAR param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -268,7 +268,7 @@ void DoWCharTest(WCHAR *formatstr, WCHAR param, char *checkstr)
     fclose(fp);
 }
 
-void DoNumTest(WCHAR *formatstr, int value, char *checkstr)
+void DoNumTest(const WCHAR *formatstr, int value, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -299,8 +299,8 @@ void DoNumTest(WCHAR *formatstr, int value, char *checkstr)
     fclose(fp);
 }
 
-void DoI64Test(WCHAR *formatstr, INT64 value, char *valuestr, char *checkstr1,
-               char *checkstr2)
+void DoI64Test(const WCHAR *formatstr, INT64 value, char *valuestr, const char *checkstr1,
+               const char *checkstr2)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -332,8 +332,8 @@ void DoI64Test(WCHAR *formatstr, INT64 value, char *valuestr, char *checkstr1,
     fclose(fp);
 }
 
-void DoDoubleTest(WCHAR *formatstr, double value, char *checkstr1,
-                  char *checkstr2)
+void DoDoubleTest(const WCHAR *formatstr, double value, const char *checkstr1,
+                  const char *checkstr2)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -367,8 +367,8 @@ void DoDoubleTest(WCHAR *formatstr, double value, char *checkstr1,
 }
 
 
-void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param, 
-                        char *paramstr, char *checkstr1, char *checkstr2)
+void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, 
+                        char *paramstr, const char *checkstr1, const char *checkstr2)
 {
     FILE *fp;
     char buf[256];
@@ -409,8 +409,8 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param,
             
 }
 
-void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param, 
-                              char *checkstr1, char *checkstr2)
+void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param, 
+                              const char *checkstr1, const char *checkstr2)
 {
     FILE *fp;
     char buf[256];
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt
index ce4271edb255..519860b87784 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fwprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt
index a8323b4fc7e2..e604e03dfff1 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_fwprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt
index 1b7987400a09..18be5228235d 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_fwprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt
index 1e43a4c9060a..6ea739b28fdd 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_fwprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt
index c84dc3ea41b1..8505ccbd8227 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_fwprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt
index 97824c76b73e..548e60fdb82a 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_fwprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt
index 6786c5b7745a..c5b53461a7d4 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_fwprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt
index be148708633c..51af0a0d60e8 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_fwprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt
index b390d15620b6..9ed8a390e72f 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_fwprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt
index 6f6d79bce59d..3e3ba4efc786 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_fwprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt
index bc10825ce1eb..fbb7370ba317 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_fwprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.cpp
similarity index 92%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.cpp
index 4600de7fa999..a407c9f4bda9 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test19/test19.cpp
@@ -30,9 +30,9 @@ int __cdecl main(int argc, char *argv[])
         return(FAIL);
     }
 
-    DoArgumentPrecTest(convert("%.*s"), 2, convert("bar"), "bar", "ba", "ba");
-    DoArgumentPrecTest(convert("%.*S"), 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest(convert("foo %.*n"), 3, &n, "pointer to int", "foo ", 
+    DoArgumentPrecTest(convert("%.*s"), 2, (void*)convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest(convert("%.*S"), 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest(convert("foo %.*n"), 3, (void*)&n, "pointer to int", "foo ", 
         "foo ");
     if (n != 4)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt
index 64314651c0ee..e65a396862bc 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_fwprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt
index 6906722cde50..53c46369deba 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_fwprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt
index b91bc871956c..9dbb46283ea5 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_fwprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt
index 53bf482b6fc2..4e72e3ca8873 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_fwprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt
index bf7d7cccb8a2..d57f07fafa5c 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_fwprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt
index 68bcc9ca6521..314ca353e58e 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_fwprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt
index e07cbb9119f3..e818df2eb28a 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_fwprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt
index 898da1a64f47..28b6b8692179 100644
--- a/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_fwprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/fwprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt
index 701e56acb50c..5c8b7449f2b9 100644
--- a/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/fwrite/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_fwrite_test1
diff --git a/src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.c b/src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/fwrite/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt
index 2a29e8af0a3d..68ecaa9abb00 100644
--- a/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getc.c
+  getc.cpp
 )
 
 add_executable(paltest_getc_test1
diff --git a/src/pal/tests/palsuite/c_runtime/getc/test1/getc.c b/src/pal/tests/palsuite/c_runtime/getc/test1/getc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/getc/test1/getc.c
rename to src/pal/tests/palsuite/c_runtime/getc/test1/getc.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt
index 6243c032abb8..9c52c2890e4f 100644
--- a/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getenv/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getenv_test1
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test1/test1.c b/src/pal/tests/palsuite/c_runtime/getenv/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/getenv/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/getenv/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt
index 7a301a5ca6df..971a836239b2 100644
--- a/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getenv/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getenv_test2
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test2/test2.c b/src/pal/tests/palsuite/c_runtime/getenv/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/getenv/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/getenv/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt
index 2cbe472221dd..620ccd10030d 100644
--- a/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/getenv/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_getenv_test3
diff --git a/src/pal/tests/palsuite/c_runtime/getenv/test3/test3.c b/src/pal/tests/palsuite/c_runtime/getenv/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/getenv/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/getenv/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt
index 3879bb7902a7..af65f32cbf0f 100644
--- a/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isalnum/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isalnum_test1
diff --git a/src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.c b/src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/isalnum/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt
index 44fb72d7fe4c..82f19ad38330 100644
--- a/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isalpha/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isalpha_test1
diff --git a/src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.c b/src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/isalpha/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt
index dd03b238e1df..b96b7aa706c6 100644
--- a/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isdigit/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isdigit_test1
diff --git a/src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.c b/src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/isdigit/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt
index b7f5ad069ffb..d071d4bb655b 100644
--- a/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/islower/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_islower_test1
diff --git a/src/pal/tests/palsuite/c_runtime/islower/test1/test1.c b/src/pal/tests/palsuite/c_runtime/islower/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/islower/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/islower/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt
index 365777ab5ac8..91410a02ab3d 100644
--- a/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isprint/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  isprint.c
+  isprint.cpp
 )
 
 add_executable(paltest_isprint_test1
diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.c b/src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.c
rename to src/pal/tests/palsuite/c_runtime/isprint/test1/isprint.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt
index a7ad75cc042e..53ad94273ca9 100644
--- a/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isprint/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_isprint_test2
diff --git a/src/pal/tests/palsuite/c_runtime/isprint/test2/test2.c b/src/pal/tests/palsuite/c_runtime/isprint/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isprint/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/isprint/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt
index 34ad70d328d1..c3cc52514521 100644
--- a/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isspace/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isspace_test1
diff --git a/src/pal/tests/palsuite/c_runtime/isspace/test1/test1.c b/src/pal/tests/palsuite/c_runtime/isspace/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isspace/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/isspace/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt
index c7fc71c43be0..e1cfa6609d1b 100644
--- a/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isupper/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isupper_test1
diff --git a/src/pal/tests/palsuite/c_runtime/isupper/test1/test1.c b/src/pal/tests/palsuite/c_runtime/isupper/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isupper/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/isupper/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt
index b35dd5ed6dc6..4074abbe7687 100644
--- a/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswdigit/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_iswdigit_test1
diff --git a/src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.c b/src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/iswdigit/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt
index 5e436c3ca243..d21c2321338e 100644
--- a/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswprint/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_iswprint_test1
diff --git a/src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.c b/src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/iswprint/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt
index 1368e55cccdf..1f9a54fb1776 100644
--- a/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswspace/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_iswspace_test1
diff --git a/src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.c b/src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/iswspace/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt
index 8b8fae6d72e6..1da5fbaa755c 100644
--- a/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswupper/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_iswupper_test1
diff --git a/src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.c b/src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/iswupper/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt
index 3a726eced996..ae55976128c0 100644
--- a/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_iswxdigit_test1
diff --git a/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/test1.c b/src/pal/tests/palsuite/c_runtime/iswxdigit/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/iswxdigit/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/iswxdigit/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt
index 8919b36e4200..4fd46c93d882 100644
--- a/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/isxdigit/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isxdigit_test1
diff --git a/src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.c b/src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/isxdigit/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt
index cf0f0999a979..2ffb3cd64159 100644
--- a/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/labs/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_labs_test1
diff --git a/src/pal/tests/palsuite/c_runtime/labs/test1/test1.c b/src/pal/tests/palsuite/c_runtime/labs/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/labs/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/labs/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt
index 8f5bdbe09763..3adc3cc737c6 100644
--- a/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/llabs/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_llabs_test1
diff --git a/src/pal/tests/palsuite/c_runtime/llabs/test1/test1.c b/src/pal/tests/palsuite/c_runtime/llabs/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/llabs/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/llabs/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt
index 25acf48749e4..698699f82150 100644
--- a/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/localtime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_localtime_test1
diff --git a/src/pal/tests/palsuite/c_runtime/localtime/test1/test1.c b/src/pal/tests/palsuite/c_runtime/localtime/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/localtime/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/localtime/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt
index dd19002904a0..c8f991b997d2 100644
--- a/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/log/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_log_test1
diff --git a/src/pal/tests/palsuite/c_runtime/log/test1/test1.c b/src/pal/tests/palsuite/c_runtime/log/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/log/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/log/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt
index 31e750df3e08..31025fbd04ca 100644
--- a/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/log10/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_log10_test1
diff --git a/src/pal/tests/palsuite/c_runtime/log10/test1/test1.c b/src/pal/tests/palsuite/c_runtime/log10/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/log10/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/log10/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt
index 4a388ad3d73a..f47573097386 100644
--- a/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/malloc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_malloc_test1
diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test1/test1.c b/src/pal/tests/palsuite/c_runtime/malloc/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/malloc/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/malloc/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt
index abbed2aa62f6..663e104d0e65 100644
--- a/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/malloc/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_malloc_test2
diff --git a/src/pal/tests/palsuite/c_runtime/malloc/test2/test2.c b/src/pal/tests/palsuite/c_runtime/malloc/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/malloc/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/malloc/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt
index 4e33a8fc04c8..959fd2a3bccc 100644
--- a/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memchr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_memchr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/memchr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/memchr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/memchr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/memchr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt
index b61f208f344d..43d8fdd7f763 100644
--- a/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memcmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_memcmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/memcmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt
index d846bfc62db6..14db0df60e06 100644
--- a/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memcpy/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_memcpy_test1
diff --git a/src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.c b/src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/memcpy/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt
index cf50ec01b758..db6f65e48b87 100644
--- a/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memmove/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_memmove_test1
diff --git a/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.c b/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.cpp
similarity index 95%
rename from src/pal/tests/palsuite/c_runtime/memmove/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/memmove/test1/test1.cpp
index c1af871f4abe..8279d671391d 100644
--- a/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.c
+++ b/src/pal/tests/palsuite/c_runtime/memmove/test1/test1.cpp
@@ -20,7 +20,7 @@ int __cdecl main(int argc, char **argv)
     char testB[15] = "aabbccddeeffgg";
     char testC[15] = "aabbccddeeffgg";
     char testD[15] = "aabbccddeeffgg";
-    char insString[3] = "zzz";
+    char insString[4] = "zzz";
     char *retVal;
 
     if (PAL_Initialize(argc, argv))
@@ -68,7 +68,7 @@ int __cdecl main(int argc, char **argv)
 
 
     /* move a string to the middle of testC */
-    retVal = memmove(testC+5, insString, 3);
+    retVal = (char*)memmove(testC+5, insString, 3);
     if(retVal != testC+5)
     {
         Fail("memmove: The function did not return the correct "
@@ -83,7 +83,7 @@ int __cdecl main(int argc, char **argv)
 
 
     /* move a string to the end of testD */
-    retVal = memmove(testD+11, insString, 3);
+    retVal = (char*)memmove(testD+11, insString, 3);
     if(retVal != testD+11)
     {
         Fail("memmove: The function did not return the correct "
diff --git a/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt
index 78b5a6bc00d4..bc3d6251cba1 100644
--- a/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/memset/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_memset_test1
diff --git a/src/pal/tests/palsuite/c_runtime/memset/test1/test1.c b/src/pal/tests/palsuite/c_runtime/memset/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/memset/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/memset/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt
index 4b65ba7a6f99..3fe7bc7c46d4 100644
--- a/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/modf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_modf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/modf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/modf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/modf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/modf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt
index 812cd1c47b8b..10e5e9926714 100644
--- a/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/modff/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_modff_test1
diff --git a/src/pal/tests/palsuite/c_runtime/modff/test1/test1.c b/src/pal/tests/palsuite/c_runtime/modff/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/modff/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/modff/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt
index 69ba02af1779..f94210d5b73a 100644
--- a/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/pow/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_pow_test1
diff --git a/src/pal/tests/palsuite/c_runtime/pow/test1/test1.c b/src/pal/tests/palsuite/c_runtime/pow/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/pow/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/pow/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/printf.h b/src/pal/tests/palsuite/c_runtime/printf/printf.h
index 2eaa984bad2f..8ef725f305bf 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/printf.h
+++ b/src/pal/tests/palsuite/c_runtime/printf/printf.h
@@ -14,7 +14,7 @@
 #ifndef __printf_H__
 #define __printf_H__
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     int ret;
 
@@ -26,7 +26,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     }
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     int ret;
 
@@ -38,8 +38,8 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
     }
 }
 
-void DoPointerTest(char *formatstr, void* param, char* paramstr, 
-                   char *checkstr1)
+void DoPointerTest(const char *formatstr, void* param, char* paramstr, 
+                   const char *checkstr1)
 {
     int ret;
 
@@ -51,7 +51,7 @@ void DoPointerTest(char *formatstr, void* param, char* paramstr,
     }
 }
 
-void DoCountTest(char *formatstr, int param, char *checkstr)
+void DoCountTest(const char *formatstr, int param, const char *checkstr)
 {
     int ret;
     int n = -1;
@@ -70,7 +70,7 @@ void DoCountTest(char *formatstr, int param, char *checkstr)
     }    
 }
 
-void DoShortCountTest(char *formatstr, int param, char *checkstr)
+void DoShortCountTest(const char *formatstr, int param, const char *checkstr)
 {
     int ret;
     short int n = -1;
@@ -90,7 +90,7 @@ void DoShortCountTest(char *formatstr, int param, char *checkstr)
 }
 
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     int ret;
 
@@ -102,7 +102,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     }
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     int ret;
 
@@ -114,7 +114,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     }    
 }
 
-void DoNumTest(char *formatstr, int param, char *checkstr)
+void DoNumTest(const char *formatstr, int param, const char *checkstr)
 {
     int ret;
 
@@ -126,8 +126,8 @@ void DoNumTest(char *formatstr, int param, char *checkstr)
     }    
 }
 
-void DoI64Test(char *formatstr, INT64 param, char *valuestr, 
-               char *checkstr1)
+void DoI64Test(const char *formatstr, INT64 param, char *valuestr, 
+               const char *checkstr1)
 {
     int ret;
 
@@ -139,8 +139,8 @@ void DoI64Test(char *formatstr, INT64 param, char *valuestr,
     }
 }
 
-void DoDoubleTest(char *formatstr, double param, 
-                  char *checkstr1, char *checkstr2)
+void DoDoubleTest(const char *formatstr, double param, 
+                  const char *checkstr1, const char *checkstr2)
 {
     int ret;
 
@@ -152,8 +152,8 @@ void DoDoubleTest(char *formatstr, double param,
     }
 }
 
-void DoArgumentPrecTest(char *formatstr, int precision, void *param, 
-                        char *paramstr, char *checkstr1, char *checkstr2)
+void DoArgumentPrecTest(const char *formatstr, int precision, void *param, 
+                        char *paramstr, const char *checkstr1, const char *checkstr2)
 {
     int ret;
 
@@ -165,8 +165,8 @@ void DoArgumentPrecTest(char *formatstr, int precision, void *param,
     }
 }
 
-void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param, 
-    char *checkstr1, char *checkstr2)
+void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, 
+    const char *checkstr1, const char *checkstr2)
 {
     int ret;
 
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt
index bea9151ed7d5..2dace14f909a 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_printf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/printf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/printf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt
index 89ff2e0190bd..75e30c85999a 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_printf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/printf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/printf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt
index 349f154a8d5a..4ee12dc21dbb 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_printf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/printf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/printf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt
index 0d32ee16904b..3b2e39d64086 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_printf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/printf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/printf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt
index 348d25b22d99..b6af021d4871 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_printf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/printf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/printf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt
index 659ea78cc67b..5a6cf8a18021 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_printf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/printf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/printf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt
index 9e4e31030412..b1466a387def 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_printf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/printf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/printf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt
index 7e477a3059f3..c81da10ec9ca 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_printf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/printf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/printf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt
index c18450c2aa4b..9d40e54ca67c 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_printf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/printf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/printf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt
index b0468314a3d6..6ab11f4be1f9 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_printf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/printf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/printf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt
index efd47563d4dd..f022938e3221 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_printf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/printf/test19/test19.cpp
similarity index 92%
rename from src/pal/tests/palsuite/c_runtime/printf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/printf/test19/test19.cpp
index 1e09398f7caa..a3ce0e7ad88b 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/printf/test19/test19.cpp
@@ -28,10 +28,10 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    DoArgumentPrecTest("%.*s", 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*S", 2, convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba");
 
-    DoArgumentPrecTest("%.*n", 3, &n, "pointer to int", "", "");
+    DoArgumentPrecTest("%.*n", 3, (void*)&n, "pointer to int", "", "");
     if (n != 0)
     {
         Fail("ERROR: Expected count parameter to resolve to %d, got %X\n", 
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt
index c303a6913437..e92b6b09f35f 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_printf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/printf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt
index 8bc747979716..fcfd779a0c37 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_printf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/printf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt
index 55e5700fe3e5..7311bbea69db 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_printf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/printf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt
index d091bca2dc24..bfe185c44fa0 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_printf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/printf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/printf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt
index c004e353e91a..842ebfedc6ea 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_printf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/printf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/printf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt
index ff6b647ccdee..16e39198bab6 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_printf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/printf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/printf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt
index 5ee387f5b8f8..4a40fee6d970 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_printf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/printf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/printf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt
index baf46c1065de..df8f75d2fdd1 100644
--- a/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/printf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_printf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/printf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/printf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/printf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/printf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt
index 105a727e91ec..ff215b8dc6e9 100644
--- a/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/qsort/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_qsort_test1
diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test1/test1.c b/src/pal/tests/palsuite/c_runtime/qsort/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/qsort/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/qsort/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt
index 09e3f6db1ead..cdd964277981 100644
--- a/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/qsort/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_qsort_test2
diff --git a/src/pal/tests/palsuite/c_runtime/qsort/test2/test2.c b/src/pal/tests/palsuite/c_runtime/qsort/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/qsort/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/qsort/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt
index 939914662a9d..6728f402ffd5 100644
--- a/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/rand_srand/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_rand_srand_test1
diff --git a/src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.c b/src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/rand_srand/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt
index 0a9f34fc3b06..62830a0fe887 100644
--- a/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/realloc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_realloc_test1
diff --git a/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.c b/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.cpp
similarity index 97%
rename from src/pal/tests/palsuite/c_runtime/realloc/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/realloc/test1/test1.cpp
index d0dd128cc11f..64a9270eab46 100644
--- a/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.c
+++ b/src/pal/tests/palsuite/c_runtime/realloc/test1/test1.cpp
@@ -55,7 +55,7 @@ int __cdecl main(int argc, char **argv)
     }
 
     /* free the buffer */
-    testA = realloc(testA, 0);
+    testA = (char*)realloc(testA, 0);
     if (testA != NULL)
     {
         Fail("Realloc didn't return NULL when called with a length "
diff --git a/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt
index e07433745295..74a0e78f5239 100644
--- a/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sin/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_sin_test1
diff --git a/src/pal/tests/palsuite/c_runtime/sin/test1/test1.c b/src/pal/tests/palsuite/c_runtime/sin/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sin/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/sin/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt
index 66cc691d9221..b0101ba80814 100644
--- a/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sinh/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_sinh_test1
diff --git a/src/pal/tests/palsuite/c_runtime/sinh/test1/test1.c b/src/pal/tests/palsuite/c_runtime/sinh/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sinh/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/sinh/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/sprintf.h b/src/pal/tests/palsuite/c_runtime/sprintf/sprintf.h
index 411ae66d5475..6ec4a4d59109 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/sprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/sprintf.h
@@ -14,7 +14,7 @@
 #ifndef __SPRINTF_H__
 #define __SPRINTF_H__
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -27,7 +27,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     }    
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -40,8 +40,8 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
     }    
 }
 
-void DoPointerTest(char *formatstr, void* param, char* paramstr, 
-                   char *checkstr1)
+void DoPointerTest(const char *formatstr, void* param, char* paramstr, 
+                   const char *checkstr1)
 {
     char buf[256] = { 0 };
 
@@ -54,7 +54,7 @@ void DoPointerTest(char *formatstr, void* param, char* paramstr,
     }
 }
 
-void DoCountTest(char *formatstr, int param, char *checkstr)
+void DoCountTest(const char *formatstr, int param, const char *checkstr)
 {
     char buf[512] = { 0 };
     int n = -1;
@@ -72,7 +72,7 @@ void DoCountTest(char *formatstr, int param, char *checkstr)
     }
 }
 
-void DoShortCountTest(char *formatstr, int param, char *checkstr)
+void DoShortCountTest(const char *formatstr, int param, const char *checkstr)
 {
     char buf[256] = { 0 };
     short int n = -1;
@@ -91,7 +91,7 @@ void DoShortCountTest(char *formatstr, int param, char *checkstr)
 }
 
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -104,7 +104,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     }
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -117,7 +117,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     }
 }
 
-void DoNumTest(char *formatstr, int value, char *checkstr)
+void DoNumTest(const char *formatstr, int value, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -130,7 +130,7 @@ void DoNumTest(char *formatstr, int value, char *checkstr)
     }
 }
 
-void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1)
+void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1)
 {
     char buf[256] = { 0 };
 
@@ -143,8 +143,8 @@ void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1)
     }    
 }
 
-void DoDoubleTest(char *formatstr, double value, char *checkstr1,
-                  char *checkstr2)
+void DoDoubleTest(const char *formatstr, double value, const char *checkstr1,
+                  const char *checkstr2)
 {
     char buf[256] = { 0 };
 
@@ -158,8 +158,8 @@ void DoDoubleTest(char *formatstr, double value, char *checkstr1,
     }
 }
 
-void DoArgumentPrecTest(char *formatstr, int precision, void *param,
-                        char *paramstr, char *checkstr1, char *checkstr2)
+void DoArgumentPrecTest(const char *formatstr, int precision, void *param,
+                        char *paramstr, const char *checkstr1, const char *checkstr2)
 {
     char buf[256];
 
@@ -174,8 +174,8 @@ void DoArgumentPrecTest(char *formatstr, int precision, void *param,
 
 }
 
-void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param,
-                              char *checkstr1, char *checkstr2)
+void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param,
+                              const char *checkstr1, const char *checkstr2)
 {
     char buf[256];
 
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test1/CMakeLists.txt
index bdec045af9ea..ee0d90fe7fc6 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_sprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/sprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test10/CMakeLists.txt
index 91e9db8ccc24..1efad19deeb4 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_sprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/sprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test11/CMakeLists.txt
index b14c8be04d41..f2f4da694c12 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_sprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/sprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test12/CMakeLists.txt
index 1e517495bd63..361e91f9ae16 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_sprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/sprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test13/CMakeLists.txt
index 25b033fe822b..d08e13b2ba08 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_sprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/sprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test14/CMakeLists.txt
index 5eae306e16a8..60ac2922d729 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_sprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/sprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test15/CMakeLists.txt
index 1fff23fc8941..57bba40e6c37 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_sprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/sprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test16/CMakeLists.txt
index 2065c576d941..fc93e1a67da2 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_sprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/sprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test17/CMakeLists.txt
index ce3a8ad04897..dc5ff2bb30df 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_sprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/sprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test18/CMakeLists.txt
index 6f69e1c7c23a..f6e1b09efa02 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_sprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/sprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test19/CMakeLists.txt
index a2917b27dc26..757288b694b5 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_sprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/sprintf/test19/test19.cpp
similarity index 92%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test19/test19.cpp
index aee731cb74aa..bf3360c56724 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test19/test19.cpp
@@ -30,10 +30,10 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    DoArgumentPrecTest("%.*s", 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*S", 2, convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba");
 
-    DoArgumentPrecTest("%.*n", 3, &n, "pointer to int", "", "");
+    DoArgumentPrecTest("%.*n", 3, (void*)&n, "pointer to int", "", "");
     if (n != 0)
     {
         Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test2/CMakeLists.txt
index 8af1c53a300a..d569263da4e9 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_sprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/sprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test3/CMakeLists.txt
index b7b7e0a57920..518c3f847a6c 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_sprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/sprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test4/CMakeLists.txt
index 3478867b7c64..260def44aae8 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_sprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/sprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test5/CMakeLists.txt
index dfa7583766f7..5d7ce6cb6d2a 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_sprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/sprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test6/CMakeLists.txt
index 7a9a5fc8563d..fce1f204fd97 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_sprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/sprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test7/CMakeLists.txt
index a539a59ab919..72a831ec89f2 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_sprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/sprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test8/CMakeLists.txt
index 7a92c5072a76..c9522c1c9d13 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_sprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/sprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sprintf/test9/CMakeLists.txt
index 2a91658bd4b9..e76fed47840a 100644
--- a/src/pal/tests/palsuite/c_runtime/sprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_sprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/sprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/sprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/sprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt
index 4347c44e46e5..d4aefe6ca8f3 100644
--- a/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sqrt/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_sqrt_test1
diff --git a/src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.c b/src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/sqrt/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h b/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h
index 675a67aed2e8..397f05ceade6 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/sscanf.h
@@ -14,7 +14,7 @@
 #ifndef __SSCANF_H__
 #define __SSCANF_H__
 
-void DoVoidTest(char *inputstr, char *formatstr)
+void DoVoidTest(char *inputstr, const char *formatstr)
 {
     char buf[256] = { 0 };
     int i;
@@ -38,7 +38,7 @@ void DoVoidTest(char *inputstr, char *formatstr)
 
 }
 
-void DoStrTest(char *inputstr, char *formatstr, char *checkstr)
+void DoStrTest(char *inputstr, const char *formatstr, const char *checkstr)
 {
     char buf[256] = { 0 };
     int ret;
@@ -59,7 +59,7 @@ void DoStrTest(char *inputstr, char *formatstr, char *checkstr)
 
 }
 
-void DoWStrTest(char *inputstr, char *formatstr, WCHAR *checkstr)
+void DoWStrTest(char *inputstr, const char *formatstr, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
     int ret;
@@ -80,7 +80,7 @@ void DoWStrTest(char *inputstr, char *formatstr, WCHAR *checkstr)
 
 }
 
-void DoNumTest(char *inputstr, char *formatstr, int checknum)
+void DoNumTest(char *inputstr, const char *formatstr, int checknum)
 {
     int num;
     int ret;
@@ -99,7 +99,7 @@ void DoNumTest(char *inputstr, char *formatstr, int checknum)
     }
 }
 
-void DoShortNumTest(char *inputstr, char *formatstr, short checknum)
+void DoShortNumTest(char *inputstr, const char *formatstr, short checknum)
 {
     short num;
     int ret;
@@ -118,7 +118,7 @@ void DoShortNumTest(char *inputstr, char *formatstr, short checknum)
     }
 }
 
-void DoI64NumTest(char *inputstr, char *formatstr, INT64 checknum)
+void DoI64NumTest(char *inputstr, const char *formatstr, INT64 checknum)
 {
     char buf[256];
     char check[256];
@@ -141,7 +141,7 @@ void DoI64NumTest(char *inputstr, char *formatstr, INT64 checknum)
     }
 }
 
-void DoCharTest(char *inputstr, char *formatstr, char* checkchars, int numchars)
+void DoCharTest(char *inputstr, const char *formatstr, char* checkchars, int numchars)
 {
     char buf[256];
     int ret;
@@ -174,7 +174,7 @@ void DoCharTest(char *inputstr, char *formatstr, char* checkchars, int numchars)
     }
 }
 
-void DoWCharTest(char *inputstr, char *formatstr, WCHAR* checkchars, int numchars)
+void DoWCharTest(char *inputstr, const char *formatstr, WCHAR* checkchars, int numchars)
 {
     WCHAR buf[256];
     int ret;
@@ -208,7 +208,7 @@ void DoWCharTest(char *inputstr, char *formatstr, WCHAR* checkchars, int numchar
 }
 
 
-void DoFloatTest(char *inputstr, char *formatstr, float checkval)
+void DoFloatTest(char *inputstr, const char *formatstr, float checkval)
 {
     char buf[256] = { 0 };
     float val;
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test1/CMakeLists.txt
index dce6d1de87be..97b8f570e327 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_sscanf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/sscanf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test10/CMakeLists.txt
index c27e4ce33a68..afda216c6b75 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_sscanf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/sscanf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test11/CMakeLists.txt
index 7570e990bfde..c8f98aeeefe9 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_sscanf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/sscanf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test12/CMakeLists.txt
index b6509e46d40f..0ecedc328595 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_sscanf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/sscanf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test13/CMakeLists.txt
index 6fb4094f0070..4566ec333811 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_sscanf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/sscanf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test14/CMakeLists.txt
index 373a75fbda69..557acf5bf881 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_sscanf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/sscanf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test15/CMakeLists.txt
index d500901782d5..efde5c4a2160 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_sscanf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/sscanf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test16/CMakeLists.txt
index c5e18ec06190..6757b0d78aa8 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_sscanf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/sscanf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test17/CMakeLists.txt
index 7d908ab8329e..8ea4d5e3f6b9 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_sscanf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/sscanf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test2/CMakeLists.txt
index 571d773a889b..4e36223a1d20 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_sscanf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/sscanf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test3/CMakeLists.txt
index ced8d5f8daba..053a96ca0fcc 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_sscanf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/sscanf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test4/CMakeLists.txt
index 3e70d6dae27a..ae04bfef57ee 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_sscanf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/sscanf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test5/CMakeLists.txt
index 391e51baa2ba..33dcaffec330 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_sscanf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/sscanf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test6/CMakeLists.txt
index c0b21bfd0da4..1dd23c3cb149 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_sscanf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/sscanf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test7/CMakeLists.txt
index bcbd268011f9..015a27b776e1 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_sscanf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/sscanf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test8/CMakeLists.txt
index 211e9e4df605..aa41ab42a62a 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_sscanf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/sscanf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/sscanf/test9/CMakeLists.txt
index 77c269aeaa4c..b631fd40ea87 100644
--- a/src/pal/tests/palsuite/c_runtime/sscanf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/sscanf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_sscanf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/sscanf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/sscanf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/sscanf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/sscanf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt
index 4a0f0be32d4b..fd62627db6ae 100644
--- a/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strcat/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strcat_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strcat/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strcat/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strcat/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strcat/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt
index 1d248f3f56f5..f3ffe3bc1528 100644
--- a/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strchr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strchr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strchr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strchr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strchr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strchr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt
index b953dfa03439..3b0f89c2a5c4 100644
--- a/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strcmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strcmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strcmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt
index 043ec57d98d0..4369d37a402b 100644
--- a/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strcpy/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strcpy_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strcpy/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt
index a38761c33569..717e18f0e9c3 100644
--- a/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strcspn/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strcspn_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strcspn/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt
index c61828a97bda..4afeb598aa2e 100644
--- a/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strlen/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strlen_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strlen/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strlen/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strlen/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strlen/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt
index 7595f6693903..f8080ecdc232 100644
--- a/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strncat/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strncat_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strncat/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strncat/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strncat/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strncat/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt
index 4a0337a3dcb4..34b53e294d96 100644
--- a/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strncmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strncmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strncmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt
index 6e0250bce338..fb737c8c5955 100644
--- a/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strncpy/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strncpy_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strncpy/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt
index eac9ac9169d2..9e76436e01ca 100644
--- a/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strpbrk/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strpbrk_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strpbrk/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt
index 5c099b0cd229..bb6916038d79 100644
--- a/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strrchr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strrchr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strrchr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt
index 45caaf1bf824..c72fd0fa9a43 100644
--- a/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strspn/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strspn_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strspn/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strspn/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strspn/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strspn/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt
index 17e6ae8457e4..004b9a565896 100644
--- a/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strstr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strstr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strstr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strstr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strstr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strstr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt
index d3a9d61a4dff..09884f32e6a8 100644
--- a/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strtod/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strtod_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strtod/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strtod/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strtod/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strtod/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt
index 6f407c59148f..8729cc5a1c91 100644
--- a/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strtod/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_strtod_test2
diff --git a/src/pal/tests/palsuite/c_runtime/strtod/test2/test2.c b/src/pal/tests/palsuite/c_runtime/strtod/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strtod/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/strtod/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt
index 1d5fc04cca32..422c4e96b53d 100644
--- a/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strtok/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strtok_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strtok/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strtok/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strtok/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strtok/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt
index 61dbd4f9a313..009e85fb11ac 100644
--- a/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/strtoul/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_strtoul_test1
diff --git a/src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.c b/src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/strtoul/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h b/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h
index 522950606405..6f4c914a822e 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/swprintf.h
@@ -14,7 +14,7 @@
 #ifndef __SWPRINTF_H__
 #define __SWPRINTF_H__
 
-void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
+void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -29,7 +29,7 @@ void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
     }
 }
 
-void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
+void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -44,7 +44,7 @@ void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
     }
 }
 
-void DoPointerTest(WCHAR *formatstr, void* param, WCHAR *checkstr1)
+void DoPointerTest(const WCHAR *formatstr, void* param, const WCHAR *checkstr1)
 {
     WCHAR buf[256] = { 0 };
 
@@ -57,7 +57,7 @@ void DoPointerTest(WCHAR *formatstr, void* param, WCHAR *checkstr1)
     }    
 }
 
-void DoCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
+void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
 {
     WCHAR buf[512] = { 0 };
     int n = -1;
@@ -77,7 +77,7 @@ void DoCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
     }
 }
 
-void DoShortCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
+void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
     short int n = -1;
@@ -97,7 +97,7 @@ void DoShortCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
     }
 }
 
-void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
+void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -110,7 +110,7 @@ void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
     }
 }
 
-void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
+void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -123,7 +123,7 @@ void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
     }
 }
 
-void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
+void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -136,8 +136,8 @@ void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
     }
 }
 
-void DoI64Test(WCHAR *formatstr, INT64 param, char *paramdesc,
-               WCHAR *checkstr1)
+void DoI64Test(const WCHAR *formatstr, INT64 param, char *paramdesc,
+               const WCHAR *checkstr1)
 {
     WCHAR buf[256] = { 0 };
 
@@ -150,8 +150,8 @@ void DoI64Test(WCHAR *formatstr, INT64 param, char *paramdesc,
     }
 }
 
-void DoDoubleTest(WCHAR *formatstr, double value, WCHAR *checkstr1,
-                  WCHAR *checkstr2)
+void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1,
+                  const WCHAR *checkstr2)
 {
     WCHAR buf[256] = { 0 };
 
@@ -166,8 +166,8 @@ void DoDoubleTest(WCHAR *formatstr, double value, WCHAR *checkstr1,
     }
 }
 
-void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param,
-                        char *paramstr, WCHAR *checkstr1, WCHAR *checkstr2)
+void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param,
+                        char *paramstr, const WCHAR *checkstr1, const WCHAR *checkstr2)
 {
     WCHAR buf[256];
 
@@ -182,8 +182,8 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param,
     }
 }
 
-void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param,
-                              WCHAR *checkstr1, WCHAR *checkstr2)
+void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param,
+                              const WCHAR *checkstr1, const WCHAR *checkstr2)
 {
     WCHAR buf[256];
 
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt
index fcf816029edd..c9be8c33479f 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_swprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt
index 302c5e5923aa..222108393b9b 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_swprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt
index 484d57ef587c..96222a5b2a1e 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_swprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt
index 6d45ee464643..1ffe620fed4b 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_swprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt
index 20f6f0df7b70..8699589ec968 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_swprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt
index a052f6011630..2a4b84805c81 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_swprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt
index 7bc2da122f91..22382bce5f9a 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_swprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt
index e6ad3abd3fcd..462f0806cd64 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_swprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt
index 401285b7406b..c5b4d4459395 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_swprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt
index 210ab2c7ec66..6cdf5769666a 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_swprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt
index b9d44a30319b..334b7b4fa1fa 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_swprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp
similarity index 95%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp
index 5199cc3cd9c8..c0346036cd83 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test19/test19.cpp
@@ -29,11 +29,11 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    DoArgumentPrecTest(convert("%.*s"), 2, convert("bar"), "bar",
+    DoArgumentPrecTest(convert("%.*s"), 2, (void*)convert("bar"), "bar",
                        convert("ba"), convert("ba"));
-    DoArgumentPrecTest(convert("%.*S"), 2, "bar", "bar", convert("ba"),
+    DoArgumentPrecTest(convert("%.*S"), 2, (void*)"bar", "bar", convert("ba"),
                        convert("ba"));
-    DoArgumentPrecTest(convert("%.*n"), 3, &n, "pointer to int", convert(""),
+    DoArgumentPrecTest(convert("%.*n"), 3, (void*)&n, "pointer to int", convert(""),
                        convert(""));
     if (n != 0)
     {
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt
index 84446d5f6da5..af2b13e4c703 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_swprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt
index 6dbd8a3c366d..14b81f4ac8ec 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_swprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt
index a665948c47b8..e153e6b02fc6 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_swprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt
index 8268ec296365..967ccbb9925a 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_swprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt
index 6a90c0b88ea3..806211a9929d 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_swprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt
index 2b1c30cb56da..cf563799d9a9 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_swprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt
index 281e6df097a7..e8fcf66157a6 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_swprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt
index 054b40a998ae..c6163487662e 100644
--- a/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_swprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/swprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h b/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h
index 1cac450cf44e..6e40332fa628 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/swscanf.h
@@ -14,7 +14,7 @@
 #ifndef __SWSCANF_H__
 #define __SWSCANF_H__
 
-void DoVoidTest(WCHAR *inputstr, WCHAR *formatstr)
+void DoVoidTest(WCHAR *inputstr, const WCHAR *formatstr)
 {
     char buf[256] = { 0 };
     int i;
@@ -40,7 +40,7 @@ void DoVoidTest(WCHAR *inputstr, WCHAR *formatstr)
 
 }
 
-void DoStrTest(WCHAR *inputstr, WCHAR *formatstr, char *checkstr)
+void DoStrTest(WCHAR *inputstr, const WCHAR *formatstr, const char *checkstr)
 {
     char buf[256] = { 0 };
     int ret;
@@ -63,7 +63,7 @@ void DoStrTest(WCHAR *inputstr, WCHAR *formatstr, char *checkstr)
 
 }
 
-void DoWStrTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkstr)
+void DoWStrTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
     int ret;
@@ -86,7 +86,7 @@ void DoWStrTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkstr)
 
 }
 
-void DoNumTest(WCHAR *inputstr, WCHAR *formatstr, int checknum)
+void DoNumTest(WCHAR *inputstr, const WCHAR *formatstr, int checknum)
 {
     int num = 0;
     int ret;
@@ -107,7 +107,7 @@ void DoNumTest(WCHAR *inputstr, WCHAR *formatstr, int checknum)
     }
 }
 
-void DoShortNumTest(WCHAR *inputstr, WCHAR *formatstr, short checknum)
+void DoShortNumTest(WCHAR *inputstr, const WCHAR *formatstr, short checknum)
 {
     short num = 0;
     int ret;
@@ -128,7 +128,7 @@ void DoShortNumTest(WCHAR *inputstr, WCHAR *formatstr, short checknum)
     }
 }
 
-void DoI64NumTest(WCHAR *inputstr, WCHAR *formatstr, INT64 checknum)
+void DoI64NumTest(WCHAR *inputstr, const WCHAR *formatstr, INT64 checknum)
 {
     char buf[256];
     char check[256];
@@ -153,7 +153,7 @@ void DoI64NumTest(WCHAR *inputstr, WCHAR *formatstr, INT64 checknum)
     }
 }
 
-void DoCharTest(WCHAR *inputstr, WCHAR*formatstr, char* checkchars, int numchars)
+void DoCharTest(WCHAR *inputstr, const WCHAR *formatstr, char* checkchars, int numchars)
 {
     char buf[256];
     int ret;
@@ -187,7 +187,7 @@ void DoCharTest(WCHAR *inputstr, WCHAR*formatstr, char* checkchars, int numchars
     }
 }
 
-void DoWCharTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkchars, int numchars)
+void DoWCharTest(WCHAR *inputstr, const WCHAR *formatstr, const WCHAR *checkchars, int numchars)
 {
     WCHAR buf[256];
     int ret;
@@ -223,7 +223,7 @@ void DoWCharTest(WCHAR *inputstr, WCHAR *formatstr, WCHAR *checkchars, int numch
 }
 
 
-void DoFloatTest(WCHAR *inputstr, WCHAR *formatstr, float checkval)
+void DoFloatTest(WCHAR *inputstr, const WCHAR *formatstr, float checkval)
 {
     char buf[256] = { 0 };
     float val;
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt
index 030aaaf709a9..44b893924838 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_swscanf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt
index f7c8b284ffa5..27d42114a9c9 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_swscanf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt
index 17066f31b8de..1ca9224ec02a 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_swscanf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt
index 95f5174ecbf2..44d70f47ae29 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_swscanf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt
index 47abc503133a..add0cbfe1801 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_swscanf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt
index a470436ce71e..126e087b1c08 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_swscanf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt
index d89650b12cc3..7c2da2bdf890 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_swscanf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt
index a2a00f11b657..ba28c4dc2f85 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_swscanf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt
index c224f5d9a6a2..225ce868edf0 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_swscanf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt
index a5335ddb48ad..15411ecf2182 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_swscanf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt
index 5c229c26d3eb..927026107ae7 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_swscanf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt
index 5e281aaf34a0..eec701645b04 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_swscanf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt
index 8b259aa78d3b..3f022db16c82 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_swscanf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt
index c3fd8696abff..c55666d95c63 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_swscanf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt
index 00541306df10..adb0abe80db8 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_swscanf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt
index d6aa631ab9ce..a69c55233713 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_swscanf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt
index 4f7595a20537..70a9fe206496 100644
--- a/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/swscanf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_swscanf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/swscanf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt
index 665fc22d5e78..cea661f2bb16 100644
--- a/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/tan/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_tan_test1
diff --git a/src/pal/tests/palsuite/c_runtime/tan/test1/test1.c b/src/pal/tests/palsuite/c_runtime/tan/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/tan/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/tan/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt
index f8e439dd9540..9fe926d44146 100644
--- a/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/tanh/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_tanh_test1
diff --git a/src/pal/tests/palsuite/c_runtime/tanh/test1/test1.c b/src/pal/tests/palsuite/c_runtime/tanh/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/tanh/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/tanh/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt
index d495266ceff4..64df14455793 100644
--- a/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/time/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_time_test1
diff --git a/src/pal/tests/palsuite/c_runtime/time/test1/test1.c b/src/pal/tests/palsuite/c_runtime/time/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/time/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/time/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt
index 537f239cf8bb..214a50901011 100644
--- a/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/tolower/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_tolower_test1
diff --git a/src/pal/tests/palsuite/c_runtime/tolower/test1/test1.c b/src/pal/tests/palsuite/c_runtime/tolower/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/tolower/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/tolower/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt
index e5aa375a9b78..3dd536c59072 100644
--- a/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/toupper/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_toupper_test1
diff --git a/src/pal/tests/palsuite/c_runtime/toupper/test1/test1.c b/src/pal/tests/palsuite/c_runtime/toupper/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/toupper/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/toupper/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt
index 2a3e6a07efb7..77a46344d421 100644
--- a/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/towlower/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_towlower_test1
diff --git a/src/pal/tests/palsuite/c_runtime/towlower/test1/test1.c b/src/pal/tests/palsuite/c_runtime/towlower/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/towlower/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/towlower/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt
index 537efbe0fa11..6a2f813cc900 100644
--- a/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/towupper/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_towupper_test1
diff --git a/src/pal/tests/palsuite/c_runtime/towupper/test1/test1.c b/src/pal/tests/palsuite/c_runtime/towupper/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/towupper/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/towupper/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt
index da19397e2cb8..0286f99b77aa 100644
--- a/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ungetc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ungetc.c
+  ungetc.cpp
 )
 
 add_executable(paltest_ungetc_test1
diff --git a/src/pal/tests/palsuite/c_runtime/ungetc/test1/ungetc.c b/src/pal/tests/palsuite/c_runtime/ungetc/test1/ungetc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/ungetc/test1/ungetc.c
rename to src/pal/tests/palsuite/c_runtime/ungetc/test1/ungetc.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt
index 7b6342362841..0710074bd061 100644
--- a/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/ungetc/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ungetc.c
+  ungetc.cpp
 )
 
 add_executable(paltest_ungetc_test2
diff --git a/src/pal/tests/palsuite/c_runtime/ungetc/test2/ungetc.c b/src/pal/tests/palsuite/c_runtime/ungetc/test2/ungetc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/ungetc/test2/ungetc.c
rename to src/pal/tests/palsuite/c_runtime/ungetc/test2/ungetc.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt
index 4c967fbc5bbf..fcff4a20749b 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_vfprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt
index e154107e3695..97c7b167ab88 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_vfprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt
index f51f379bcdbf..9250eb957de3 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_vfprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt
index 3ef68cff707e..53d3488b4aa4 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_vfprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt
index cd34f6649cff..c35813b420c3 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_vfprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt
index 396a4631c5fa..bd91f509b5e3 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_vfprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt
index b9ddbe3b4a17..30003b82f8e3 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_vfprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt
index 0fd4177ed834..a287f120a05d 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_vfprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt
index afc0b3828dc7..cf1afd9d2d87 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_vfprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt
index 9e373b999e65..143eade9b3b6 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_vfprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt
index 3120c9117f6d..452d929b7dac 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_vfprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.cpp
similarity index 92%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.cpp
index e88ce236630b..d8e8f9301d6d 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test19/test19.cpp
@@ -28,10 +28,10 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    DoArgumentPrecTest("%.*s", 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*S", 2, convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba");
 
-    DoArgumentPrecTest("%.*n ", 3, &n, "pointer to int", " ", " ");
+    DoArgumentPrecTest("%.*n ", 3, (void*)&n, "pointer to int", " ", " ");
     if (n != 0)
     {
         Fail("ERROR: Expected count parameter to resolve to %d, got %X\n", 
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt
index 6e700090d6ab..b18fb712c65b 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_vfprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt
index 1a14d85603b9..a8f7eb1991c0 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_vfprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt
index c1285942bce5..60c31693a59a 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_vfprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt
index 0cccdfd6306c..5f516fec6a0d 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_vfprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt
index 2c036a45ae1d..7f0cc710afac 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_vfprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt
index ca483af77332..a2cd9a2e8f9f 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_vfprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt
index 89459b4e933a..a7b20ee43e9f 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_vfprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt
index 3e3b5b99edc6..242b635f93a1 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_vfprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/vfprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h b/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h
index f4ae7a53fa66..7901b08b0deb 100644
--- a/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/vfprintf/vfprintf.h
@@ -14,7 +14,7 @@
 #ifndef __vfprintf_H__
 #define __vfprintf_H__
 
-int DoVfprintf(FILE *fp, char *format, ...)
+int DoVfprintf(FILE *fp, const char *format, ...)
 {
     int retVal;
     va_list arglist;
@@ -26,7 +26,7 @@ int DoVfprintf(FILE *fp, char *format, ...)
     return (retVal);
 }
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     FILE *fp;    
     char buf[256] = { 0 };
@@ -57,7 +57,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     fclose(fp);
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -89,8 +89,8 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
 }
 
 
-void DoPointerTest(char *formatstr, void* param, char* paramstr, 
-                   char *checkstr1)
+void DoPointerTest(const char *formatstr, void* param, char* paramstr, 
+                   const char *checkstr1)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -130,7 +130,7 @@ void DoPointerTest(char *formatstr, void* param, char* paramstr,
 
 
 
-void DoCountTest(char *formatstr, int param, char *checkstr)
+void DoCountTest(const char *formatstr, int param, const char *checkstr)
 {
     FILE *fp;
     char buf[512] = { 0 };
@@ -173,7 +173,7 @@ void DoCountTest(char *formatstr, int param, char *checkstr)
     }
 }
 
-void DoShortCountTest(char *formatstr, int param, char *checkstr)
+void DoShortCountTest(const char *formatstr, int param, const char *checkstr)
 {
     FILE *fp;
     char buf[512] = { 0 };
@@ -217,7 +217,7 @@ void DoShortCountTest(char *formatstr, int param, char *checkstr)
 }
 
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -248,7 +248,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     fclose(fp);
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -279,7 +279,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     fclose(fp);
 }
 
-void DoNumTest(char *formatstr, int value, char *checkstr)
+void DoNumTest(const char *formatstr, int value, const char *checkstr)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -310,7 +310,7 @@ void DoNumTest(char *formatstr, int value, char *checkstr)
     fclose(fp);
 }
 
-void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1)
+void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr1)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -341,8 +341,8 @@ void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr1)
     fclose(fp);
 }
 
-void DoDoubleTest(char *formatstr, double value, char *checkstr1,
-                  char *checkstr2)
+void DoDoubleTest(const char *formatstr, double value, const char *checkstr1,
+                  const char *checkstr2)
 {
     FILE *fp;
     char buf[256] = { 0 };
@@ -376,8 +376,8 @@ void DoDoubleTest(char *formatstr, double value, char *checkstr1,
 }
 
 
-void DoArgumentPrecTest(char *formatstr, int precision, void *param, 
-                        char *paramstr, char *checkstr1, char *checkstr2)
+void DoArgumentPrecTest(const char *formatstr, int precision, void *param, 
+                        char *paramstr, const char *checkstr1, const char *checkstr2)
 {
     FILE *fp;
     char buf[256];
@@ -418,8 +418,8 @@ void DoArgumentPrecTest(char *formatstr, int precision, void *param,
             
 }
 
-void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param, 
-                              char *checkstr1, char *checkstr2)
+void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, 
+                              const char *checkstr1, const char *checkstr2)
 {
     FILE *fp;
     char buf[256];
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt
index eabdf8739310..9d866e16a2a3 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_vprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt
index 47a21d909ac2..4ed04b46c6c8 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_vprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt
index 4c750b72ac58..5dc3c6dc6902 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_vprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt
index 1feb886fc12b..a8104296c4da 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_vprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt
index cd7535a1ad71..df98081ed7b0 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_vprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt
index 82cfd68ecff1..b903d4e241c2 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_vprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt
index 29a134d48c90..659ed9cb44f3 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_vprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt
index 7fbf43ac8423..b2f7fe8b789f 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_vprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt
index 25970cba156b..76cfc9ad0675 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_vprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt
index 45676b93ddfa..633fb7ee5143 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_vprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt
index 25bc2fccd1c5..1a6256ad0bbc 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_vprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.cpp
similarity index 92%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.cpp
index d79f2e259124..a3e08773693e 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test19/test19.cpp
@@ -28,10 +28,10 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    DoArgumentPrecTest("%.*s", 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*S", 2, convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba");
 
-    DoArgumentPrecTest("%.*n", 3, &n, "pointer to int", "", "");
+    DoArgumentPrecTest("%.*n", 3, (void*)&n, "pointer to int", "", "");
     if (n != 0)
     {
         Fail("ERROR: Expected count parameter to resolve to %d, got %X\n",
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt
index 6820069cb9aa..41e2073477d0 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_vprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt
index 676d19bf7ab7..8570666b1168 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_vprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt
index 9ddb087e83fb..06b582b5ee92 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_vprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt
index f453bb66ee19..3a1828a28c8f 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_vprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt
index 1ce8d5aa4ced..2dac7703e6c2 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_vprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt
index 5627fe4c1e01..5a520045a910 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_vprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt
index 0131e4943ef2..18e4e3a0c95e 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_vprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt
index c70631f9dcbc..8bcbe81f519c 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_vprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/vprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h b/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h
index 477db32f4da8..fcd8f8037090 100644
--- a/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/vprintf/vprintf.h
@@ -14,7 +14,7 @@
 #ifndef __vprintf_H__
 #define __vprintf_H__
 
-int DoVprintf(char *format, ...)
+int DoVprintf(const char *format, ...)
 {
     int retVal;
     va_list arglist;
@@ -26,7 +26,7 @@ int DoVprintf(char *format, ...)
     return (retVal);
 }
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     int ret;
 
@@ -38,7 +38,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     }
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     int ret;
 
@@ -50,8 +50,8 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
     }
 }
 
-void DoPointerTest(char *formatstr, void* param, char* paramstr, 
-                   char *checkstr1)
+void DoPointerTest(const char *formatstr, void* param, char* paramstr, 
+                   const char *checkstr1)
 {
     int ret;
 
@@ -63,7 +63,7 @@ void DoPointerTest(char *formatstr, void* param, char* paramstr,
     }
 }
 
-void DoCountTest(char *formatstr, int param, char *checkstr)
+void DoCountTest(const char *formatstr, int param, const char *checkstr)
 {
     int ret;
     int n = -1;
@@ -82,7 +82,7 @@ void DoCountTest(char *formatstr, int param, char *checkstr)
     }    
 }
 
-void DoShortCountTest(char *formatstr, int param, char *checkstr)
+void DoShortCountTest(const char *formatstr, int param, const char *checkstr)
 {
     int ret;
     short int n = -1;
@@ -102,7 +102,7 @@ void DoShortCountTest(char *formatstr, int param, char *checkstr)
 }
 
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     int ret;
 
@@ -114,7 +114,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     }
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     int ret;
 
@@ -126,7 +126,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     }    
 }
 
-void DoNumTest(char *formatstr, int param, char *checkstr)
+void DoNumTest(const char *formatstr, int param, const char *checkstr)
 {
     int ret;
 
@@ -138,7 +138,7 @@ void DoNumTest(char *formatstr, int param, char *checkstr)
     }    
 }
 
-void DoI64Test(char *formatstr, INT64 param, char *valuestr, char *checkstr1)
+void DoI64Test(const char *formatstr, INT64 param, char *valuestr, const char *checkstr1)
 {
     int ret;
 
@@ -150,8 +150,8 @@ void DoI64Test(char *formatstr, INT64 param, char *valuestr, char *checkstr1)
     }
 }
 
-void DoDoubleTest(char *formatstr, double param, char *checkstr1, 
-                  char *checkstr2)
+void DoDoubleTest(const char *formatstr, double param, const char *checkstr1, 
+                  const char *checkstr2)
 {
     int ret;
 
@@ -163,8 +163,8 @@ void DoDoubleTest(char *formatstr, double param, char *checkstr1,
     }
 }
 
-void DoArgumentPrecTest(char *formatstr, int precision, void *param, 
-                        char *paramstr, char *checkstr1, char *checkstr2)
+void DoArgumentPrecTest(const char *formatstr, int precision, void *param, 
+                        char *paramstr, const char *checkstr1, const char *checkstr2)
 {
     int ret;
 
@@ -176,8 +176,8 @@ void DoArgumentPrecTest(char *formatstr, int precision, void *param,
     }
 }
 
-void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param, 
-    char *checkstr1, char *checkstr2)
+void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param, 
+    const char *checkstr1, const char *checkstr2)
 {
     int ret;
 
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt
index 4f0872ecccc2..6861157c1b85 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_vsprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt
index d32de01ba1f0..6f535a50987d 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_vsprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt
index ce67444c39aa..3fa628f77df0 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_vsprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt
index fe6ccb839910..f34f76abc5e9 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_vsprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt
index 97fdf8cdd061..df23693f10a3 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_vsprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt
index 2851a8893e62..394b5ab97c47 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_vsprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt
index 6fb1d321b83e..4793b45663c3 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_vsprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt
index ccc21378fc80..6a0a52ddf776 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_vsprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt
index 4c9dcd986f60..4e220dab778e 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_vsprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt
index 2e8610d4a529..4dd68c298701 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_vsprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt
index 92e39ab59720..3156a59a1558 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_vsprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.cpp
similarity index 94%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.cpp
index 18590ed51b2a..698ff36e3574 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test19/test19.cpp
@@ -27,8 +27,8 @@ int __cdecl main(int argc, char *argv[])
     }
 
 
-    DoArgumentPrecTest("%.*s", 2, "bar", "bar", "ba", "ba");
-    DoArgumentPrecTest("%.*S", 2, convert("bar"), "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*s", 2, (void*)"bar", "bar", "ba", "ba");
+    DoArgumentPrecTest("%.*S", 2, (void*)convert("bar"), "bar", "ba", "ba");
     DoArgumentPrecTest("%.*c", 0, (void*)'a', "a", "a", "a");
     DoArgumentPrecTest("%.*c", 4, (void*)'a', "a", "a", "a");
     DoArgumentPrecTest("%.*C", 0, (void*)'a', "a", "a", "a");
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt
index 2308bc2573e8..210224f0f16d 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_vsprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt
index aef24171fc29..5581051f9f02 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_vsprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt
index 9570255475c7..88817fcffb21 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_vsprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt
index 34a3e6243fc4..6d14bf76bf9a 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_vsprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt
index dccca0b2b78e..606fe3b965dd 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_vsprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt
index 7f18de056ee4..2dee276968e4 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_vsprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt
index 34c92e104520..8dac76fc3a52 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_vsprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt
index 1fe177de9561..95f0faad876b 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_vsprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/vsprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h b/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h
index 10648d896f87..7b04a777caba 100644
--- a/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/vsprintf/vsprintf.h
@@ -26,7 +26,7 @@ int testvsp(char* buf, const char* format, ...)
     return (retVal);
 }
 
-void DoStrTest(char *formatstr, char* param, char *checkstr)
+void DoStrTest(const char *formatstr, char* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -39,7 +39,7 @@ void DoStrTest(char *formatstr, char* param, char *checkstr)
     }
 }
 
-void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
+void DoWStrTest(const char *formatstr, WCHAR* param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -53,7 +53,7 @@ void DoWStrTest(char *formatstr, WCHAR* param, char *checkstr)
 }
 
 
-void DoCharTest(char *formatstr, char param, char *checkstr)
+void DoCharTest(const char *formatstr, char param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -66,7 +66,7 @@ void DoCharTest(char *formatstr, char param, char *checkstr)
     }
 }
 
-void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
+void DoWCharTest(const char *formatstr, WCHAR param, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -79,7 +79,7 @@ void DoWCharTest(char *formatstr, WCHAR param, char *checkstr)
     }
 }
 
-void DoNumTest(char *formatstr, int value, char *checkstr)
+void DoNumTest(const char *formatstr, int value, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -92,7 +92,7 @@ void DoNumTest(char *formatstr, int value, char *checkstr)
     }
 }
 
-void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr)
+void DoI64Test(const char *formatstr, INT64 value, char *valuestr, const char *checkstr)
 {
     char buf[256] = { 0 };
 
@@ -104,7 +104,7 @@ void DoI64Test(char *formatstr, INT64 value, char *valuestr, char *checkstr)
             valuestr, formatstr, checkstr, buf);
     }
 }
-void DoDoubleTest(char *formatstr, double value, char *checkstr1, char
+void DoDoubleTest(const char *formatstr, double value, const char *checkstr1, char
 *checkstr2)
 {
     char buf[256] = { 0 };
@@ -119,8 +119,8 @@ void DoDoubleTest(char *formatstr, double value, char *checkstr1, char
     }
 }
 /*FROM TEST 9*/
-void DoArgumentPrecTest(char *formatstr, int precision, void *param,
-                        char *paramstr, char *checkstr1, char *checkstr2)
+void DoArgumentPrecTest(const char *formatstr, int precision, void *param,
+                        char *paramstr, const char *checkstr1, const char *checkstr2)
 {
     char buf[256];
 
@@ -135,8 +135,8 @@ void DoArgumentPrecTest(char *formatstr, int precision, void *param,
 
 }
 
-void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param,
-                              char *checkstr1, char *checkstr2)
+void DoArgumentPrecDoubleTest(const char *formatstr, int precision, double param,
+                              const char *checkstr1, const char *checkstr2)
 {
     char buf[256];
 
@@ -150,8 +150,8 @@ void DoArgumentPrecDoubleTest(char *formatstr, int precision, double param,
     }
 }
 /*FROM TEST4*/
-void DoPointerTest(char *formatstr, void* param, char* paramstr,
-                   char *checkstr1)
+void DoPointerTest(const char *formatstr, void* param, char* paramstr,
+                   const char *checkstr1)
 {
     char buf[256] = { 0 };
 
@@ -164,8 +164,8 @@ void DoPointerTest(char *formatstr, void* param, char* paramstr,
     }
 }
 
-void DoI64DoubleTest(char *formatstr, INT64 value, char *valuestr,
-                     char *checkstr1)
+void DoI64DoubleTest(const char *formatstr, INT64 value, char *valuestr,
+                     const char *checkstr1)
 {
     char buf[256] = { 0 };
 
@@ -178,7 +178,7 @@ void DoI64DoubleTest(char *formatstr, INT64 value, char *valuestr,
     }
 }
 
-void DoTest(char *formatstr, int param, char *checkstr)
+void DoTest(const char *formatstr, int param, const char *checkstr)
 {
     char buf[256] = { 0 };
     int n = -1;
@@ -196,7 +196,7 @@ void DoTest(char *formatstr, int param, char *checkstr)
     }
 }
 
-void DoShortTest(char *formatstr, int param, char *checkstr)
+void DoShortTest(const char *formatstr, int param, const char *checkstr)
 {
     char buf[256] = { 0 };
     short int n = -1;
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt
index 97fbeb4e2802..1d6233744a7a 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_vswprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt
index 06c11f68ca0a..e5301427eb6d 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_vswprintf_test10
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt
index 5237ba4e1d51..1cfadb9300a6 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_vswprintf_test11
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt
index 26199c3dcc01..f5a582a9704f 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_vswprintf_test12
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt
index d0acd98d64df..5571d7336f7d 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test13.c
+  test13.cpp
 )
 
 add_executable(paltest_vswprintf_test13
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test13/test13.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt
index 06c12674a4ab..234029ead489 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test14.c
+  test14.cpp
 )
 
 add_executable(paltest_vswprintf_test14
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test14/test14.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt
index 05dc41b0d879..b705268bc7c5 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test15.c
+  test15.cpp
 )
 
 add_executable(paltest_vswprintf_test15
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test15/test15.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt
index 3c42755043bc..da296bcf32ce 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test16.c
+  test16.cpp
 )
 
 add_executable(paltest_vswprintf_test16
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test16/test16.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt
index b94c466d5f9a..02234c167214 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test17.c
+  test17.cpp
 )
 
 add_executable(paltest_vswprintf_test17
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test17/test17.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt
index 57cc8ccb036a..0c0e5b566bbd 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test18.c
+  test18.cpp
 )
 
 add_executable(paltest_vswprintf_test18
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test18/test18.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt
index 2187b587278f..066db8ab84d6 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test19.c
+  test19.cpp
 )
 
 add_executable(paltest_vswprintf_test19
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp
similarity index 98%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp
index c00185be6d9e..1d1c5656b273 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.c
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test19/test19.cpp
@@ -67,7 +67,7 @@ int __cdecl main(int argc, char *argv[])
     if (PAL_Initialize(argc, argv) != 0)
         return(FAIL);
 
-    DoArgumentPrecTest(convert("%.*s"), 2, convert("bar"), convert("bar"), 
+    DoArgumentPrecTest(convert("%.*s"), 2, (void*)convert("bar"), convert("bar"), 
         convert("ba"), convert("ba"));
     DoArgumentPrecTest(convert("%.*c"), 0, (void*)'a', convert("a"), 
         convert("a"), convert("a"));
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt
index 295448cb0c06..abfceca9e235 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_vswprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt
index 1fb6272ae765..7f4798dbc564 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_vswprintf_test3
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt
index cae0806e0317..05701ac1791a 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_vswprintf_test4
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt
index 7c480455edae..888ce27d2233 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_vswprintf_test5
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt
index d7de5808535c..bfbb17ccefe4 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_vswprintf_test6
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt
index eb07ee2caefe..8b980586bc6b 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_vswprintf_test7
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt
index ed35ea8dd0d1..07ba473844ad 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_vswprintf_test8
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt
index 7098da31d0dc..11c77787e96c 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_vswprintf_test9
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.c b/src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.c
rename to src/pal/tests/palsuite/c_runtime/vswprintf/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h b/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h
index a79c9bb7a91e..37a379212ed3 100644
--- a/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/vswprintf/vswprintf.h
@@ -27,7 +27,7 @@ int testvswp(wchar_t* buf, const wchar_t* format, ...)
 	return( retVal);
 }
 
-void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
+void DoWStrTest(const WCHAR *formatstr, WCHAR *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -42,7 +42,7 @@ void DoWStrTest(WCHAR *formatstr, WCHAR *param, WCHAR *checkstr)
     }
 }
 
-void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
+void DoStrTest(const WCHAR *formatstr, char *param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -57,7 +57,7 @@ void DoStrTest(WCHAR *formatstr, char *param, WCHAR *checkstr)
     }
 }
 
-void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
+void DoCharTest(const WCHAR *formatstr, char param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -71,7 +71,7 @@ void DoCharTest(WCHAR *formatstr, char param, WCHAR *checkstr)
     }    
 }
 
-void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
+void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -85,7 +85,7 @@ void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
     }    
 }
 
-void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
+void DoNumTest(const WCHAR *formatstr, int value, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -98,7 +98,7 @@ void DoNumTest(WCHAR *formatstr, int value, WCHAR*checkstr)
     }    
 }
 
-void DoI64NumTest(WCHAR *formatstr, INT64 value, char *valuestr, WCHAR*checkstr)
+void DoI64NumTest(const WCHAR *formatstr, INT64 value, char *valuestr, const WCHAR *checkstr)
 {
     WCHAR buf[256] = { 0 };
 
@@ -110,7 +110,7 @@ void DoI64NumTest(WCHAR *formatstr, INT64 value, char *valuestr, WCHAR*checkstr)
             convertC(checkstr), convertC(buf));
     }    
 }
-void DoDoubleTest(WCHAR *formatstr, double value, WCHAR *checkstr1, WCHAR
+void DoDoubleTest(const WCHAR *formatstr, double value, const WCHAR *checkstr1, WCHAR
  *checkstr2)
 {
     WCHAR buf[256] = { 0 };
diff --git a/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt
index 34dfee01bdaf..815c585de4e0 100644
--- a/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcscat/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcscat_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcscat/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt
index 542d70b7e606..9cf0a918a029 100644
--- a/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcschr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcschr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcschr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt
index 009e48e1ba04..98c05352f36e 100644
--- a/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcscmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcscmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcscmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt
index 5f21b829ee1e..872b2dec5e44 100644
--- a/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcscpy/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcscpy_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcscpy/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt
index de0f1c22d354..b641a830f522 100644
--- a/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcslen/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcslen_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcslen/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt
index 12c286a43a6d..e90e2b7bc472 100644
--- a/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcsncat/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcsncat_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcsncat/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcsncat/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcsncat/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcsncat/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt
index 56c9b2580625..f5511a86c670 100644
--- a/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcsncmp_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcsncmp/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt
index 1c1d70ba0493..a7254a709ca2 100644
--- a/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcsncpy_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcsncpy/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt
index c6a3f87d754b..14c1fe83a4e8 100644
--- a/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcspbrk_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcspbrk/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt
index 80513af1af0f..abdd6d56d293 100644
--- a/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcsrchr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcsrchr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt
index e42619344dac..0e1e0b47b0ee 100644
--- a/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcsstr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcsstr_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcsstr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt
index cf585d051a3a..cca01ca964f5 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstod/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcstod_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcstod/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt
index 43d5bf8a40e0..ae7450891e94 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstod/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_wcstod_test2
diff --git a/src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.c b/src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/wcstod/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt
index 863f5d8c29ba..6b5bed9552ca 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstok/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcstok_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcstok/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt
index 25e96e7de09e..f76018fca34c 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstol/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcstol_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcstol/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstol/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcstol/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt
index ea33ec8c7ec3..8dc2ab6b65d1 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstol/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_wcstol_test2
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test2/test2.c b/src/pal/tests/palsuite/c_runtime/wcstol/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstol/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/wcstol/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt
index 509feca08ce7..310f97d6dc12 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstol/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_wcstol_test3
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test3/test3.c b/src/pal/tests/palsuite/c_runtime/wcstol/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstol/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/wcstol/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt
index 043c562102e6..23928aa704e5 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstol/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_wcstol_test4
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test4/test4.c b/src/pal/tests/palsuite/c_runtime/wcstol/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstol/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/wcstol/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt
index c8873698804f..16c709ffa025 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstol/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_wcstol_test5
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test5/test5.c b/src/pal/tests/palsuite/c_runtime/wcstol/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstol/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/wcstol/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt
index d328161f3971..80ccaf609b0e 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstol/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_wcstol_test6
diff --git a/src/pal/tests/palsuite/c_runtime/wcstol/test6/test6.c b/src/pal/tests/palsuite/c_runtime/wcstol/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstol/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/wcstol/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt
index b24523e93bab..58f002ab3214 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wcstoul_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wcstoul/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt
index e262078e346f..2c8d012310d7 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_wcstoul_test2
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.c b/src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/wcstoul/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt
index aae268ac5998..353df07f5258 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_wcstoul_test3
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.c b/src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.c
rename to src/pal/tests/palsuite/c_runtime/wcstoul/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt
index bd8073023fd1..e1e7d5542013 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_wcstoul_test4
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.c b/src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.c
rename to src/pal/tests/palsuite/c_runtime/wcstoul/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt
index 1451e6ad5708..9e83c6074c91 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_wcstoul_test5
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.c b/src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.c
rename to src/pal/tests/palsuite/c_runtime/wcstoul/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt
index 15518bdcf894..8352d0cbbefb 100644
--- a/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wcstoul/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_wcstoul_test6
diff --git a/src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.c b/src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.c
rename to src/pal/tests/palsuite/c_runtime/wcstoul/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt
index 701bbe416017..f95fc12ea110 100644
--- a/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wprintf/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_wprintf_test1
diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.c b/src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.c
rename to src/pal/tests/palsuite/c_runtime/wprintf/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt b/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt
index 55c3d1191323..325e8046d5fd 100644
--- a/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/c_runtime/wprintf/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_wprintf_test2
diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.c b/src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.c
rename to src/pal/tests/palsuite/c_runtime/wprintf/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h b/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h
index 7d3caf1b0259..3a96248c35d7 100644
--- a/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h
+++ b/src/pal/tests/palsuite/c_runtime/wprintf/wprintf.h
@@ -14,7 +14,7 @@
 #ifndef __wprintf_H__
 #define __wprintf_H__
 
-void DoStrTest(WCHAR *formatstr, WCHAR* param, WCHAR *checkstr)
+void DoStrTest(const WCHAR *formatstr, const WCHAR *param, const WCHAR *checkstr)
 {
     int ret;
 
@@ -27,8 +27,8 @@ void DoStrTest(WCHAR *formatstr, WCHAR* param, WCHAR *checkstr)
 }
 
 
-void DoPointerTest(WCHAR *formatstr, void* param, WCHAR* paramstr, 
-                   WCHAR *checkstr1)
+void DoPointerTest(const WCHAR *formatstr, void* param, WCHAR* paramstr, 
+                   const WCHAR *checkstr1)
 {
     int ret;
 
@@ -40,7 +40,7 @@ void DoPointerTest(WCHAR *formatstr, void* param, WCHAR* paramstr,
     }
 }
 
-void DoCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
+void DoCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
 {
     int ret;
     int n = -1;
@@ -59,7 +59,7 @@ void DoCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
     }    
 }
 
-void DoShortCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
+void DoShortCountTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
 {
     int ret;
     short int n = -1;
@@ -79,7 +79,7 @@ void DoShortCountTest(WCHAR *formatstr, int param, WCHAR *checkstr)
 }
 
 
-void DoCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
+void DoCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     int ret;
 
@@ -91,7 +91,7 @@ void DoCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
     }
 }
 
-void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
+void DoWCharTest(const WCHAR *formatstr, WCHAR param, const WCHAR *checkstr)
 {
     int ret;
 
@@ -103,7 +103,7 @@ void DoWCharTest(WCHAR *formatstr, WCHAR param, WCHAR *checkstr)
     }    
 }
 
-void DoNumTest(WCHAR *formatstr, int param, WCHAR *checkstr)
+void DoNumTest(const WCHAR *formatstr, int param, const WCHAR *checkstr)
 {
     int ret;
 
@@ -115,8 +115,8 @@ void DoNumTest(WCHAR *formatstr, int param, WCHAR *checkstr)
     }    
 }
 
-void DoI64Test(WCHAR *formatstr, INT64 param, WCHAR *valuestr, 
-               WCHAR *checkstr1)
+void DoI64Test(const WCHAR *formatstr, INT64 param, const WCHAR *valuestr, 
+               const WCHAR *checkstr1)
 {
     int ret;
 
@@ -128,8 +128,8 @@ void DoI64Test(WCHAR *formatstr, INT64 param, WCHAR *valuestr,
     }
 }
 
-void DoDoubleTest(WCHAR *formatstr, double param, 
-                  WCHAR *checkstr1, WCHAR *checkstr2)
+void DoDoubleTest(const WCHAR *formatstr, double param, 
+                  const WCHAR *checkstr1, const WCHAR *checkstr2)
 {
     int ret;
 
@@ -141,8 +141,8 @@ void DoDoubleTest(WCHAR *formatstr, double param,
     }
 }
 
-void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param, 
-                        WCHAR *paramstr, WCHAR *checkstr1, WCHAR *checkstr2)
+void DoArgumentPrecTest(const WCHAR *formatstr, int precision, void *param, 
+                        WCHAR *paramstr, const WCHAR *checkstr1, const WCHAR *checkstr2)
 {
     int ret;
 
@@ -154,8 +154,8 @@ void DoArgumentPrecTest(WCHAR *formatstr, int precision, void *param,
     }
 }
 
-void DoArgumentPrecDoubleTest(WCHAR *formatstr, int precision, double param, 
-    WCHAR *checkstr1, WCHAR *checkstr2)
+void DoArgumentPrecDoubleTest(const WCHAR *formatstr, int precision, double param, 
+    const WCHAR *checkstr1, const WCHAR *checkstr2)
 {
     int ret;
 
diff --git a/src/pal/tests/palsuite/common/palsuite.h b/src/pal/tests/palsuite/common/palsuite.h
index ef644ad8e522..459a7308060c 100644
--- a/src/pal/tests/palsuite/common/palsuite.h
+++ b/src/pal/tests/palsuite/common/palsuite.h
@@ -135,7 +135,7 @@ inline ULONG   VAL32(ULONG x)
 
 
 
-WCHAR* convert(char * aString) 
+WCHAR* convert(const char * aString) 
 {
     int size;
     WCHAR* wideBuffer;
@@ -150,7 +150,7 @@ WCHAR* convert(char * aString)
     return wideBuffer;
 }
 
-char* convertC(WCHAR * wString) 
+char* convertC(const WCHAR * wString) 
 {
     int size;
     char * MultiBuffer = NULL;
diff --git a/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt
index c6c00377e167..b336c03d3754 100644
--- a/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/event/nonshared/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  event.c
-  main.c
+  event.cpp
+  main.cpp
 )
 
 add_executable(paltest_event_nonshared
diff --git a/src/pal/tests/palsuite/composite/object_management/event/nonshared/event.c b/src/pal/tests/palsuite/composite/object_management/event/nonshared/event.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/event/nonshared/event.c
rename to src/pal/tests/palsuite/composite/object_management/event/nonshared/event.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/event/nonshared/main.c b/src/pal/tests/palsuite/composite/object_management/event/nonshared/main.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/event/nonshared/main.c
rename to src/pal/tests/palsuite/composite/object_management/event/nonshared/main.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt
index d326e3a42bff..86188796bdf1 100644
--- a/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/event/shared/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  event.c
-  main.c
+  event.cpp
+  main.cpp
 )
 
 add_executable(paltest_event_shared
diff --git a/src/pal/tests/palsuite/composite/object_management/event/shared/event.c b/src/pal/tests/palsuite/composite/object_management/event/shared/event.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/event/shared/event.c
rename to src/pal/tests/palsuite/composite/object_management/event/shared/event.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/event/shared/main.c b/src/pal/tests/palsuite/composite/object_management/event/shared/main.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/event/shared/main.c
rename to src/pal/tests/palsuite/composite/object_management/event/shared/main.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt
index 7859cd4653ad..03d5efac27cf 100644
--- a/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  main.c
-  mutex.c
+  main.cpp
+  mutex.cpp
 )
 
 add_executable(paltest_mutex_nonshared
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.c b/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.c
rename to src/pal/tests/palsuite/composite/object_management/mutex/nonshared/main.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.c b/src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.c
rename to src/pal/tests/palsuite/composite/object_management/mutex/nonshared/mutex.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt
index cf33d0b4640d..d4b50cd66e9b 100644
--- a/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/mutex/shared/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  main.c
-  mutex.c
+  main.cpp
+  mutex.cpp
 )
 
 add_executable(paltest_mutex_shared
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/shared/main.c b/src/pal/tests/palsuite/composite/object_management/mutex/shared/main.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/mutex/shared/main.c
rename to src/pal/tests/palsuite/composite/object_management/mutex/shared/main.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.c b/src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.c
rename to src/pal/tests/palsuite/composite/object_management/mutex/shared/mutex.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt
index 6efa228fbb42..9ed4535d3954 100644
--- a/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  main.c
-  semaphore.c
+  main.cpp
+  semaphore.cpp
 )
 
 add_executable(paltest_semaphore_nonshared
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.c b/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.c
rename to src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/main.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.c b/src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.c
rename to src/pal/tests/palsuite/composite/object_management/semaphore/nonshared/semaphore.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt
index 12d3ca867ea3..5c7f93290f2c 100644
--- a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  main.c
-  semaphore.c
+  main.cpp
+  semaphore.cpp
 )
 
 add_executable(paltest_semaphore_shared
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.c b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.c
rename to src/pal/tests/palsuite/composite/object_management/semaphore/shared/main.cpp
diff --git a/src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.c b/src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.c
rename to src/pal/tests/palsuite/composite/object_management/semaphore/shared/semaphore.cpp
diff --git a/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt
index 936c0fe82dd1..fc357ed25832 100644
--- a/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/synchronization/criticalsection/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  criticalsection.c
-  mainWrapper.c
+  criticalsection.cpp
+  mainWrapper.cpp
 )
 
 add_executable(paltest_synchronization_criticalsection
diff --git a/src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.c b/src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.c
rename to src/pal/tests/palsuite/composite/synchronization/criticalsection/criticalsection.cpp
diff --git a/src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.c b/src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.c
rename to src/pal/tests/palsuite/composite/synchronization/criticalsection/mainWrapper.cpp
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt
index d01b1064f6dd..9a02993916b5 100644
--- a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
   mtx_critsect.cpp
-  pal_composite_native_cs.c
+  pal_composite_native_cs.cpp
   resultbuffer.cpp
 )
 
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.c b/src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.c
rename to src/pal/tests/palsuite/composite/synchronization/nativecriticalsection/pal_composite_native_cs.cpp
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt
index c4567f638cc8..717bdd6b2090 100644
--- a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(SOURCES
   interlocked.cpp
   mtx_critsect.cpp
-  pal_composite_native_cs.c
+  pal_composite_native_cs.cpp
   resultbuffer.cpp
 )
 
diff --git a/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.c b/src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.c
rename to src/pal/tests/palsuite/composite/synchronization/nativecs_interlocked/pal_composite_native_cs.cpp
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt b/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt
index 134cce0809be..d396d2fc4994 100644
--- a/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/threading/threadsuspension/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  mainWrapper.c
-  threadsuspension.c
+  mainWrapper.cpp
+  threadsuspension.cpp
 )
 
 add_executable(paltest_threading_threadsuspension
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.c b/src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.c
rename to src/pal/tests/palsuite/composite/threading/threadsuspension/mainWrapper.cpp
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.c b/src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.c
rename to src/pal/tests/palsuite/composite/threading/threadsuspension/threadsuspension.cpp
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt b/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt
index 5361a1cf0d01..2c880921febd 100644
--- a/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  mainWrapper.c
-  threadsuspension.c
+  mainWrapper.cpp
+  threadsuspension.cpp
 )
 
 add_executable(paltest_threading_threadsuspension_switchthread
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.c b/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.c
rename to src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/mainWrapper.cpp
diff --git a/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.c b/src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.c
rename to src/pal/tests/palsuite/composite/threading/threadsuspension_switchthread/threadsuspension.cpp
diff --git a/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt b/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt
index 7dbddbc989c7..5e103102af17 100644
--- a/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt
+++ b/src/pal/tests/palsuite/composite/wfmo/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  main.c
-  mutex.c
+  main.cpp
+  mutex.cpp
 )
 
 add_executable(paltest_composite_wfmo
diff --git a/src/pal/tests/palsuite/composite/wfmo/main.c b/src/pal/tests/palsuite/composite/wfmo/main.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/wfmo/main.c
rename to src/pal/tests/palsuite/composite/wfmo/main.cpp
diff --git a/src/pal/tests/palsuite/composite/wfmo/mutex.c b/src/pal/tests/palsuite/composite/wfmo/mutex.cpp
similarity index 100%
rename from src/pal/tests/palsuite/composite/wfmo/mutex.c
rename to src/pal/tests/palsuite/composite/wfmo/mutex.cpp
diff --git a/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt
index db66cbe1d098..1b2ae538cc74 100644
--- a/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/debug_api/DebugBreak/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_debugbreak_test1
diff --git a/src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.c b/src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.c
rename to src/pal/tests/palsuite/debug_api/DebugBreak/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt
index 5bc7fdb6e9b7..3000734afec0 100644
--- a/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_outputdebugstringa_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_outputdebugstringa_test1
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_outputdebugstringa_test1_helper
diff --git a/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.c b/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.c
rename to src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/helper.cpp
diff --git a/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.c b/src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.c
rename to src/pal/tests/palsuite/debug_api/OutputDebugStringA/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt
index 9202baeaef13..4a93f0e39479 100644
--- a/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_outputdebugstringw_test1
diff --git a/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.c b/src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.c
rename to src/pal/tests/palsuite/debug_api/OutputDebugStringW/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt
index 39130aac1cff..afd581fb92d3 100644
--- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_writeprocessmemory_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_writeprocessmemory_test1
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_writeprocessmemory_test1_helper
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.c b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.cpp
similarity index 99%
rename from src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.c
rename to src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.cpp
index 1a7318969cb2..d965ca7a5116 100644
--- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.c
+++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/helper.cpp
@@ -172,7 +172,7 @@ int __cdecl main(int argc, char *argv[])
 
     /* Get the parent process to write to stuff on the heap */
     sizeTarget =  2 * sizeof(int) + 23 ;  /* 23 is just a random prime > 16 */
-    if (!(pTarget = malloc(sizeTarget))) 
+    if (!(pTarget = (char*)malloc(sizeTarget))) 
     {
         Trace("WriteProcessMemory helper: unable to allocate '%s'->%d bytes of memory"
               "(%u).\n",
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.c b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.cpp
similarity index 99%
rename from src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.c
rename to src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.cpp
index 8de029d973fd..060945f8feb2 100644
--- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.c
+++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test1/test1.cpp
@@ -130,7 +130,7 @@ int __cdecl main(int argc, char *argv[])
         }
 
         /* compose some data to write to the client process */
-        if (!(pSrcMemory = malloc(Count)))
+        if (!(pSrcMemory = (char*)malloc(Count)))
         {
             Trace("could not dynamically allocate memory to copy from "
                   "for reasons %u & %u\n",
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt
index ecc0e06daceb..3a5067c926c6 100644
--- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_writeprocessmemory_test3
@@ -20,7 +20,7 @@ target_link_libraries(paltest_writeprocessmemory_test3
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_writeprocessmemory_test3_helper
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.c b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.c
rename to src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/helper.cpp
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.c b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.cpp
similarity index 99%
rename from src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.c
rename to src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.cpp
index 063cb4cbece4..e0218f326779 100644
--- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.c
+++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test3/test3.cpp
@@ -137,7 +137,7 @@ int __cdecl main(int argc, char *argv[])
         }
 
         /* compose some data to write to the client process */
-        if (!(pSrcMemory = malloc(Count)))
+        if (!(pSrcMemory = (char*)malloc(Count)))
         {
             Trace("could not dynamically allocate memory to copy from "
                   "for reasons %u & %u\n",
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt
index cf1ce13862bf..7cba09038aab 100644
--- a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_writeprocessmemory_test4
@@ -20,7 +20,7 @@ target_link_libraries(paltest_writeprocessmemory_test4
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_writeprocessmemory_test4_helper
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.c b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.c
rename to src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/helper.cpp
diff --git a/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.c b/src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.c
rename to src/pal/tests/palsuite/debug_api/WriteProcessMemory/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt
index adbc8ae86aff..4e30869d85fc 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_EXCEPT_FILTER.c
+  PAL_EXCEPT_FILTER.cpp
 )
 
 add_executable(paltest_pal_except_filter_test1
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.c b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.c
rename to src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test1/PAL_EXCEPT_FILTER.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt
index 62cda706d564..3f979c08dbb7 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_except_filter.c
+  pal_except_filter.cpp
 )
 
 add_executable(paltest_pal_except_filter_test2
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.c b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.c
rename to src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test2/pal_except_filter.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt
index cc68fb031ca9..2bdf44e05852 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_except_filter.c
+  pal_except_filter.cpp
 )
 
 add_executable(paltest_pal_except_filter_test3
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.c b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.c
rename to src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER/test3/pal_except_filter.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt
index 21c3b5d33cb2..cf0a5e7c6d03 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_EXCEPT_FILTER_EX.c
+  PAL_EXCEPT_FILTER_EX.cpp
 )
 
 add_executable(paltest_pal_except_filter_ex_test1
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.c b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.c
rename to src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test1/PAL_EXCEPT_FILTER_EX.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt
index 350acff036cd..a3f82c26b98e 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_except_filter_ex.c
+  pal_except_filter_ex.cpp
 )
 
 add_executable(paltest_pal_except_filter_ex_test2
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.c b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.c
rename to src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test2/pal_except_filter_ex.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt
index 7f485c8ca467..532b29a9a142 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_except_filter.c
+  pal_except_filter.cpp
 )
 
 add_executable(paltest_pal_except_filter_ex_test3
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.c b/src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.c
rename to src/pal/tests/palsuite/exception_handling/PAL_EXCEPT_FILTER_EX/test3/pal_except_filter.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt
index 8a1a8323618e..b478de63e47d 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_TRY_EXCEPT.c
+  PAL_TRY_EXCEPT.cpp
 )
 
 add_executable(paltest_pal_try_except_test1
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.c b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.c
rename to src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test1/PAL_TRY_EXCEPT.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt
index cdf371926c56..0e344a93200f 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_TRY_EXCEPT.c
+  PAL_TRY_EXCEPT.cpp
 )
 
 add_executable(paltest_pal_try_except_test2
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.c b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.c
rename to src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT/test2/PAL_TRY_EXCEPT.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt
index c30877f65e1e..cced8a11be24 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_TRY_EXCEPT_EX.c
+  PAL_TRY_EXCEPT_EX.cpp
 )
 
 add_executable(paltest_pal_try_except_ex_test1
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.c b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.c
rename to src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test1/PAL_TRY_EXCEPT_EX.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt
index 0d4c4db240cb..c3549b5d8785 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_TRY_EXCEPT_EX.c
+  PAL_TRY_EXCEPT_EX.cpp
 )
 
 add_executable(paltest_pal_try_except_ex_test2
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.c b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.c
rename to src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test2/PAL_TRY_EXCEPT_EX.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt
index dc797f2f0933..34790da3d366 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_TRY_EXCEPT_EX.c
+  PAL_TRY_EXCEPT_EX.cpp
 )
 
 add_executable(paltest_pal_try_except_ex_test3
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.c b/src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.c
rename to src/pal/tests/palsuite/exception_handling/PAL_TRY_EXCEPT_EX/test3/PAL_TRY_EXCEPT_EX.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt
index a5fdd2692452..f004db16586f 100644
--- a/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_TRY_LEAVE_FINALLY.c
+  PAL_TRY_LEAVE_FINALLY.cpp
 )
 
 add_executable(paltest_pal_try_leave_finally_test1
diff --git a/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.c b/src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.c
rename to src/pal/tests/palsuite/exception_handling/PAL_TRY_LEAVE_FINALLY/test1/PAL_TRY_LEAVE_FINALLY.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt
index e526029bee58..068427303f71 100644
--- a/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_setunhandledexceptionfilter_test1
diff --git a/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/test1.c b/src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/test1.c
rename to src/pal/tests/palsuite/exception_handling/SetUnhandledExceptionFilter/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt
index 635e35d635df..b219238ef48c 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_except/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_pal_except_test1
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.c b/src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.c
rename to src/pal/tests/palsuite/exception_handling/pal_except/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt
index 813b0e66a1b4..27a725353bcf 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_except/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_pal_except_test2
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.c b/src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.c
rename to src/pal/tests/palsuite/exception_handling/pal_except/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt
index 5fc3b096afba..680341a7828a 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_except/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_pal_except_test3
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.c b/src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.c
rename to src/pal/tests/palsuite/exception_handling/pal_except/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt
index cc054d15dd4d..98eb7bfb231e 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_except/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_pal_except_test4
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.c b/src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.c
rename to src/pal/tests/palsuite/exception_handling/pal_except/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt
index 7b8f1d036159..9a39e32cce28 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_except/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_pal_except_test5
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.c b/src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.c
rename to src/pal/tests/palsuite/exception_handling/pal_except/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt
index 7f943bf126f8..d009128871a9 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_except/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_pal_except_test6
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.c b/src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.c
rename to src/pal/tests/palsuite/exception_handling/pal_except/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt
index 09399c8f6ba1..33fee62cc2e0 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_except/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_pal_except_test7
diff --git a/src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.c b/src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.c
rename to src/pal/tests/palsuite/exception_handling/pal_except/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt
index 5d947ad7db9b..67cc6c0b926f 100644
--- a/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/exception_handling/pal_finally/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_finally.c
+  pal_finally.cpp
 )
 
 add_executable(paltest_pal_finally_test1
diff --git a/src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.c b/src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.cpp
similarity index 100%
rename from src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.c
rename to src/pal/tests/palsuite/exception_handling/pal_finally/test1/pal_finally.cpp
diff --git a/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/AreFileApisANSI.c b/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/AreFileApisANSI.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/AreFileApisANSI.c
rename to src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/AreFileApisANSI.cpp
diff --git a/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt
index 4f50127cb96e..e624bef462b7 100644
--- a/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/AreFileApisANSI/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  AreFileApisANSI.c
+  AreFileApisANSI.cpp
 )
 
 add_executable(paltest_arefileapisansi_test1
diff --git a/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt
index fdcb6559b37a..fa96a44cdd7f 100644
--- a/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CompareFileTime.c
+  CompareFileTime.cpp
 )
 
 add_executable(paltest_comparefiletime_test1
diff --git a/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CompareFileTime.c b/src/pal/tests/palsuite/file_io/CompareFileTime/test1/CompareFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CompareFileTime/test1/CompareFileTime.c
rename to src/pal/tests/palsuite/file_io/CompareFileTime/test1/CompareFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt
index b52e5076fa6e..13abbc09798b 100644
--- a/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CopyFileA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CopyFileA.c
+  CopyFileA.cpp
 )
 
 add_executable(paltest_copyfilea_test1
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.c b/src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.c
rename to src/pal/tests/palsuite/file_io/CopyFileA/test1/CopyFileA.cpp
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt
index 7454f32f5183..cd0d8bc6cf70 100644
--- a/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CopyFileA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_copyfilea_test2
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.c b/src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.c
rename to src/pal/tests/palsuite/file_io/CopyFileA/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt
index 986be9fd22f9..0bb41b8d8f86 100644
--- a/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CopyFileA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_copyfilea_test3
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.c b/src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.c
rename to src/pal/tests/palsuite/file_io/CopyFileA/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt
index fb48c8374126..12f85d1747db 100644
--- a/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CopyFileA/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_copyfilea_test4
diff --git a/src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.c b/src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.c
rename to src/pal/tests/palsuite/file_io/CopyFileA/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt
index 766b1200357c..20c8141d9003 100644
--- a/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CopyFileW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CopyFileW.c
+  CopyFileW.cpp
 )
 
 add_executable(paltest_copyfilew_test1
diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.c b/src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.c
rename to src/pal/tests/palsuite/file_io/CopyFileW/test1/CopyFileW.cpp
diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt
index 5c0030bc8de8..4201bdca8898 100644
--- a/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CopyFileW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_copyfilew_test2
diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.c b/src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.c
rename to src/pal/tests/palsuite/file_io/CopyFileW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt
index 52d9aad1c029..d0fd94c99034 100644
--- a/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CopyFileW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_copyfilew_test3
diff --git a/src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.c b/src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.c
rename to src/pal/tests/palsuite/file_io/CopyFileW/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt
index f8cdf1993302..1dc87fa34b24 100644
--- a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateDirectoryA.c
+  CreateDirectoryA.cpp
 )
 
 add_executable(paltest_createdirectorya_test1
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.c b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.c
rename to src/pal/tests/palsuite/file_io/CreateDirectoryA/test1/CreateDirectoryA.cpp
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt
index a50a986d1acb..3ee8abbcc2c3 100644
--- a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createdirectorya.c
+  createdirectorya.cpp
 )
 
 add_executable(paltest_createdirectorya_test2
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/createdirectorya.c b/src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/createdirectorya.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/createdirectorya.c
rename to src/pal/tests/palsuite/file_io/CreateDirectoryA/test2/createdirectorya.cpp
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt
index 1981e3708263..f8cb584cc694 100644
--- a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateDirectoryW.c
+  CreateDirectoryW.cpp
 )
 
 add_executable(paltest_createdirectoryw_test1
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.c b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.c
rename to src/pal/tests/palsuite/file_io/CreateDirectoryW/test1/CreateDirectoryW.cpp
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt
index aae4e7dc54c0..f8614ca5a6e3 100644
--- a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createdirectoryw.c
+  createdirectoryw.cpp
 )
 
 add_executable(paltest_createdirectoryw_test2
diff --git a/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/createdirectoryw.c b/src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/createdirectoryw.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/createdirectoryw.c
rename to src/pal/tests/palsuite/file_io/CreateDirectoryW/test2/createdirectoryw.cpp
diff --git a/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt
index 8814b2281b28..edacdbd6214f 100644
--- a/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CreateFileA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileA.c
+  CreateFileA.cpp
 )
 
 add_executable(paltest_createfilea_test1
diff --git a/src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.c b/src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.c
rename to src/pal/tests/palsuite/file_io/CreateFileA/test1/CreateFileA.cpp
diff --git a/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt
index 1ff0b8062f1c..820e169a3742 100644
--- a/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/CreateFileW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileW.c
+  CreateFileW.cpp
 )
 
 add_executable(paltest_createfilew_test1
diff --git a/src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.c b/src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.c
rename to src/pal/tests/palsuite/file_io/CreateFileW/test1/CreateFileW.cpp
diff --git a/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt
index 046fd35148ed..eada6145b993 100644
--- a/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/DeleteFileW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  DeleteFileW.c
+  DeleteFileW.cpp
 )
 
 add_executable(paltest_deletefilew_test1
diff --git a/src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.c b/src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.c
rename to src/pal/tests/palsuite/file_io/DeleteFileW/test1/DeleteFileW.cpp
diff --git a/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt
index 0c02c98f15a2..704598362986 100644
--- a/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FILECanonicalizePath/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  FILECanonicalizePath.c
+  FILECanonicalizePath.cpp
 )
 
 add_executable(paltest_filecanonicalizepath_test1
diff --git a/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.c b/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.cpp
similarity index 97%
rename from src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.c
rename to src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.cpp
index 91bac1f3cb98..3a1758aa3b82 100644
--- a/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.c
+++ b/src/pal/tests/palsuite/file_io/FILECanonicalizePath/FILECanonicalizePath.cpp
@@ -13,7 +13,7 @@
 
 #include <palsuite.h>
 
-extern void FILECanonicalizePath(LPSTR lpUnixPath);
+extern "C" void FILECanonicalizePath(LPSTR lpUnixPath);
 
 void TestCase(LPSTR input, LPSTR expectedOutput);
 
diff --git a/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt
index 131054266b7b..6ec6a98b3f6e 100644
--- a/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_filetimetodosdatetime_test1
diff --git a/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/test1.c b/src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/test1.c
rename to src/pal/tests/palsuite/file_io/FileTimeToDosDateTime/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt
index 732c9f58d3df..d97c69e6ee19 100644
--- a/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FindClose/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  FindClose.c
+  FindClose.cpp
 )
 
 add_executable(paltest_findclose_test1
diff --git a/src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.c b/src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.c
rename to src/pal/tests/palsuite/file_io/FindClose/test1/FindClose.cpp
diff --git a/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt
index 6613c4d4444d..aeac94d42ff9 100644
--- a/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  FindFirstFileA.c
+  FindFirstFileA.cpp
 )
 
 add_executable(paltest_findfirstfilea_test1
diff --git a/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.c b/src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.c
rename to src/pal/tests/palsuite/file_io/FindFirstFileA/test1/FindFirstFileA.cpp
diff --git a/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt
index 23e95c7dade6..2a6ea2b7a406 100644
--- a/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  FindFirstFileW.c
+  FindFirstFileW.cpp
 )
 
 add_executable(paltest_findfirstfilew_test1
diff --git a/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.c b/src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.c
rename to src/pal/tests/palsuite/file_io/FindFirstFileW/test1/FindFirstFileW.cpp
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt
index efb1655d95b5..6e97b7aaadd8 100644
--- a/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FindNextFileA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  FindNextFileA.c
+  FindNextFileA.cpp
 )
 
 add_executable(paltest_findnextfilea_test1
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.c b/src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.c
rename to src/pal/tests/palsuite/file_io/FindNextFileA/test1/FindNextFileA.cpp
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt
index 96821bdaaa24..e037bd3aa0d0 100644
--- a/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FindNextFileA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  findnextfilea.c
+  findnextfilea.cpp
 )
 
 add_executable(paltest_findnextfilea_test2
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.c b/src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.c
rename to src/pal/tests/palsuite/file_io/FindNextFileA/test2/findnextfilea.cpp
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt
index 4a283dd3a566..a7c3e7ea0272 100644
--- a/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FindNextFileW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  FindNextFileW.c
+  FindNextFileW.cpp
 )
 
 add_executable(paltest_findnextfilew_test1
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.c b/src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.c
rename to src/pal/tests/palsuite/file_io/FindNextFileW/test1/FindNextFileW.cpp
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt
index 2938afb88815..7b4c3c959756 100644
--- a/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FindNextFileW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  findnextfilew.c
+  findnextfilew.cpp
 )
 
 add_executable(paltest_findnextfilew_test2
diff --git a/src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.c b/src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.c
rename to src/pal/tests/palsuite/file_io/FindNextFileW/test2/findnextfilew.cpp
diff --git a/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt
index e3fbccd2aefc..6c24ac76d142 100644
--- a/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  FlushFileBuffers.c
+  FlushFileBuffers.cpp
 )
 
 add_executable(paltest_flushfilebuffers_test1
diff --git a/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.c b/src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.c
rename to src/pal/tests/palsuite/file_io/FlushFileBuffers/test1/FlushFileBuffers.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt
index 131f4a5fb75e..64ab6ea945db 100644
--- a/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetConsoleCP.c
+  GetConsoleCP.cpp
 )
 
 add_executable(paltest_getconsolecp_test1
diff --git a/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/GetConsoleCP.c b/src/pal/tests/palsuite/file_io/GetConsoleCP/test1/GetConsoleCP.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetConsoleCP/test1/GetConsoleCP.c
rename to src/pal/tests/palsuite/file_io/GetConsoleCP/test1/GetConsoleCP.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt
index d19ab95a371d..756f87b38247 100644
--- a/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetConsoleOutputCP.c
+  GetConsoleOutputCP.cpp
 )
 
 add_executable(paltest_getconsoleoutputcp_test1
diff --git a/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.c b/src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.c
rename to src/pal/tests/palsuite/file_io/GetConsoleOutputCP/test1/GetConsoleOutputCP.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt
index f7382b047dba..28efc6897f35 100644
--- a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetCurrentDirectoryA.c
+  GetCurrentDirectoryA.cpp
 )
 
 add_executable(paltest_getcurrentdirectorya_test1
diff --git a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.c b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.c
rename to src/pal/tests/palsuite/file_io/GetCurrentDirectoryA/test1/GetCurrentDirectoryA.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt
index ed8419926c55..ee07f5e0d187 100644
--- a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetCurrentDirectoryW.c
+  GetCurrentDirectoryW.cpp
 )
 
 add_executable(paltest_getcurrentdirectoryw_test1
diff --git a/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.c b/src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.c
rename to src/pal/tests/palsuite/file_io/GetCurrentDirectoryW/test1/GetCurrentDirectoryW.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt
index 6b0637623315..7de0b275f61d 100644
--- a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetDiskFreeSpaceW.c
+  GetDiskFreeSpaceW.cpp
 )
 
 add_executable(paltest_getdiskfreespacew_test1
diff --git a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/GetDiskFreeSpaceW.c b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/GetDiskFreeSpaceW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/GetDiskFreeSpaceW.c
rename to src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test1/GetDiskFreeSpaceW.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt
index 5660b39e1ae6..7bcbf55c428b 100644
--- a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getdiskfreespacew.c
+  getdiskfreespacew.cpp
 )
 
 add_executable(paltest_getdiskfreespacew_test2
diff --git a/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/getdiskfreespacew.c b/src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/getdiskfreespacew.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/getdiskfreespacew.c
rename to src/pal/tests/palsuite/file_io/GetDiskFreeSpaceW/test2/getdiskfreespacew.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt
index 6bf9818e86f5..414df7f6b5c2 100644
--- a/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileAttributesA.c
+  GetFileAttributesA.cpp
 )
 
 add_executable(paltest_getfileattributesa_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.c b/src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.c
rename to src/pal/tests/palsuite/file_io/GetFileAttributesA/test1/GetFileAttributesA.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt
index 2d299d82e5e7..6ea24d9d3212 100644
--- a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getfileattributesexw_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.c b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.c
rename to src/pal/tests/palsuite/file_io/GetFileAttributesExW/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt
index 70caac2c69e0..0faa3bd11eb0 100644
--- a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getfileattributesexw_test2
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.c b/src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.c
rename to src/pal/tests/palsuite/file_io/GetFileAttributesExW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt
index 705048460753..bc82f3678e3c 100644
--- a/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileAttributesW.c
+  GetFileAttributesW.cpp
 )
 
 add_executable(paltest_getfileattributesw_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.c b/src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.c
rename to src/pal/tests/palsuite/file_io/GetFileAttributesW/test1/GetFileAttributesW.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt
index ff20de590551..f192ba740027 100644
--- a/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileSize/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileSize.c
+  GetFileSize.cpp
 )
 
 add_executable(paltest_getfilesize_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.c b/src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.c
rename to src/pal/tests/palsuite/file_io/GetFileSize/test1/GetFileSize.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt
index 1369a5dc5a20..33a7e2f557b1 100644
--- a/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileSizeEx.c
+  GetFileSizeEx.cpp
 )
 
 add_executable(paltest_getfilesizeex_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.c b/src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.c
rename to src/pal/tests/palsuite/file_io/GetFileSizeEx/test1/GetFileSizeEx.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt
index 6a89846d21ff..b95267ab5b26 100644
--- a/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileTime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileTime.c
+  GetFileTime.cpp
 )
 
 add_executable(paltest_getfiletime_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test1/GetFileTime.c b/src/pal/tests/palsuite/file_io/GetFileTime/test1/GetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileTime/test1/GetFileTime.c
rename to src/pal/tests/palsuite/file_io/GetFileTime/test1/GetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt
index 3d315e44ded4..fe02e27bbec5 100644
--- a/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileTime/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileTime.c
+  GetFileTime.cpp
 )
 
 add_executable(paltest_getfiletime_test2
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test2/GetFileTime.c b/src/pal/tests/palsuite/file_io/GetFileTime/test2/GetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileTime/test2/GetFileTime.c
rename to src/pal/tests/palsuite/file_io/GetFileTime/test2/GetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt
index 34f731046430..bb88966e68fc 100644
--- a/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileTime/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileTime.c
+  GetFileTime.cpp
 )
 
 add_executable(paltest_getfiletime_test3
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test3/GetFileTime.c b/src/pal/tests/palsuite/file_io/GetFileTime/test3/GetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileTime/test3/GetFileTime.c
rename to src/pal/tests/palsuite/file_io/GetFileTime/test3/GetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt
index 0c9dcf7802a5..e43e7f99a8ba 100644
--- a/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileTime/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileTime.c
+  GetFileTime.cpp
 )
 
 add_executable(paltest_getfiletime_test4
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test4/GetFileTime.c b/src/pal/tests/palsuite/file_io/GetFileTime/test4/GetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileTime/test4/GetFileTime.c
rename to src/pal/tests/palsuite/file_io/GetFileTime/test4/GetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt
index a82717e65701..4af995d207bc 100644
--- a/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileTime/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getfiletime.c
+  getfiletime.cpp
 )
 
 add_executable(paltest_getfiletime_test5
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test5/getfiletime.c b/src/pal/tests/palsuite/file_io/GetFileTime/test5/getfiletime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileTime/test5/getfiletime.c
rename to src/pal/tests/palsuite/file_io/GetFileTime/test5/getfiletime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt
index 24992dfa6699..87c448b2a6be 100644
--- a/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileTime/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getfiletime.c
+  getfiletime.cpp
 )
 
 add_executable(paltest_getfiletime_test6
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test6/getfiletime.c b/src/pal/tests/palsuite/file_io/GetFileTime/test6/getfiletime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileTime/test6/getfiletime.c
rename to src/pal/tests/palsuite/file_io/GetFileTime/test6/getfiletime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt
index 6646fd9272cb..cd5cde4d9eaf 100644
--- a/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileTime/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getfiletime.c
+  getfiletime.cpp
 )
 
 add_executable(paltest_getfiletime_test7
diff --git a/src/pal/tests/palsuite/file_io/GetFileTime/test7/getfiletime.c b/src/pal/tests/palsuite/file_io/GetFileTime/test7/getfiletime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileTime/test7/getfiletime.c
rename to src/pal/tests/palsuite/file_io/GetFileTime/test7/getfiletime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt
index 66467e99c57f..cfaba2e73865 100644
--- a/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileType/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFileType.c
+  GetFileType.cpp
 )
 
 add_executable(paltest_getfiletype_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test1/GetFileType.c b/src/pal/tests/palsuite/file_io/GetFileType/test1/GetFileType.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileType/test1/GetFileType.c
rename to src/pal/tests/palsuite/file_io/GetFileType/test1/GetFileType.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt
index 382b27e78824..07dae0b04a78 100644
--- a/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileType/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getfiletype.c
+  getfiletype.cpp
 )
 
 add_executable(paltest_getfiletype_test2
diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test2/getfiletype.c b/src/pal/tests/palsuite/file_io/GetFileType/test2/getfiletype.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileType/test2/getfiletype.c
rename to src/pal/tests/palsuite/file_io/GetFileType/test2/getfiletype.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt
index 52b6077570b8..9353c85771fa 100644
--- a/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFileType/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getfiletype.c
+  getfiletype.cpp
 )
 
 add_executable(paltest_getfiletype_test3
diff --git a/src/pal/tests/palsuite/file_io/GetFileType/test3/getfiletype.c b/src/pal/tests/palsuite/file_io/GetFileType/test3/getfiletype.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFileType/test3/getfiletype.c
rename to src/pal/tests/palsuite/file_io/GetFileType/test3/getfiletype.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt
index 8c10e479fa6c..61983920001d 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFullPathNameA.c
+  GetFullPathNameA.cpp
 )
 
 add_executable(paltest_getfullpathnamea_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.c b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameA/test1/GetFullPathNameA.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt
index 382b8fa4bd80..3449f2d80b7c 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getfullpathnamea_test2
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.c b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameA/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt
index f0f8929b4a58..9d8d242e2622 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_getfullpathnamea_test3
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.c b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameA/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt
index cf0d7ff18cd2..abf2bacd1ce1 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_getfullpathnamea_test4
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.c b/src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameA/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt
index a6f354f5a54b..d455ca1193fc 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetFullPathNameW.c
+  GetFullPathNameW.cpp
 )
 
 add_executable(paltest_getfullpathnamew_test1
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.c b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameW/test1/GetFullPathNameW.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt
index 199aa1efce60..d974e940a73f 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getfullpathnamew_test2
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.c b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt
index 6284958b075d..09439a6372f8 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_getfullpathnamew_test3
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.c b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameW/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt
index d479b998cc9d..11ed9583b6bd 100644
--- a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_getfullpathnamew_test4
diff --git a/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.c b/src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.c
rename to src/pal/tests/palsuite/file_io/GetFullPathNameW/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt
index cf5dcd0bfca1..3b9f0b118a2d 100644
--- a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetLongPathNameW.c
+  GetLongPathNameW.cpp
 )
 
 add_executable(paltest_getlongpathnamew_test1
diff --git a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/GetLongPathNameW.c b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/GetLongPathNameW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/GetLongPathNameW.c
rename to src/pal/tests/palsuite/file_io/GetLongPathNameW/test1/GetLongPathNameW.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt
index 5746ef3e0413..b92e431095ab 100644
--- a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  getlongpathnamew.c
+  getlongpathnamew.cpp
 )
 
 add_executable(paltest_getlongpathnamew_test2
diff --git a/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/getlongpathnamew.c b/src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/getlongpathnamew.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/getlongpathnamew.c
rename to src/pal/tests/palsuite/file_io/GetLongPathNameW/test2/getlongpathnamew.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt
index 04bcc5fd67f5..eaa1721b7ed4 100644
--- a/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetStdHandle/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetStdHandle.c
+  GetStdHandle.cpp
 )
 
 add_executable(paltest_getstdhandle_test1
diff --git a/src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.c b/src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.c
rename to src/pal/tests/palsuite/file_io/GetStdHandle/test1/GetStdHandle.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt
index 97816b4319c9..ef45aa0dec68 100644
--- a/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetStdHandle/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetStdHandle.c
+  GetStdHandle.cpp
 )
 
 add_executable(paltest_getstdhandle_test2
diff --git a/src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.c b/src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.c
rename to src/pal/tests/palsuite/file_io/GetStdHandle/test2/GetStdHandle.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt
index 94d5bcded950..4367e880f706 100644
--- a/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetSystemTime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getsystemtime_test1
diff --git a/src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.c b/src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.c
rename to src/pal/tests/palsuite/file_io/GetSystemTime/test1/test.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt
index 977a826e7a97..d14938373209 100644
--- a/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetSystemTimeAsFileTime.c
+  GetSystemTimeAsFileTime.cpp
 )
 
 add_executable(paltest_getsystemtimeasfiletime_test1
diff --git a/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.c b/src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.c
rename to src/pal/tests/palsuite/file_io/GetSystemTimeAsFileTime/test1/GetSystemTimeAsFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt
index 1b759af2eb05..4ed0ccb5374a 100644
--- a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetTempFileNameA.c
+  GetTempFileNameA.cpp
 )
 
 add_executable(paltest_gettempfilenamea_test1
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.c b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.c
rename to src/pal/tests/palsuite/file_io/GetTempFileNameA/test1/GetTempFileNameA.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt
index f4bd9b879758..9d9b6461cd10 100644
--- a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetTempFileNameA.c
+  GetTempFileNameA.cpp
 )
 
 add_executable(paltest_gettempfilenamea_test2
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.c b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.c
rename to src/pal/tests/palsuite/file_io/GetTempFileNameA/test2/GetTempFileNameA.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt
index 9c028655754e..446f3cf83769 100644
--- a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  gettempfilenamea.c
+  gettempfilenamea.cpp
 )
 
 add_executable(paltest_gettempfilenamea_test3
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.c b/src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.c
rename to src/pal/tests/palsuite/file_io/GetTempFileNameA/test3/gettempfilenamea.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt
index 1b6c599da4a7..6919cf66cd37 100644
--- a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetTempFileNameW.c
+  GetTempFileNameW.cpp
 )
 
 add_executable(paltest_gettempfilenamew_test1
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.c b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.c
rename to src/pal/tests/palsuite/file_io/GetTempFileNameW/test1/GetTempFileNameW.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt
index 851030d9aeee..d07746339090 100644
--- a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetTempFileNameW.c
+  GetTempFileNameW.cpp
 )
 
 add_executable(paltest_gettempfilenamew_test2
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.c b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.c
rename to src/pal/tests/palsuite/file_io/GetTempFileNameW/test2/GetTempFileNameW.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt
index 82dd0a9f3f6f..3aa0f4a04446 100644
--- a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  gettempfilenamew.c
+  gettempfilenamew.cpp
 )
 
 add_executable(paltest_gettempfilenamew_test3
diff --git a/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.c b/src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.c
rename to src/pal/tests/palsuite/file_io/GetTempFileNameW/test3/gettempfilenamew.cpp
diff --git a/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt
index f2979e953625..04b240997aa6 100644
--- a/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/GetTempPathW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetTempPathW.c
+  GetTempPathW.cpp
 )
 
 add_executable(paltest_gettemppathw_test1
diff --git a/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.c b/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.cpp
similarity index 93%
rename from src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.c
rename to src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.cpp
index 08c88075caa2..bf997def7674 100644
--- a/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.c
+++ b/src/pal/tests/palsuite/file_io/GetTempPathW/test1/GetTempPathW.cpp
@@ -13,7 +13,7 @@
 
 #include <palsuite.h>
 
-static void SetTmpDir(WCHAR path[])
+static void SetTmpDir(const WCHAR path[])
 {
     DWORD result = SetEnvironmentVariableW(W("TMPDIR"), path);
     if (!result)
@@ -23,7 +23,7 @@ static void SetTmpDir(WCHAR path[])
     }
 }
 
-static void SetAndCompare(WCHAR tmpDirPath[], WCHAR expected[])
+static void SetAndCompare(const WCHAR tmpDirPath[], const WCHAR expected[])
 {
     DWORD dwBufferLength = _MAX_DIR;
     WCHAR path[dwBufferLength];
@@ -49,7 +49,7 @@ static void SetAndCompare(WCHAR tmpDirPath[], WCHAR expected[])
     }
 }
 
-static void SetAndCheckLength(WCHAR tmpDirPath [], int bufferLength, int expectedResultLength)
+static void SetAndCheckLength(const WCHAR tmpDirPath [], int bufferLength, int expectedResultLength)
 {
     WCHAR path[bufferLength];
 
diff --git a/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt
index 9a3d0069db67..b096a0465322 100644
--- a/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/MoveFileA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  MoveFileA.c
+  MoveFileA.cpp
 )
 
 add_executable(paltest_movefilea_test1
diff --git a/src/pal/tests/palsuite/file_io/MoveFileA/test1/MoveFileA.c b/src/pal/tests/palsuite/file_io/MoveFileA/test1/MoveFileA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/MoveFileA/test1/MoveFileA.c
rename to src/pal/tests/palsuite/file_io/MoveFileA/test1/MoveFileA.cpp
diff --git a/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt
index f41dd7fd08fd..ef2471738c4d 100644
--- a/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/MoveFileExA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  MoveFileExA.c
+  MoveFileExA.cpp
 )
 
 add_executable(paltest_movefileexa_test1
diff --git a/src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.c b/src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.c
rename to src/pal/tests/palsuite/file_io/MoveFileExA/test1/MoveFileExA.cpp
diff --git a/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt
index 4c6a70f050e1..ca6b35e3ace3 100644
--- a/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/MoveFileExW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  MoveFileExW.c
+  MoveFileExW.cpp
 )
 
 add_executable(paltest_movefileexw_test1
diff --git a/src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.c b/src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.c
rename to src/pal/tests/palsuite/file_io/MoveFileExW/test1/MoveFileExW.cpp
diff --git a/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt
index 497f654122ea..4519746e7b6c 100644
--- a/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/MoveFileW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  MoveFileW.c
+  MoveFileW.cpp
 )
 
 add_executable(paltest_movefilew_test1
diff --git a/src/pal/tests/palsuite/file_io/MoveFileW/test1/MoveFileW.c b/src/pal/tests/palsuite/file_io/MoveFileW/test1/MoveFileW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/MoveFileW/test1/MoveFileW.c
rename to src/pal/tests/palsuite/file_io/MoveFileW/test1/MoveFileW.cpp
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt
index 7b166e17b071..0aceb3708e3f 100644
--- a/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/ReadFile/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ReadFile.c
+  ReadFile.cpp
 )
 
 add_executable(paltest_readfile_test1
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.c b/src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.c
rename to src/pal/tests/palsuite/file_io/ReadFile/test1/ReadFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt
index fc4870e73d88..f28ac117a23d 100644
--- a/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/ReadFile/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ReadFile.c
+  ReadFile.cpp
 )
 
 add_executable(paltest_readfile_test2
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.c b/src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.c
rename to src/pal/tests/palsuite/file_io/ReadFile/test2/ReadFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt
index 77397743d496..26cb675c4039 100644
--- a/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/ReadFile/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ReadFile.c
+  ReadFile.cpp
 )
 
 add_executable(paltest_readfile_test3
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.c b/src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.c
rename to src/pal/tests/palsuite/file_io/ReadFile/test3/ReadFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt
index 37f227aced84..bbf12777b6bd 100644
--- a/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/ReadFile/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  readfile.c
+  readfile.cpp
 )
 
 add_executable(paltest_readfile_test4
diff --git a/src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.c b/src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.c
rename to src/pal/tests/palsuite/file_io/ReadFile/test4/readfile.cpp
diff --git a/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt
index 45b51cec3085..6223bc61971c 100644
--- a/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  RemoveDirectoryW.c
+  RemoveDirectoryW.cpp
 )
 
 add_executable(paltest_removedirectoryw_test1
diff --git a/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/RemoveDirectoryW.c b/src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/RemoveDirectoryW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/RemoveDirectoryW.c
rename to src/pal/tests/palsuite/file_io/RemoveDirectoryW/test1/RemoveDirectoryW.cpp
diff --git a/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt
index d1ac975d18e3..c020a86b616e 100644
--- a/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SearchPathA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SearchPathA.c
+  SearchPathA.cpp
 )
 
 add_executable(paltest_searchpatha_test1
diff --git a/src/pal/tests/palsuite/file_io/SearchPathA/test1/SearchPathA.c b/src/pal/tests/palsuite/file_io/SearchPathA/test1/SearchPathA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SearchPathA/test1/SearchPathA.c
rename to src/pal/tests/palsuite/file_io/SearchPathA/test1/SearchPathA.cpp
diff --git a/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt
index d0c62524728d..a77d87550541 100644
--- a/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SearchPathW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SearchPathW.c
+  SearchPathW.cpp
 )
 
 add_executable(paltest_searchpathw_test1
diff --git a/src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.c b/src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.c
rename to src/pal/tests/palsuite/file_io/SearchPathW/test1/SearchPathW.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt
index 7376b222262c..5d0da64ba794 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetCurrentDirectoryA.c
+  SetCurrentDirectoryA.cpp
 )
 
 add_executable(paltest_setcurrentdirectorya_test1
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.c
rename to src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test1/SetCurrentDirectoryA.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt
index 7c9caf808197..243e80b9a4df 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  setcurrentdirectorya.c
+  setcurrentdirectorya.cpp
 )
 
 add_executable(paltest_setcurrentdirectorya_test2
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/setcurrentdirectorya.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/setcurrentdirectorya.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/setcurrentdirectorya.c
rename to src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test2/setcurrentdirectorya.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt
index 57d3577d8fb7..8560ff018726 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  setcurrentdirectorya.c
+  setcurrentdirectorya.cpp
 )
 
 add_executable(paltest_setcurrentdirectorya_test3
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/setcurrentdirectorya.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/setcurrentdirectorya.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/setcurrentdirectorya.c
rename to src/pal/tests/palsuite/file_io/SetCurrentDirectoryA/test3/setcurrentdirectorya.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt
index a0c1dff62a31..914922100811 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetCurrentDirectoryW.c
+  SetCurrentDirectoryW.cpp
 )
 
 add_executable(paltest_setcurrentdirectoryw_test1
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.c
rename to src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test1/SetCurrentDirectoryW.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt
index a032462d19f9..455ddc828d39 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  setcurrentdirectoryw.c
+  setcurrentdirectoryw.cpp
 )
 
 add_executable(paltest_setcurrentdirectoryw_test2
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.c
rename to src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test2/setcurrentdirectoryw.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt
index 3b981f9564c9..1cb1150a613a 100644
--- a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  setcurrentdirectoryw.c
+  setcurrentdirectoryw.cpp
 )
 
 add_executable(paltest_setcurrentdirectoryw_test3
diff --git a/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.c b/src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.c
rename to src/pal/tests/palsuite/file_io/SetCurrentDirectoryW/test3/setcurrentdirectoryw.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt
index e77ab30b86c2..3c0fdeec22cb 100644
--- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetEndOfFile.c
+  SetEndOfFile.cpp
 )
 
 add_executable(paltest_setendoffile_test1
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.c b/src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.c
rename to src/pal/tests/palsuite/file_io/SetEndOfFile/test1/SetEndOfFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt
index b04dea04a6c2..57afdad2fd7d 100644
--- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetEndOfFile.c
+  SetEndOfFile.cpp
 )
 
 add_executable(paltest_setendoffile_test2
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.c b/src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.c
rename to src/pal/tests/palsuite/file_io/SetEndOfFile/test2/SetEndOfFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt
index 1ab177d00a98..01575ce09b7b 100644
--- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetEndOfFile.c
+  SetEndOfFile.cpp
 )
 
 add_executable(paltest_setendoffile_test3
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.c b/src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.c
rename to src/pal/tests/palsuite/file_io/SetEndOfFile/test3/SetEndOfFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt
index ff0b6f999c25..1dc4f68aef93 100644
--- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  setendoffile.c
+  setendoffile.cpp
 )
 
 add_executable(paltest_setendoffile_test4
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.c b/src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.c
rename to src/pal/tests/palsuite/file_io/SetEndOfFile/test4/setendoffile.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt
index cca7167762e4..19f87a28af10 100644
--- a/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_setendoffile_test5
diff --git a/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.c b/src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.c
rename to src/pal/tests/palsuite/file_io/SetEndOfFile/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt
index 81e2dfdea26b..638dd5c4253c 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesA.c
+  SetFileAttributesA.cpp
 )
 
 add_executable(paltest_setfileattributesa_test1
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/SetFileAttributesA.c b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/SetFileAttributesA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/SetFileAttributesA.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesA/test1/SetFileAttributesA.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt
index 03445c1df059..51bee5af3920 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesA.c
+  SetFileAttributesA.cpp
 )
 
 add_executable(paltest_setfileattributesa_test2
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/SetFileAttributesA.c b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/SetFileAttributesA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/SetFileAttributesA.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesA/test2/SetFileAttributesA.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt
index 3c35172d7ce4..4597e1d22c4f 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesA.c
+  SetFileAttributesA.cpp
 )
 
 add_executable(paltest_setfileattributesa_test3
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/SetFileAttributesA.c b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/SetFileAttributesA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/SetFileAttributesA.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesA/test3/SetFileAttributesA.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt
index f30969ad0440..180702712345 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesA.c
+  SetFileAttributesA.cpp
 )
 
 add_executable(paltest_setfileattributesa_test4
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/SetFileAttributesA.c b/src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/SetFileAttributesA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/SetFileAttributesA.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesA/test4/SetFileAttributesA.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt
index 35927b4b1d41..825554da7481 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesW.c
+  SetFileAttributesW.cpp
 )
 
 add_executable(paltest_setfileattributesw_test1
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/SetFileAttributesW.c b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/SetFileAttributesW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/SetFileAttributesW.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesW/test1/SetFileAttributesW.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt
index 81fa02c1ddee..fda1cec1d786 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesW.c
+  SetFileAttributesW.cpp
 )
 
 add_executable(paltest_setfileattributesw_test2
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/SetFileAttributesW.c b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/SetFileAttributesW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/SetFileAttributesW.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesW/test2/SetFileAttributesW.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt
index c2cdacb0d0fe..1757f88bfec6 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesW.c
+  SetFileAttributesW.cpp
 )
 
 add_executable(paltest_setfileattributesw_test3
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/SetFileAttributesW.c b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/SetFileAttributesW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/SetFileAttributesW.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesW/test3/SetFileAttributesW.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt
index 6a4aa8adc3c3..d1cfcdd07d95 100644
--- a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileAttributesW.c
+  SetFileAttributesW.cpp
 )
 
 add_executable(paltest_setfileattributesw_test4
diff --git a/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/SetFileAttributesW.c b/src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/SetFileAttributesW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/SetFileAttributesW.c
rename to src/pal/tests/palsuite/file_io/SetFileAttributesW/test4/SetFileAttributesW.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt
index e35244998111..bb09a981e9fe 100644
--- a/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFilePointer.c
+  SetFilePointer.cpp
 )
 
 add_executable(paltest_setfilepointer_test1
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.c b/src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.c
rename to src/pal/tests/palsuite/file_io/SetFilePointer/test1/SetFilePointer.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt
index 290a01107fd4..2e76f00c994a 100644
--- a/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFilePointer.c
+  SetFilePointer.cpp
 )
 
 add_executable(paltest_setfilepointer_test2
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.c b/src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.c
rename to src/pal/tests/palsuite/file_io/SetFilePointer/test2/SetFilePointer.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt
index daa7553a1afb..bcc3faca09c0 100644
--- a/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFilePointer.c
+  SetFilePointer.cpp
 )
 
 add_executable(paltest_setfilepointer_test3
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.c b/src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.c
rename to src/pal/tests/palsuite/file_io/SetFilePointer/test3/SetFilePointer.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt
index 1117893350e3..3fcc4066f2da 100644
--- a/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFilePointer.c
+  SetFilePointer.cpp
 )
 
 add_executable(paltest_setfilepointer_test4
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.c b/src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.c
rename to src/pal/tests/palsuite/file_io/SetFilePointer/test4/SetFilePointer.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt
index b37bf42ffc9a..3012009e4f99 100644
--- a/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFilePointer.c
+  SetFilePointer.cpp
 )
 
 add_executable(paltest_setfilepointer_test5
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.c b/src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.c
rename to src/pal/tests/palsuite/file_io/SetFilePointer/test5/SetFilePointer.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt
index 8f99ed2d760a..a376acbe28ad 100644
--- a/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFilePointer.c
+  SetFilePointer.cpp
 )
 
 add_executable(paltest_setfilepointer_test6
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.c b/src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.c
rename to src/pal/tests/palsuite/file_io/SetFilePointer/test6/SetFilePointer.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt
index c5a46a531ae4..2b5c0bbb4533 100644
--- a/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFilePointer/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFilePointer.c
+  SetFilePointer.cpp
 )
 
 add_executable(paltest_setfilepointer_test7
diff --git a/src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.c b/src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.c
rename to src/pal/tests/palsuite/file_io/SetFilePointer/test7/SetFilePointer.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt
index 4c4b5d761199..b94bd05d7625 100644
--- a/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileTime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileTime.c
+  SetFileTime.cpp
 )
 
 add_executable(paltest_setfiletime_test1
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test1/SetFileTime.c b/src/pal/tests/palsuite/file_io/SetFileTime/test1/SetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileTime/test1/SetFileTime.c
rename to src/pal/tests/palsuite/file_io/SetFileTime/test1/SetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt
index 35c18c8d8d1b..5478aa3703b1 100644
--- a/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileTime/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileTime.c
+  SetFileTime.cpp
 )
 
 add_executable(paltest_setfiletime_test2
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test2/SetFileTime.c b/src/pal/tests/palsuite/file_io/SetFileTime/test2/SetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileTime/test2/SetFileTime.c
rename to src/pal/tests/palsuite/file_io/SetFileTime/test2/SetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt
index 0a85d30c5121..26e178a328e7 100644
--- a/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileTime/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileTime.c
+  SetFileTime.cpp
 )
 
 add_executable(paltest_setfiletime_test3
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test3/SetFileTime.c b/src/pal/tests/palsuite/file_io/SetFileTime/test3/SetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileTime/test3/SetFileTime.c
rename to src/pal/tests/palsuite/file_io/SetFileTime/test3/SetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt
index 086e35e5358b..b85a92bf630b 100644
--- a/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/SetFileTime/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  SetFileTime.c
+  SetFileTime.cpp
 )
 
 add_executable(paltest_setfiletime_test4
diff --git a/src/pal/tests/palsuite/file_io/SetFileTime/test4/SetFileTime.c b/src/pal/tests/palsuite/file_io/SetFileTime/test4/SetFileTime.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/SetFileTime/test4/SetFileTime.c
rename to src/pal/tests/palsuite/file_io/SetFileTime/test4/SetFileTime.cpp
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt
index 0c6760a2cefc..3d5a735a8338 100644
--- a/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/WriteFile/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WriteFile.c
+  WriteFile.cpp
 )
 
 add_executable(paltest_writefile_test1
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.c b/src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.c
rename to src/pal/tests/palsuite/file_io/WriteFile/test1/WriteFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt
index a9b51efa3d83..3d7d18826af0 100644
--- a/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/WriteFile/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WriteFile.c
+  WriteFile.cpp
 )
 
 add_executable(paltest_writefile_test2
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.c b/src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.c
rename to src/pal/tests/palsuite/file_io/WriteFile/test2/WriteFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt
index e16e8a48f621..bffcf35482c3 100644
--- a/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/WriteFile/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WriteFile.c
+  WriteFile.cpp
 )
 
 add_executable(paltest_writefile_test3
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.c b/src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.c
rename to src/pal/tests/palsuite/file_io/WriteFile/test3/WriteFile.cpp
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt
index fff886b430e0..402a61ac2cae 100644
--- a/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/WriteFile/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  writefile.c
+  writefile.cpp
 )
 
 add_executable(paltest_writefile_test4
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.c b/src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.c
rename to src/pal/tests/palsuite/file_io/WriteFile/test4/writefile.cpp
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt
index 978eb7f1e7c3..f1f5037f9824 100644
--- a/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/WriteFile/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  writefile.c
+  writefile.cpp
 )
 
 add_executable(paltest_writefile_test5
diff --git a/src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.c b/src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.c
rename to src/pal/tests/palsuite/file_io/WriteFile/test5/writefile.cpp
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt
index 91b7db1f033b..4c4f6416ceb5 100644
--- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_errorpathnotfound_test1
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.c b/src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.c
rename to src/pal/tests/palsuite/file_io/errorpathnotfound/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt
index 7d525c21d57d..284933f9503e 100644
--- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_errorpathnotfound_test2
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.c b/src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.c
rename to src/pal/tests/palsuite/file_io/errorpathnotfound/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt
index c7434f3dba51..b418c9dbdbe5 100644
--- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_errorpathnotfound_test3
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/test3.c b/src/pal/tests/palsuite/file_io/errorpathnotfound/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/errorpathnotfound/test3/test3.c
rename to src/pal/tests/palsuite/file_io/errorpathnotfound/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt b/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt
index f8062fd127a2..e0322dd8e4fd 100644
--- a/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_errorpathnotfound_test4
diff --git a/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/test4.c b/src/pal/tests/palsuite/file_io/errorpathnotfound/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/errorpathnotfound/test4/test4.c
rename to src/pal/tests/palsuite/file_io/errorpathnotfound/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt b/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt
index 2aff599e7491..9869c9c70fea 100644
--- a/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/file_io/gettemppatha/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  gettemppatha.c
+  gettemppatha.cpp
 )
 
 add_executable(paltest_gettemppatha_test1
diff --git a/src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.c b/src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.cpp
similarity index 100%
rename from src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.c
rename to src/pal/tests/palsuite/file_io/gettemppatha/test1/gettemppatha.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt
index 36084bf44650..c38015ea21dc 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMapping.c
+  CreateFileMapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CreateFileMapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CreateFileMapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CreateFileMapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test1/CreateFileMapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt
index 374f8f094686..fc152c8161fe 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMapping.c
+  CreateFileMapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CreateFileMapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CreateFileMapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CreateFileMapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test3/CreateFileMapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt
index 665b10a3f0d4..bbb4deaa8b43 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMapping.c
+  CreateFileMapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CreateFileMapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CreateFileMapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CreateFileMapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test4/CreateFileMapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt
index 6f7f3c3635ec..b80aa21a4221 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMapping.c
+  CreateFileMapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test5
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CreateFileMapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CreateFileMapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CreateFileMapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test5/CreateFileMapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt
index 2f5d98b5e6e9..414127aa357c 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMapping.c
+  CreateFileMapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test6
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CreateFileMapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CreateFileMapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CreateFileMapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test6/CreateFileMapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt
index 4fd24a63a1d7..e40a5ad4863f 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createfilemapping.c
+  createfilemapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test7
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/createfilemapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/createfilemapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/createfilemapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test7/createfilemapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt
index ae3ee8ddf66a..d2e20075455e 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createfilemapping.c
+  createfilemapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test8
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/createfilemapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/createfilemapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/createfilemapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test8/createfilemapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt
index a377632bed59..3017dc4aa4f4 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createfilemapping.c
+  createfilemapping.cpp
 )
 
 add_executable(paltest_createfilemappinga_test9
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/createfilemapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/createfilemapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/createfilemapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingA/test9/createfilemapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt
index a4ad343ea042..2d24eca8c80e 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMapping_neg.c
+  CreateFileMapping_neg.cpp
 )
 
 add_executable(paltest_createfilemappingw_createfilemapping_neg1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/CreateFileMapping_neg1/CreateFileMapping_neg.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt
index 0c569ec9b634..a2fbfa39af32 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMappingW.c
+  CreateFileMappingW.cpp
 )
 
 add_executable(paltest_createfilemappingw_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test1/CreateFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt
index 992645f48c24..8552cc910fef 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMappingW.c
+  CreateFileMappingW.cpp
 )
 
 add_executable(paltest_createfilemappingw_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test2/CreateFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt
index 87832ffd9bba..97fd7123508e 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMappingW.c
+  CreateFileMappingW.cpp
 )
 
 add_executable(paltest_createfilemappingw_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test3/CreateFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt
index f8a5c9041f01..81f248e33504 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMappingW.c
+  CreateFileMappingW.cpp
 )
 
 add_executable(paltest_createfilemappingw_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test4/CreateFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt
index 8391fbd72145..df25e29a4f8a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMappingW.c
+  CreateFileMappingW.cpp
 )
 
 add_executable(paltest_createfilemappingw_test5
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test5/CreateFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt
index abb62ad950a0..852c508020a2 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateFileMappingW.c
+  CreateFileMappingW.cpp
 )
 
 add_executable(paltest_createfilemappingw_test6
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test6/CreateFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt
index b40cfeae9665..68be449aecc5 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createfilemapping.c
+  createfilemapping.cpp
 )
 
 add_executable(paltest_createfilemappingw_test7
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test7/createfilemapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt
index 96658c163a60..406331072c94 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createfilemapping.c
+  createfilemapping.cpp
 )
 
 add_executable(paltest_createfilemappingw_test8
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test8/createfilemapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt
index 5a55e27b33e1..6d15fea1e6f9 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createfilemapping.c
+  createfilemapping.cpp
 )
 
 add_executable(paltest_createfilemappingw_test9
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.c b/src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.c
rename to src/pal/tests/palsuite/filemapping_memmgt/CreateFileMappingW/test9/createfilemapping.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt
index 3807621e3fbe..beaee835c89a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  dlltest.c
-  FreeLibrary.c
+  dlltest.cpp
+  FreeLibrary.cpp
 )
 
 add_executable(paltest_freelibrary_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.c b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.c
rename to src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/dlltest.c b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/dlltest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/dlltest.c
rename to src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/dlltest.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt
index 00b1eca8e335..0a5e700ba436 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_freelibrary_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.c b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.c
rename to src/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt
index cec083583a8a..03bfe06eb33a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  dlltest.c
-  test1.c
+  dlltest.cpp
+  test1.cpp
 )
 
 add_executable(paltest_freelibraryandexitthread_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/dlltest.c b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/dlltest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/dlltest.c
rename to src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/dlltest.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.c b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp
similarity index 98%
rename from src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.c
rename to src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp
index 6aacfc83b48b..58f6643722aa 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/FreeLibraryAndExitThread/test1/test1.cpp
@@ -58,7 +58,7 @@ BOOL  PALAPI StartThreadTest()
     HANDLE  hThread;  
     DWORD   dwThreadId;
     LPTHREAD_START_ROUTINE lpStartAddress =  &CreateTestThread;
-    LPVOID lpParameter = lpStartAddress;
+    LPVOID lpParameter = (LPVOID)lpStartAddress;
     DWORD rc = -1;
     /*Load library (DLL).*/
     hLib = LoadLibrary(LibraryName);
@@ -72,7 +72,7 @@ BOOL  PALAPI StartThreadTest()
     /*Start the test thread*/
     hThread = CreateThread(NULL, 
                             (DWORD)0,
-                            lpParameter,
+                            lpStartAddress,
                             hLib,
                             (DWORD)NULL,
                             &dwThreadId);
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt
index a1128c62b811..9b7a610f0ccf 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetModuleFileNameA.c
+  GetModuleFileNameA.cpp
 )
 
 add_executable(paltest_getmodulefilenamea_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.c b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt
index c35e9acc5e5c..1909be4b421d 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetModuleFileNameA.c
+  GetModuleFileNameA.cpp
 )
 
 add_executable(paltest_getmodulefilenamea_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.c b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test2/GetModuleFileNameA.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt
index c702d07908cd..f3d92b15c994 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetModuleFileNameW.c
+  GetModuleFileNameW.cpp
 )
 
 add_executable(paltest_getmodulefilenamew_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.c b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp
similarity index 97%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp
index 4c1c3b00ab62..c122312d8913 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp
@@ -45,7 +45,7 @@ int __cdecl main(int argc, char *argv[])
         ExitProcess(FAIL);
     }
 
-    ModuleFileNameBuf = malloc(MODULENAMEBUFFERSIZE*sizeof(WCHAR));
+    ModuleFileNameBuf = (WCHAR*)malloc(MODULENAMEBUFFERSIZE*sizeof(WCHAR));
 
     //convert a normal string to a wide one
     lpModuleName = convert(ModuleName);
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt
index 857feb330d0f..7b23e9277283 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetModuleFileNameW.c
+  GetModuleFileNameW.cpp
 )
 
 add_executable(paltest_getmodulefilenamew_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.c b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp
similarity index 94%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp
index 6009a9d2981b..f23d97c1386a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test2/GetModuleFileNameW.cpp
@@ -34,7 +34,7 @@ int __cdecl main(int argc, char *argv[])
         ExitProcess(FAIL);
     }
 
-    ModuleFileNameBuf = malloc(MODULENAMEBUFFERSIZE*sizeof(WCHAR));
+    ModuleFileNameBuf = (WCHAR*)malloc(MODULENAMEBUFFERSIZE*sizeof(WCHAR));
 
     //retrieve the current process full path and file name
     //by passing a NULL module handle
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt
index 541ef8b98eb7..3dedba3cce4c 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
-  testlib.c
+  test1.cpp
+  testlib.cpp
 )
 
 add_executable(paltest_getprocaddress_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.c b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/testlib.c b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/testlib.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/testlib.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/testlib.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt
index 60a5ba1a6e00..983c16f12fa5 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/CMakeLists.txt
@@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
-  testlib.c
+  test2.cpp
+  testlib.cpp
 )
 
 add_executable(paltest_getprocaddress_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.c b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/testlib.c b/src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/testlib.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/testlib.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/testlib.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt
index 18871abf00b3..3e9c725f9541 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetProcessHeap.c
+  GetProcessHeap.cpp
 )
 
 add_executable(paltest_getprocessheap_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/GetProcessHeap.c b/src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/GetProcessHeap.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/GetProcessHeap.c
rename to src/pal/tests/palsuite/filemapping_memmgt/GetProcessHeap/test1/GetProcessHeap.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt
index 3a64a0c58a95..b9ce32b35e40 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  HeapAlloc.c
+  HeapAlloc.cpp
 )
 
 add_executable(paltest_heapalloc_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/HeapAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/HeapAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/HeapAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test1/HeapAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt
index 5253110d8d56..1b9655ddba29 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  HeapAlloc.c
+  HeapAlloc.cpp
 )
 
 add_executable(paltest_heapalloc_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/HeapAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/HeapAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/HeapAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test2/HeapAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt
index f0b89461d2b5..1c3845c6e953 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  HeapAlloc.c
+  HeapAlloc.cpp
 )
 
 add_executable(paltest_heapalloc_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/HeapAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/HeapAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/HeapAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapAlloc/test3/HeapAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt
index 898047a9ad4d..004912256c49 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  HeapFree.c
+  HeapFree.cpp
 )
 
 add_executable(paltest_heapfree_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/HeapFree.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/HeapFree.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/HeapFree.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapFree/test1/HeapFree.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt
index 1decb02c73c9..17e01274355a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_heaprealloc_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/test1.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/test1.cpp
similarity index 93%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/test1.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/test1.cpp
index 497d208eca52..eedd45e45d30 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/test1.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test1/test1.cpp
@@ -37,7 +37,7 @@ int __cdecl main(int argc, char *argv[])
     }
     
     /* Allocate 100 bytes on the heap */
-    if((TheMemory = HeapAlloc(TheHeap, 0, 100)) == NULL)
+    if((TheMemory = (char*)HeapAlloc(TheHeap, 0, 100)) == NULL)
     {
         Fail("ERROR: HeapAlloc returned NULL when it was called.  "
              "GetLastError() returned %d.",GetLastError());
@@ -47,7 +47,7 @@ int __cdecl main(int argc, char *argv[])
     memset(TheMemory, 'X', 100);
     
     /* Reallocate the memory */
-    ReAllocMemory = HeapReAlloc(TheHeap, 0, TheMemory, 100);
+    ReAllocMemory = (char*)HeapReAlloc(TheHeap, 0, TheMemory, 100);
 
     if(ReAllocMemory == NULL)
     {
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt
index 6f5510387af6..a9239354ba8a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_heaprealloc_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.cpp
similarity index 94%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.cpp
index 13e789f901b2..a7e3b2a055b7 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test2/test2.cpp
@@ -38,7 +38,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Allocate 200 bytes on the heap */
-    if((TheMemory = HeapAlloc(TheHeap, 0, 200)) == NULL)
+    if((TheMemory = (char*)HeapAlloc(TheHeap, 0, 200)) == NULL)
     {
         Fail("ERROR: HeapAlloc returned NULL when it was called.  "
              "GetLastError() returned %d.",GetLastError());
@@ -51,7 +51,7 @@ int __cdecl main(int argc, char *argv[])
     memset(TheMemory+100, 'Z', 100);
     
     /* Reallocate the memory to 100 bytes  */
-    ReAllocMemory = HeapReAlloc(TheHeap, 0, TheMemory, 100);
+    ReAllocMemory = (char*)HeapReAlloc(TheHeap, 0, TheMemory, 100);
     
     if(ReAllocMemory == NULL)
     {
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt
index 7ad836706ab4..2d82b6efddab 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_heaprealloc_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/test3.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/test3.cpp
similarity index 94%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/test3.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/test3.cpp
index dea9de348dba..d4139e8d5ecd 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/test3.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test3/test3.cpp
@@ -38,7 +38,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Allocate 100 bytes on the heap */
-    if((TheMemory = HeapAlloc(TheHeap, 0, 100)) == NULL)
+    if((TheMemory = (char*)HeapAlloc(TheHeap, 0, 100)) == NULL)
     {
         Fail("ERROR: HeapAlloc returned NULL when it was called.  "
              "GetLastError() returned %d.",GetLastError());
@@ -48,7 +48,7 @@ int __cdecl main(int argc, char *argv[])
     memset(TheMemory, 'X', 100);
     
     /* Reallocate the memory to 200 bytes  */
-    ReAllocMemory = HeapReAlloc(TheHeap, 0, TheMemory, 200);
+    ReAllocMemory = (char*)HeapReAlloc(TheHeap, 0, TheMemory, 200);
     
     if(ReAllocMemory == NULL)
     {
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt
index 024a4ef84099..129d8a47cd5f 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_heaprealloc_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/test4.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/test4.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt
index 3ab3ec16e89c..ed3d39062521 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_heaprealloc_test5
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/test5.c b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/test5.cpp
similarity index 89%
rename from src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/test5.c
rename to src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/test5.cpp
index 230e65e492ba..fcd38376ecdf 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/test5.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/HeapReAlloc/test5/test5.cpp
@@ -37,7 +37,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Allocate 100 bytes on the heap */
-    if((TheMemory = HeapAlloc(TheHeap, 0, 100)) == NULL)
+    if((TheMemory = (char*)HeapAlloc(TheHeap, 0, 100)) == NULL)
     {
         Fail("ERROR: HeapAlloc returned NULL when it was called.  "
              "GetLastError() returned %d.",GetLastError());
@@ -47,7 +47,7 @@ int __cdecl main(int argc, char *argv[])
     memset(TheMemory, 'X', 100);
 
     /* Reallocate the memory into 0 bytes */
-    ReAllocMemory = HeapReAlloc(TheHeap, 0, TheMemory, 0);
+    ReAllocMemory = (char*)HeapReAlloc(TheHeap, 0, TheMemory, 0);
 
     if(ReAllocMemory == NULL)
     {
@@ -56,7 +56,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Reallocate the memory we just put into 0 bytes, into 100 bytes. */
-    ReAllocMemory2 = HeapReAlloc(TheHeap, 0, ReAllocMemory, 100);
+    ReAllocMemory2 = (char*)HeapReAlloc(TheHeap, 0, ReAllocMemory, 100);
 
     if(ReAllocMemory2 == NULL)
     {
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt
index c96e00a17070..f74e442d7620 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  LocalAlloc.c
+  LocalAlloc.cpp
 )
 
 add_executable(paltest_localalloc_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LocalAlloc/test1/LocalAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt
index 47ad76ebe60f..d92939c7cc23 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  LocalFree.c
+  LocalFree.cpp
 )
 
 add_executable(paltest_localfree_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.c b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test1/LocalFree.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt
index ac7a11a05f47..e087b08ad7b8 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  LocalFree.c
+  LocalFree.cpp
 )
 
 add_executable(paltest_localfree_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.c b/src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LocalFree/test2/LocalFree.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt
index 0af09480eff8..1d08065b2a3a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_lockfile_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_lockfile_test1
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_lockfile_test1_helper
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/helper.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/helper.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/helper.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/test1.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/test1.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt
index 157c517e622a..ca5e5faed476 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_lockfile_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/test2.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/test2.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt
index 69516de69b7d..117c715084e1 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_lockfile_test3
@@ -20,7 +20,7 @@ target_link_libraries(paltest_lockfile_test3
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_lockfile_test3_helper
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/helper.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/helper.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/helper.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/test3.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/test3.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt
index fb8f6745d4d7..aee1b1a0bea1 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_lockfile_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/test4.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/test4.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt
index cc4548a6f064..70e3db456120 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_lockfile_test5
@@ -20,7 +20,7 @@ target_link_libraries(paltest_lockfile_test5
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_lockfile_test5_helper
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/helper.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/helper.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/helper.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/test5.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/test5.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt
index 504997758281..255ecbcc8d5c 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_lockfile_test6
@@ -20,7 +20,7 @@ target_link_libraries(paltest_lockfile_test6
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_lockfile_test6_helper
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/helper.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/helper.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/helper.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/test6.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/test6.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt
index e8434cc78730..68a5b9f659ac 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_lockfile_test7
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/test7.c b/src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/test7.c
rename to src/pal/tests/palsuite/filemapping_memmgt/LockFile/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt
index ef9838d41e0b..01679e5387ba 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  MapViewOfFile.c
+  MapViewOfFile.cpp
 )
 
 add_executable(paltest_mapviewoffile_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.c b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test1/MapViewOfFile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt
index 18a9d105b165..88f3344567bd 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  MapViewOfFile.c
+  MapViewOfFile.cpp
 )
 
 add_executable(paltest_mapviewoffile_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.c b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test2/MapViewOfFile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt
index 76bd3276a472..e48ce134085a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  MapViewOfFile.c
+  MapViewOfFile.cpp
 )
 
 add_executable(paltest_mapviewoffile_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.c b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test3/MapViewOfFile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt
index 52381c510f73..7f6d90521294 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  mapviewoffile.c
+  mapviewoffile.cpp
 )
 
 add_executable(paltest_mapviewoffile_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.c b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test4/mapviewoffile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt
index f98a4b7779d2..3911ffa53c4f 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  mapviewoffile.c
+  mapviewoffile.cpp
 )
 
 add_executable(paltest_mapviewoffile_test5
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.c b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test5/mapviewoffile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt
index dad03aaf803b..8199981eecd4 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  mapviewoffile.c
+  mapviewoffile.cpp
 )
 
 add_executable(paltest_mapviewoffile_test6
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.c b/src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/MapViewOfFile/test6/mapviewoffile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt
index b286924864dd..e4d87d5e0fcd 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  OpenFileMappingA.c
+  OpenFileMappingA.cpp
 )
 
 add_executable(paltest_openfilemappinga_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/OpenFileMappingA.c b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/OpenFileMappingA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/OpenFileMappingA.c
rename to src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test1/OpenFileMappingA.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt
index 3a0eff04a7b8..670346fe3beb 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  OpenFileMappingA.c
+  OpenFileMappingA.cpp
 )
 
 add_executable(paltest_openfilemappinga_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/OpenFileMappingA.c b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/OpenFileMappingA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/OpenFileMappingA.c
rename to src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test2/OpenFileMappingA.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt
index 599a09ffc788..dab27b5c74cc 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  OpenFileMappingA.c
+  OpenFileMappingA.cpp
 )
 
 add_executable(paltest_openfilemappinga_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/OpenFileMappingA.c b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/OpenFileMappingA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/OpenFileMappingA.c
rename to src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingA/test3/OpenFileMappingA.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt
index 04e9e47ef086..b2f4494ad896 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  OpenFileMappingW.c
+  OpenFileMappingW.cpp
 )
 
 add_executable(paltest_openfilemappingw_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test1/OpenFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt
index 22e960b7881c..655fa753f2ce 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  OpenFileMappingW.c
+  OpenFileMappingW.cpp
 )
 
 add_executable(paltest_openfilemappingw_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test2/OpenFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt
index 5a5436811093..a7039a1c7308 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  OpenFileMappingW.c
+  OpenFileMappingW.cpp
 )
 
 add_executable(paltest_openfilemappingw_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.c b/src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.c
rename to src/pal/tests/palsuite/filemapping_memmgt/OpenFileMappingW/test3/OpenFileMappingW.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/CMakeLists.txt
index 400c9219f654..68748342adf6 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ReadProcessMemory_neg.c
+  ReadProcessMemory_neg.cpp
 )
 
 add_executable(paltest_readprocessmemory_readprocessmemory_neg1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/ReadProcessMemory_neg.c b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/ReadProcessMemory_neg.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/ReadProcessMemory_neg.c
rename to src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/ReadProcessMemory_neg1/ReadProcessMemory_neg.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/CMakeLists.txt
index 8c21f015626d..abaa09fb914e 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ReadProcessMemory.c
+  ReadProcessMemory.cpp
 )
 
 add_executable(paltest_readprocessmemory_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/ReadProcessMemory.c b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/ReadProcessMemory.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/ReadProcessMemory.c
rename to src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test1/ReadProcessMemory.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/CMakeLists.txt
index 9e0de95a0a7f..0a9d5e387d77 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_readprocessmemory_test2
@@ -20,7 +20,7 @@ target_link_libraries(paltest_readprocessmemory_test2
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_readprocessmemory_test2_helper
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/helper.c b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/helper.cpp
similarity index 99%
rename from src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/helper.c
rename to src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/helper.cpp
index 59e882fc1fd8..a10ad926c3b8 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/helper.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/helper.cpp
@@ -178,7 +178,7 @@ int __cdecl main(int argc, char *argv[])
 
     /* Get the parent process to write to stuff on the heap */
     sizeTarget =  2 * sizeof(int) + 23 ;  /* 23 is just a random prime > 16 */
-    if (!(pTarget = malloc(sizeTarget))) 
+    if (!(pTarget = (char*)malloc(sizeTarget))) 
     {
         Trace("WriteProcessMemory helper: unable to allocate '%s'->%d bytes of memory"
               "(%u).\n",
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/test2.c b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/test2.cpp
similarity index 98%
rename from src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/test2.c
rename to src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/test2.cpp
index eda40599ceb0..91172be9e174 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/test2.c
+++ b/src/pal/tests/palsuite/filemapping_memmgt/ReadProcessMemory/test2/test2.cpp
@@ -146,7 +146,7 @@ int __cdecl main(int argc, char *argv[])
         }
      
         /* compose some data to write to the client process */
-        if (!(pSrcMemory = malloc(Count)))
+        if (!(pSrcMemory = (char*)malloc(Count)))
         {
             Trace("could not dynamically allocate memory to copy from "
                   "for reasons %u & %u\n",
@@ -166,7 +166,7 @@ int __cdecl main(int argc, char *argv[])
 
         if (!dwRet)
         {
-            Trace("%s: Problem: on a write to "LLFORMAT " bytes @ " LLFORMAT " ('%s')\n", 
+            Trace("%s: Problem: on a write to " LLFORMAT " bytes @ " LLFORMAT " ('%s')\n", 
                   argv[0], Count, pDestMemory, incomingCMDBuffer);
             Trace("test1 WriteProcessMemory returned a (!=0) (GLE=%u)\n", 
                   GetLastError());
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt
index 987c413d03e1..8aa1c80368cf 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_rtlmovememory_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/test1.c b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/test1.c
rename to src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt
index 14098a8dc1ec..d292cff494ef 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_rtlmovememory_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/test3.c b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/test3.c
rename to src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt
index 00aec7e8f737..e8aeb0c0b333 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_rtlmovememory_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/test4.c b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/test4.c
rename to src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt
index f2de78216edc..7f4986eb2798 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_rtlmovememory_test5
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/test5.c b/src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/test5.c
rename to src/pal/tests/palsuite/filemapping_memmgt/RtlMoveMemory/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt
index 0e6d6fef4c6b..8ed46bae43e4 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_unlockfile_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_unlockfile_test1
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_unlockfile_test1_helper
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/helper.c b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/helper.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/helper.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/test1.c b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/test1.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt
index 142b2763cb8f..3033876f8017 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_unlockfile_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/test2.c b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/test2.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt
index b4ec37c88cfd..d46d7db344c7 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_unlockfile_test3
@@ -20,7 +20,7 @@ target_link_libraries(paltest_unlockfile_test3
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_unlockfile_test3_helper
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/helper.c b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/helper.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/helper.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/test3.c b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/test3.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt
index d6bee307c220..635a1ca07cea 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_unlockfile_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/test4.c b/src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/test4.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnlockFile/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt
index 5ebda77ba6d9..1b8062ff9c9e 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  UnmapViewOfFile.c
+  UnmapViewOfFile.cpp
 )
 
 add_executable(paltest_unmapviewoffile_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.c b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test1/UnmapViewOfFile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt
index 5c12cf98257e..750e446a172a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  unmapviewoffile.c
+  unmapviewoffile.cpp
 )
 
 add_executable(paltest_unmapviewoffile_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.c b/src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.c
rename to src/pal/tests/palsuite/filemapping_memmgt/UnmapViewOfFile/test2/unmapviewoffile.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt
index 90ba41bd7916..f8c0645a4bad 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test1/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt
index 51b0e1d92e09..1b66f0d7cbb8 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test10
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test10/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt
index adff47087b3e..95e1a06f554d 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test11
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test11/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt
index 26f303573ebc..7564f960fe40 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test12
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test12/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt
index f85cbdc69467..a49dcfc81d01 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test13
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test13/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt
index 41ed0ca20870..180a48e74d14 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test14
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test14/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt
index 87b29108b2ce..4ba219472e1c 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test15
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test15/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt
index 90e3f3bdb280..1c5f63dce5c3 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test16
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test16/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt
index 461b48ccc093..6523bb92928d 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test17
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test17/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt
index 69823be14ba8..3fe65b4ac877 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test18
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test18/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt
index fa65b4fa46e2..1795b8ba545a 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test19
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test19/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt
index 1753b1edc590..20da178bfc11 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test2/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt
index 2c550711490f..5c23fe2b0d42 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  virtualalloc.c
+  virtualalloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test20
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test20/virtualalloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt
index f97c32af7566..96a3144e8a33 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  virtualalloc.c
+  virtualalloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test21
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test21/virtualalloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt
index 035594bd79be..77822f78628d 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test3/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt
index 5ce80bf52f8f..0e2c44865955 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test4/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt
index 138d9c972763..247053ff0fea 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test5
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test5/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt
index c61add9db4e2..d19391d294d5 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test6
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test6/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt
index b5452a0c48f4..8c01e041de14 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test7
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test7/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt
index 584a0c505a31..db2a7447be8d 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test8
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test8/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt
index aee950b2e4c9..254fc6fcf22b 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualAlloc.c
+  VirtualAlloc.cpp
 )
 
 add_executable(paltest_virtualalloc_test9
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualAlloc/test9/VirtualAlloc.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt
index 1914f76fe600..d2319506f277 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualFree.c
+  VirtualFree.cpp
 )
 
 add_executable(paltest_virtualfree_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test1/VirtualFree.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt
index a288b37154ef..9a3bc7ac614e 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualFree.c
+  VirtualFree.cpp
 )
 
 add_executable(paltest_virtualfree_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test2/VirtualFree.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt
index 993189c1aa4a..8484c0fd94d4 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualFree.c
+  VirtualFree.cpp
 )
 
 add_executable(paltest_virtualfree_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualFree/test3/VirtualFree.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt
index 214cf460aeb8..4283398a6f9f 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualProtect.c
+  VirtualProtect.cpp
 )
 
 add_executable(paltest_virtualprotect_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test1/VirtualProtect.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt
index 27f43477ea92..aed68fd27f16 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualProtect.c
+  VirtualProtect.cpp
 )
 
 add_executable(paltest_virtualprotect_test2
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test2/VirtualProtect.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt
index 994d4e2f41fb..70728592adb8 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualProtect.c
+  VirtualProtect.cpp
 )
 
 add_executable(paltest_virtualprotect_test3
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test3/VirtualProtect.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt
index 2e0fba50bb57..5ad64a74ebd2 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualProtect.c
+  VirtualProtect.cpp
 )
 
 add_executable(paltest_virtualprotect_test4
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test4/VirtualProtect.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt
index 6d6fd07df865..78932ef453af 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualProtect.c
+  VirtualProtect.cpp
 )
 
 add_executable(paltest_virtualprotect_test6
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test6/VirtualProtect.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt
index 06af86055993..caf5ef91f455 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualProtect.c
+  VirtualProtect.cpp
 )
 
 add_executable(paltest_virtualprotect_test7
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualProtect/test7/VirtualProtect.cpp
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt b/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt
index 4f4e4bc5f0ed..17cbdee4a5ce 100644
--- a/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  VirtualQuery.c
+  VirtualQuery.cpp
 )
 
 add_executable(paltest_virtualquery_test1
diff --git a/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.c b/src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.cpp
similarity index 100%
rename from src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.c
rename to src/pal/tests/palsuite/filemapping_memmgt/VirtualQuery/test1/VirtualQuery.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt
index 542f8d32772a..62b896df65d7 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  LoadLibraryA.c
+  LoadLibraryA.cpp
 )
 
 add_executable(paltest_loadlibrarya_test1
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt
index 63cfb225451a..48a4c36cd098 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  LoadLibraryA.c
+  LoadLibraryA.cpp
 )
 
 add_executable(paltest_loadlibrarya_test2
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test2/LoadLibraryA.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test2/MyModule.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test2/MyModule.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test2/MyModule.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test2/MyModule.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt
index 143d0ec096c2..ae05b3560d3b 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  loadlibrarya.c
+  loadlibrarya.cpp
 )
 
 add_executable(paltest_loadlibrarya_test3
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test3/loadlibrarya.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt
index a9d791c916c3..99915eea2ce1 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  loadlibrarya.c
+  loadlibrarya.cpp
 )
 
 add_executable(paltest_loadlibrarya_test5
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test5/loadlibrarya.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt
index bb66adef7700..0fac8785a866 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  loadlibrarya.c
+  loadlibrarya.cpp
 )
 
 add_executable(paltest_loadlibrarya_test6
@@ -20,7 +20,7 @@ target_link_libraries(paltest_loadlibrarya_test6
 
 
 set(HELPERSOURCES
-  dlltest.c
+  dlltest.cpp
 )
 
 add_executable(paltest_loadlibrarya_test6_dlltest
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test6/dlltest.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test6/dlltest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test6/dlltest.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test6/dlltest.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test6/loadlibrarya.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt
index 6c0d17460082..bb403c646665 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  LoadLibraryA.c
+  LoadLibraryA.cpp
 )
 
 add_executable(paltest_loadlibrarya_test7
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test7/LoadLibraryA.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt
index b663a7b5bc64..9e3449166b39 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryA/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  loadlibrarya.c
+  loadlibrarya.cpp
 )
 
 add_executable(paltest_loadlibrarya_test8
@@ -20,7 +20,7 @@ target_link_libraries(paltest_loadlibrarya_test8
 
 
 set(HELPERSOURCES
-  dlltest.c
+  dlltest.cpp
 )
 
 add_executable(paltest_loadlibrarya_test8_dlltest
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test8/dlltest.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test8/dlltest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test8/dlltest.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test8/dlltest.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.c b/src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.c
rename to src/pal/tests/palsuite/loader/LoadLibraryA/test8/loadlibrarya.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt
index 87038012b735..171d1d59d4fc 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  LoadLibraryW.c
+  LoadLibraryW.cpp
 )
 
 add_executable(paltest_loadlibraryw_test1
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.c b/src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.c
rename to src/pal/tests/palsuite/loader/LoadLibraryW/test1/LoadLibraryW.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt
index 5e8486d23b78..9873e1332d37 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  loadlibraryw.c
+  loadlibraryw.cpp
 )
 
 add_executable(paltest_loadlibraryw_test2
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.c b/src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.c
rename to src/pal/tests/palsuite/loader/LoadLibraryW/test2/loadlibraryw.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt
index 2c96fa23da87..be758643fae0 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  loadlibraryw.c
+  loadlibraryw.cpp
 )
 
 add_executable(paltest_loadlibraryw_test3
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.c b/src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.c
rename to src/pal/tests/palsuite/loader/LoadLibraryW/test3/loadlibraryw.cpp
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt b/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt
index 7b8931a961e7..1ca990b514e0 100644
--- a/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/loader/LoadLibraryW/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  loadlibraryw.c
+  loadlibraryw.cpp
 )
 
 add_executable(paltest_loadlibraryw_test5
diff --git a/src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.c b/src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.cpp
similarity index 100%
rename from src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.c
rename to src/pal/tests/palsuite/loader/LoadLibraryW/test5/loadlibraryw.cpp
diff --git a/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt
index 96ee18d857b7..171d5b77e8ac 100644
--- a/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/CompareStringA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_comparestringa_test1
diff --git a/src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.c b/src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/CompareStringA/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt
index 865297738741..15a7fe768599 100644
--- a/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/CompareStringW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_comparestringw_test1
diff --git a/src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.c b/src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/CompareStringW/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt
index c5513da2c1ca..cf4431ea945e 100644
--- a/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetACP/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getacp_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetACP/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetACP/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetACP/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetACP/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt
index c209b121b2c2..b4cf017c2b93 100644
--- a/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getcpinfo_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetCPInfo/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetCPInfo/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetCPInfo/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt
index 6132e9b3fa17..b366f3ce8d5d 100644
--- a/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getcpinfo_test2
diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/test2.c b/src/pal/tests/palsuite/locale_info/GetCPInfo/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetCPInfo/test2/test2.c
rename to src/pal/tests/palsuite/locale_info/GetCPInfo/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt
index 3e4a09b51d98..032dd00290a3 100644
--- a/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_getcpinfo_test3
diff --git a/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/test3.c b/src/pal/tests/palsuite/locale_info/GetCPInfo/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetCPInfo/test3/test3.c
rename to src/pal/tests/palsuite/locale_info/GetCPInfo/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt
index f373b98f7cd7..4f685cb8a47d 100644
--- a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getlocaleinfow_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt
index dd5b82ef6178..7851b36b96e2 100644
--- a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getlocaleinfow_test2
diff --git a/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.c b/src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.c
rename to src/pal/tests/palsuite/locale_info/GetLocaleInfoW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt
index 5bb7b8c8b5ff..e68621681a38 100644
--- a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getstringtypeexw_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetStringTypeExW/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt
index 4a8fab243ead..e37b7495d050 100644
--- a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getstringtypeexw_test2
diff --git a/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/test2.c b/src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/test2.c
rename to src/pal/tests/palsuite/locale_info/GetStringTypeExW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt
index ef87b5f87f47..e34e1837e064 100644
--- a/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getsystemdefaultlangid_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetSystemDefaultLangID/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt
index 8cec9d8306db..8abbd822c29c 100644
--- a/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getthreadlocale_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetThreadLocale/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt
index 281f3bf9c349..8bf0a6ca23f0 100644
--- a/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_gettimezoneinformation_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetTimeZoneInformation/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt
index e039d46ccd33..b6f08b1f7dbc 100644
--- a/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getuserdefaultlcid_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetUserDefaultLCID/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt
index 71fa0464bbf0..8fc795a52bda 100644
--- a/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getuserdefaultlangid_test1
diff --git a/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/test1.c b/src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/GetUserDefaultLangID/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt
index ad5ad7508d66..e9b22dcfc563 100644
--- a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isdbcsleadbyte_test1
diff --git a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/test1.c b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/IsDBCSLeadByte/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt
index 9d53ee9b3ba2..f3a232b14337 100644
--- a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isdbcsleadbyteex_test1
diff --git a/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/test1.c b/src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/IsDBCSLeadByteEx/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt
index d87e8c0d6b0e..ae12b3795042 100644
--- a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isvalidcodepage_test1
diff --git a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/test1.c b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/IsValidCodePage/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt
index adcae86ff912..6eeff25d4dc2 100644
--- a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_isvalidcodepage_test2
diff --git a/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/test2.c b/src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/test2.c
rename to src/pal/tests/palsuite/locale_info/IsValidCodePage/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt
index 8fc7604a49c5..27d61693b034 100644
--- a/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isvalidlocale_test1
diff --git a/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/test1.c b/src/pal/tests/palsuite/locale_info/IsValidLocale/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/IsValidLocale/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/IsValidLocale/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt
index 044c47712b62..7bf79e36a7ba 100644
--- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_multibytetowidechar_test1
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.c b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt
index 0367d5393842..b3e3f64c5c6f 100644
--- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_multibytetowidechar_test2
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.c b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.c
rename to src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt
index 57e3d66fafef..c6eac9bd60f5 100644
--- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_multibytetowidechar_test3
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.c b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.c
rename to src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt
index 3d167dff7c81..c9c92952f24b 100644
--- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_multibytetowidechar_test4
diff --git a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.c b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.cpp
similarity index 99%
rename from src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.c
rename to src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.cpp
index 2ba606cf35cb..1d7234640b46 100644
--- a/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.c
+++ b/src/pal/tests/palsuite/locale_info/MultiByteToWideChar/test4/test4.cpp
@@ -208,7 +208,7 @@ int __cdecl main(int argc, char *argv[])
     for (int i = 0; i < (sizeof(utf8Strings) / sizeof(utf8Strings[0])); i++)
     {
         ret = MultiByteToWideChar(CP_UTF8, 0, utf8Strings[i], -1, NULL, 0);
-        WCHAR* wideBuffer = malloc(ret * sizeof(WCHAR));
+        WCHAR* wideBuffer = (WCHAR*)malloc(ret * sizeof(WCHAR));
         ret2 = MultiByteToWideChar(CP_UTF8, 0, utf8Strings[i], -1, wideBuffer, ret);
         if (ret != ret2)
         {
@@ -227,4 +227,4 @@ int __cdecl main(int argc, char *argv[])
     PAL_Terminate();
 
     return PASS;
-}
\ No newline at end of file
+}
diff --git a/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt
index 85824dd83688..5ac7433c9874 100644
--- a/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_setthreadlocale_test1
diff --git a/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/test1.c b/src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/SetThreadLocale/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt
index 0d1d12b41e5f..07dae640f1bc 100644
--- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_widechartomultibyte_test1
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.c b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.c
rename to src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt
index bbfad2ca9f6a..99c64afa2a2e 100644
--- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_widechartomultibyte_test2
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.c b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.c
rename to src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt
index 0edfd7393123..70dabead6fb4 100644
--- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_widechartomultibyte_test3
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.c b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.c
rename to src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt
index f0ffd84ee999..8839c191832e 100644
--- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_widechartomultibyte_test4
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.c b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.c
rename to src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt
index 6ca2a628bf67..e00657879d76 100644
--- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_widechartomultibyte_test5
diff --git a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.c b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.cpp
similarity index 99%
rename from src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.c
rename to src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.cpp
index 3ca0d90d0f3b..393516a19868 100644
--- a/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.c
+++ b/src/pal/tests/palsuite/locale_info/WideCharToMultiByte/test5/test5.cpp
@@ -132,7 +132,7 @@ int __cdecl main(int argc, char *argv[])
     for (int i = 0; i < (sizeof(unicodeStrings) / sizeof(unicodeStrings[0])); i++)
     {
         ret = WideCharToMultiByte(CP_UTF8, 0, unicodeStrings[i], -1, NULL, 0, NULL, NULL);
-        CHAR* utf8Buffer = malloc(ret * sizeof(CHAR));
+        CHAR* utf8Buffer = (CHAR*)malloc(ret * sizeof(CHAR));
         ret2 = WideCharToMultiByte(CP_UTF8, 0, unicodeStrings[i], -1, utf8Buffer, ret, NULL, NULL);
         if (ret != ret2)
         {
@@ -151,4 +151,4 @@ int __cdecl main(int argc, char *argv[])
     PAL_Terminate();
 
     return PASS;
-}
\ No newline at end of file
+}
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt
index 8506d867376a..23df52b43074 100644
--- a/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_charnexta_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/test.c b/src/pal/tests/palsuite/miscellaneous/CharNextA/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/CharNextA/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/CharNextA/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt
index 04f4679630dd..5f089e963cbc 100644
--- a/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_charnexta_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/test.c b/src/pal/tests/palsuite/miscellaneous/CharNextA/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/CharNextA/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/CharNextA/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt
index bfa12b5526c5..ae1433f08972 100644
--- a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_charnextexa_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/test.c b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/CharNextExA/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt
index 556043abcd08..1c81d1f9a421 100644
--- a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_charnextexa_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/test.c b/src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/CharNextExA/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt
index bbe37ddd19aa..78bb701959be 100644
--- a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_closehandle_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.c b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.cpp
index 8e42229c29f9..443f89bacefa 100644
--- a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test1/test.cpp
@@ -30,7 +30,7 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    WriteBuffer = malloc(sizeof(WORD));
+    WriteBuffer = (LPDWORD)malloc(sizeof(WORD));
     
     if ( WriteBuffer == NULL )
     {
diff --git a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt
index 75de513be78f..18350f20ad92 100644
--- a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_closehandle_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.c b/src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/CloseHandle/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt
index af878cb87371..15a0f572bb42 100644
--- a/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_createpipe_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.c b/src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.c
rename to src/pal/tests/palsuite/miscellaneous/CreatePipe/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt
index fbd8b0f87db3..47ee4b0abd37 100644
--- a/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_flushinstructioncache_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.c b/src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.c
rename to src/pal/tests/palsuite/miscellaneous/FlushInstructionCache/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt
index 0f242e9b302f..df914828551b 100644
--- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_formatmessagew_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/FormatMessageW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt
index 26092ac300d6..818649aac78c 100644
--- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_formatmessagew_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.c b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/FormatMessageW/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt
index b430511c4c06..516d4bcc9ac9 100644
--- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_formatmessagew_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.c b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.c
rename to src/pal/tests/palsuite/miscellaneous/FormatMessageW/test3/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt
index cae8ff149c29..642727c6dca9 100644
--- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_formatmessagew_test4
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.c b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.c
rename to src/pal/tests/palsuite/miscellaneous/FormatMessageW/test4/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt
index 6779f94ff9df..bae113475da3 100644
--- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_formatmessagew_test5
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.c b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.c
rename to src/pal/tests/palsuite/miscellaneous/FormatMessageW/test5/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt
index 450b2b808b8c..f403cba0f41c 100644
--- a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_formatmessagew_test6
diff --git a/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.c b/src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.c
rename to src/pal/tests/palsuite/miscellaneous/FormatMessageW/test6/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt
index be39b63ec9e9..206707efa609 100644
--- a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_freeenvironmentstringsw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt
index a3688dd24ae4..d8197d1c904f 100644
--- a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_freeenvironmentstringsw_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.c b/src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/FreeEnvironmentStringsW/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt
index e3acf4061a94..92cabba4280c 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetCalendarInfoW.c
+  GetCalendarInfoW.cpp
 )
 
 add_executable(paltest_getcalendarinfow_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/GetCalendarInfoW.c b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/GetCalendarInfoW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/GetCalendarInfoW.c
rename to src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test1/GetCalendarInfoW.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt
index cbfd1aa5db33..0cfc9679e78c 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetCalendarInfoW.c
+  GetCalendarInfoW.cpp
 )
 
 add_executable(paltest_getcalendarinfow_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/GetCalendarInfoW.c b/src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/GetCalendarInfoW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/GetCalendarInfoW.c
rename to src/pal/tests/palsuite/miscellaneous/GetCalendarInfoW/test2/GetCalendarInfoW.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt
index 491fdca9b562..d15b84a59e6c 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getcommandlinew_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.cpp
index d8a81746b696..3417c149a00c 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetCommandLineW/test1/test.cpp
@@ -31,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    CommandLine = malloc(1024);
+    CommandLine = (WCHAR*)malloc(1024);
     wcscpy(CommandLine,convert(argv[0]));
 
     for(i=1;i<argc;++i) 
diff --git a/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt
index 980dae88ae99..0ce9ac07b7c5 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getcomputernamew_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetComputerNameW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt
index 5a340c6cfb91..04ef85b74dfc 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetDateFormatW_neg.c
+  GetDateFormatW_neg.cpp
 )
 
 add_executable(paltest_getdateformatw_getdateformatw_neg1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/GetDateFormatW_neg.c b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/GetDateFormatW_neg.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/GetDateFormatW_neg.c
rename to src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/GetDateFormatW_neg.cpp
index c64dc74cb63d..96a481167fe9 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/GetDateFormatW_neg.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg1/GetDateFormatW_neg.cpp
@@ -55,7 +55,7 @@ int __cdecl main(int argc, char *argv[])
         Fail("\nRetrieved an invalid buffer size\n");
     }
 
-    wpBuffer = malloc((DateSize + 1)*sizeof(WCHAR));
+    wpBuffer = (WCHAR*)malloc((DateSize + 1)*sizeof(WCHAR));
     if(NULL == wpBuffer)
     {
         free(wpFormat);
diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt
index 646de9160bd1..fcd56fc7f2e8 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetDateFormatW_neg.c
+  GetDateFormatW_neg.cpp
 )
 
 add_executable(paltest_getdateformatw_getdateformatw_neg2
diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/GetDateFormatW_neg.c b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/GetDateFormatW_neg.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/GetDateFormatW_neg.c
rename to src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/GetDateFormatW_neg.cpp
index 676038f03afb..43f32cf69e3e 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/GetDateFormatW_neg.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/GetDateFormatW_neg2/GetDateFormatW_neg.cpp
@@ -67,7 +67,7 @@ int __cdecl main(int argc, char *argv[])
         Fail("\nRetrieved an invalid buffer size\n");
     }
 
-    wpBuffer = malloc((DateSize + 1)*sizeof(WCHAR));
+    wpBuffer = (WCHAR*)malloc((DateSize + 1)*sizeof(WCHAR));
     if(NULL == wpBuffer)
     {
         free(wpFormat);
diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt
index 8c1e4b024e77..bd8637061156 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  GetDateFormatW.c
+  GetDateFormatW.cpp
 )
 
 add_executable(paltest_getdateformatw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/GetDateFormatW.c b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/GetDateFormatW.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/GetDateFormatW.c
rename to src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/GetDateFormatW.cpp
index 264e397a4934..6e3c3b4894e5 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/GetDateFormatW.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetDateFormatW/test1/GetDateFormatW.cpp
@@ -68,7 +68,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
 
-    wpBuffer = malloc((DateSize+1)*sizeof(WCHAR));
+    wpBuffer = (WCHAR*)malloc((DateSize+1)*sizeof(WCHAR));
     if(NULL == wpBuffer)
     {
         free(wpFormat);
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt
index 306400e55804..3a745fdbd340 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentstringsw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentStringsW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt
index 184a6ef1f0cd..0721fd60b742 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablea_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.cpp
similarity index 98%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.cpp
index 8862e823bc09..23e99744672d 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test1/test.cpp
@@ -37,7 +37,7 @@ int __cdecl main(int argc, char *argv[]) {
     size = ReturnValueForLargeBuffer = GetEnvironmentVariable("PATH",        
                                                               pResultBuffer,  
                                                               0);             
-    pResultBuffer = malloc(size);
+    pResultBuffer = (char*)malloc(size);
     if ( pResultBuffer == NULL )
      {
 	Fail("ERROR: Failed to allocate memory for pResultBuffer pointer. "
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt
index abfd73f45876..a9be98336904 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablea_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt
index a63c11b1a399..1c35eba54dc1 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablea_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test3/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt
index 76cfdb6d492b..331ea8ca6b4f 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablea_test4
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.cpp
similarity index 98%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.cpp
index 1fea5719b418..a09eb883e355 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test4/test.cpp
@@ -45,7 +45,7 @@ int __cdecl main(int argc, char *argv[]) {
                                   pResultBuffer,     // Buffer for Value
                                   0);                // Buffer size
   
-    pResultBuffer = malloc(size);
+    pResultBuffer = (char*)malloc(size);
     if ( pResultBuffer == NULL )
      {
 	Fail("ERROR: Failed to allocate memory for pResultBuffer pointer. "
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt
index 548d86bb03a1..69bedf49477b 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_getenvironmentvariablea_test5
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.cpp
index 8d63a1aecb92..19a4d25b64e6 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test5/test5.cpp
@@ -64,7 +64,7 @@ int __cdecl main(int argc, char *argv[])
     /* To account for the null character at the end of the string */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(char)*size);
+    pResultBuffer = (char*)malloc(sizeof(char)*size);
     if ( pResultBuffer == NULL )
     {
 	    Fail("ERROR: Failed to allocate memory for pResultBuffer pointer\n.");
@@ -105,7 +105,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Reallocate the memory for the string */
-    pResultBuffer = malloc(sizeof(char)*size);
+    pResultBuffer = (char*)malloc(sizeof(char)*size);
     if ( pResultBuffer == NULL )
     {
 	    Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.");
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt
index a0873bb7e7dc..38c186740fb9 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_getenvironmentvariablea_test6
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.cpp
similarity index 98%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.cpp
index 8ef7571f591d..837036a0a93c 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableA/test6/test6.cpp
@@ -59,7 +59,7 @@ int __cdecl main(int argc, char *argv[])
     /* To account for the nul character at the end of the string */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(char)*size);
+    pResultBuffer = (char*)malloc(sizeof(char)*size);
     if ( pResultBuffer == NULL )
     {
 	    Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt
index 567c99246162..a3cb878ef47b 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablew_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.cpp
index 6c764509d05a..cb5fc00554f6 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test1/test.cpp
@@ -39,7 +39,7 @@ int __cdecl main(int argc, char *argv[])
                                pResultBuffer,  
                                0);
   
-    pResultBuffer = malloc(size*sizeof(WCHAR));
+    pResultBuffer = (WCHAR*)malloc(size*sizeof(WCHAR));
     if ( pResultBuffer == NULL )
     {
 	Fail("ERROR: Failed to allocate memory for pResultBuffer pointer. "
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt
index 7234f61ed32e..2c6ec6247e61 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablew_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt
index bafd75e52e44..6af382b6cda9 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablew_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test3/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt
index f870bd6b2256..674b187fa72a 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getenvironmentvariablew_test4
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.cpp
similarity index 96%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.cpp
index b5894efc6ea3..1ee3e72c9d0c 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test4/test.cpp
@@ -43,7 +43,7 @@ int __cdecl main(int argc, char *argv[]) {
                                   pResultBuffer,        // Buffer for Value
                                   0);                   // Buffer size
   
-    pResultBuffer = malloc(size*sizeof(WCHAR));
+    pResultBuffer = (WCHAR*)malloc(size*sizeof(WCHAR));
   
     GetEnvironmentVariable(convert("PALTEST"),
                            pResultBuffer,
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt
index ab44781279fd..71e974703bc3 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_getenvironmentvariablew_test5
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.cpp
index 58eba3a38024..179fc17f0b7a 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test5/test5.cpp
@@ -63,7 +63,7 @@ int __cdecl main(int argc, char *argv[])
     /* To account for the nul character at the end of the string */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(WCHAR)*size);
+    pResultBuffer = (WCHAR*)malloc(sizeof(WCHAR)*size);
     if ( pResultBuffer == NULL )
     {
 	    Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
@@ -104,7 +104,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /* Reallocate the memory for the string */
-    pResultBuffer = malloc(sizeof(WCHAR)*size);
+    pResultBuffer = (WCHAR*)malloc(sizeof(WCHAR)*size);
     if ( pResultBuffer == NULL )
     {
 	    Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt
index e504c8323ad9..8771ab0cc861 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_getenvironmentvariablew_test6
diff --git a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.c b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.cpp
similarity index 98%
rename from src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.c
rename to src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.cpp
index 85f31be9c2fe..e37695084134 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.c
+++ b/src/pal/tests/palsuite/miscellaneous/GetEnvironmentVariableW/test6/test6.cpp
@@ -59,7 +59,7 @@ int __cdecl main(int argc, char *argv[])
     /* To account for the nul character at the end of the string */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(WCHAR)*size);
+    pResultBuffer = (WCHAR*)malloc(sizeof(WCHAR)*size);
     if ( pResultBuffer == NULL )
     {
 	    Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
diff --git a/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt
index 09e650c924af..3c851c726026 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getlasterror_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetLastError/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt
index 960291fe79d2..941951712845 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getsysteminfo_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetSystemInfo/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt
index 5c6ea26a4148..f7be23bc0b94 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_gettickcount_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetTickCount/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt
index a1d5ab21b8ff..8ed7ace07329 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getusernamew_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetUserNameW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt
index b9dd711d3627..2cb305f22b0f 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getversionexa_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetVersionExA/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt
index d7eb683343dc..09494240ccdd 100644
--- a/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_getversionexw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/GetVersionExW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/CMakeLists.txt
index d41e6bc5ab1a..bc3f11b705f8 100644
--- a/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_isbadcodeptr_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.c b/src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.c
rename to src/pal/tests/palsuite/miscellaneous/IsBadCodePtr/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/CMakeLists.txt
index f1e84d73b859..82aecefa7028 100644
--- a/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_isbadreadptr_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.c b/src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/IsBadReadPtr/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/CMakeLists.txt
index 2b2e6aae2eae..e3a08167b3a3 100644
--- a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_isbadwriteptr_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.c b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/CMakeLists.txt
index c033f8054fe8..718cbaa297a3 100644
--- a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_isbadwriteptr_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.c b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.c
rename to src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/CMakeLists.txt
index 32cb901e8ddd..0efd3179db00 100644
--- a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_isbadwriteptr_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.c b/src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.c
rename to src/pal/tests/palsuite/miscellaneous/IsBadWritePtr/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/CMakeLists.txt
index 5e77e8ba9826..bc80853ea1c2 100644
--- a/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_messageboxw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/MessageBoxW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/CMakeLists.txt
index 4b0af2e77e11..b8993af4cfa9 100644
--- a/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_messageboxw_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.c b/src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/MessageBoxW/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/CMakeLists.txt
index b66248522b93..5d63281eabb3 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_setenvironmentvariablea_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/CMakeLists.txt
index c062c6df65c8..fe05887c3e7a 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_setenvironmentvariablea_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/CMakeLists.txt
index 159f574abeaf..98c9dc0a6347 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_setenvironmentvariablea_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.cpp
index fa24275da78e..539e33004b8d 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.c
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test3/test3.cpp
@@ -76,7 +76,7 @@ int __cdecl main(int argc, char *argv[])
     /* increase size to account for the null char at the end */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(char)*size);
+    pResultBuffer = (char*)malloc(sizeof(char)*size);
     if ( pResultBuffer == NULL )
     {
         Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
@@ -107,7 +107,7 @@ int __cdecl main(int argc, char *argv[])
     free(pResultBuffer);
 
     /* Reallocate the memory for the string */
-    pResultBuffer = malloc(sizeof(char)*size);
+    pResultBuffer = (char*)malloc(sizeof(char)*size);
     if ( pResultBuffer == NULL )
     {
         Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/CMakeLists.txt
index 29cca8d7b42c..1c53d4b6a16c 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_setenvironmentvariablea_test4
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.cpp
similarity index 98%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.cpp
index 557cef74c97d..de3059c8d834 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.c
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableA/test4/test4.cpp
@@ -59,7 +59,7 @@ int __cdecl main(int argc, char *argv[])
     /* To account for the null character at the end of the string */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(char)*size);
+    pResultBuffer = (char*)malloc(sizeof(char)*size);
     if ( pResultBuffer == NULL )
     {
         Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/CMakeLists.txt
index 247dceefd9ac..6eb52ab92e33 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_setenvironmentvariablew_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/CMakeLists.txt
index a69343ccd530..a82d849bde2f 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_setenvironmentvariablew_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/CMakeLists.txt
index e9072c714308..266231e6e9ae 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_setenvironmentvariablew_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.cpp
similarity index 97%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.cpp
index 02d0a2d6d9f6..5c4d4eba42a2 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.c
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test3/test3.cpp
@@ -76,7 +76,7 @@ int __cdecl main(int argc, char *argv[])
     /* Increase size to account for the null char at the end */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(WCHAR)*size);
+    pResultBuffer = (WCHAR*)malloc(sizeof(WCHAR)*size);
     if ( pResultBuffer == NULL )
     {
         Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
@@ -106,7 +106,7 @@ int __cdecl main(int argc, char *argv[])
     free(pResultBuffer);
 
     /* Reallocate the memory for the string */
-    pResultBuffer = malloc(sizeof(WCHAR)*size);
+    pResultBuffer = (WCHAR*)malloc(sizeof(WCHAR)*size);
     if ( pResultBuffer == NULL )
     {
         Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/CMakeLists.txt
index f5f48bab3356..c82e0f0394f7 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_setenvironmentvariablew_test4
diff --git a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.c b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.cpp
similarity index 98%
rename from src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.c
rename to src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.cpp
index b8f7734de477..50c59d6e97a8 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.c
+++ b/src/pal/tests/palsuite/miscellaneous/SetEnvironmentVariableW/test4/test4.cpp
@@ -59,7 +59,7 @@ int __cdecl main(int argc, char *argv[])
     /* To account for the nul character at the end of the string */
     size = size + 1;
     
-    pResultBuffer = malloc(sizeof(WCHAR)*size);
+    pResultBuffer = (WCHAR*)malloc(sizeof(WCHAR)*size);
     if ( pResultBuffer == NULL )
     {
         Fail("ERROR: Failed to allocate memory for pResultBuffer pointer.\n");
diff --git a/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/CMakeLists.txt
index 5248d6ce97bf..40eb2ff865d3 100644
--- a/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_setlasterror_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.c b/src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/SetLastError/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/CMakeLists.txt
index 6876d1b24efb..c3c4b6199986 100644
--- a/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_i64tow_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.c b/src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.c
rename to src/pal/tests/palsuite/miscellaneous/_i64tow/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/CMakeLists.txt
index f920c4bded16..aadace5cbd75 100644
--- a/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  _ui64tow.c
+  _ui64tow.cpp
 )
 
 add_executable(paltest_ui64tow_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/_ui64tow.c b/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/_ui64tow.cpp
similarity index 94%
rename from src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/_ui64tow.c
rename to src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/_ui64tow.cpp
index fb94f2509ffd..b6710d1440b1 100644
--- a/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/_ui64tow.c
+++ b/src/pal/tests/palsuite/miscellaneous/_ui64tow/test1/_ui64tow.cpp
@@ -31,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
         return FAIL;
     }
 
-    wpBuffer = malloc(64 * sizeof(WCHAR));
+    wpBuffer = (WCHAR*)malloc(64 * sizeof(WCHAR));
     if(NULL == wpBuffer)
     {
         Fail("\nFail to allocate the buffer to save a converted "
@@ -53,7 +53,7 @@ int __cdecl main(int argc, char *argv[])
     free(pChar);
     free(wpBuffer);    
 
-    wpBuffer = malloc(64 * sizeof(WCHAR));
+    wpBuffer = (WCHAR*)malloc(64 * sizeof(WCHAR));
     if(NULL == wpBuffer)
     {
         Fail("\nFail to allocate the buffer to save a converted "
@@ -75,7 +75,7 @@ int __cdecl main(int argc, char *argv[])
     free(pChar);
     free(wpBuffer);    
 
-    wpBuffer = malloc(64 * sizeof(WCHAR));
+    wpBuffer = (WCHAR*)malloc(64 * sizeof(WCHAR));
     if(NULL == wpBuffer)
     {
         Fail("\nFail to allocate the buffer to save a converted "
diff --git a/src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/CMakeLists.txt
index b4feb4b8fdcc..38150e5ac947 100644
--- a/src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  _ui64tow.c
+  _ui64tow.cpp
 )
 
 add_executable(paltest_ui64tow_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/_ui64tow.c b/src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/_ui64tow.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/_ui64tow.c
rename to src/pal/tests/palsuite/miscellaneous/_ui64tow/test2/_ui64tow.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/CMakeLists.txt
index aa5b0c2646d9..61396efb5016 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_lstrcatw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/lstrcatW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/CMakeLists.txt
index 8a11c8f15445..899b90341344 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_lstrcatw_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/test2.c b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/test2.c
rename to src/pal/tests/palsuite/miscellaneous/lstrcatW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/CMakeLists.txt
index 1cdecedf1ad8..23b966cf9f01 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_lstrcatw_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/test3.c b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/test3.c
rename to src/pal/tests/palsuite/miscellaneous/lstrcatW/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/CMakeLists.txt
index 640c224f830a..c3d6568c5e2e 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_lstrcatw_test4
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/test4.c b/src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/test4.c
rename to src/pal/tests/palsuite/miscellaneous/lstrcatW/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/CMakeLists.txt
index e39c9a609891..a758686b169c 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_lstrcpyw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/lstrcpyW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/CMakeLists.txt
index 4344b89402b7..e3a0b009d00f 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_lstrcpynw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/lstrcpynW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/CMakeLists.txt
index 807a5d83b98a..6bb520100d6f 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_lstrlena_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/test.c b/src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/lstrlenA/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/CMakeLists.txt
index fe6fc9691b30..4209cbee890d 100644
--- a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_lstrlenw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/lstrlenW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/CMakeLists.txt
index d76467aeabdb..ba53f42ccc2f 100644
--- a/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_queryperformancecounter_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.c b/src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.c
rename to src/pal/tests/palsuite/miscellaneous/queryperformancecounter/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/CMakeLists.txt
index 352e51342d89..bc6bd22d5d8a 100644
--- a/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_queryperformancefrequency_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.c b/src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.c
rename to src/pal/tests/palsuite/miscellaneous/queryperformancefrequency/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/CMakeLists.txt
index ef589329f013..9818961cc0f8 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/CMakeLists.txt
index 92c44b934141..b7a4610dcdac 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test11
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test11/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/CMakeLists.txt
index e4013ad9e346..757cb6fda381 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test12
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test12/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/CMakeLists.txt
index 423b05d8d9a4..5d3550ae1a6a 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test13
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test13/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/CMakeLists.txt
index 546a1daa3876..4129e9afc6df 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/CMakeLists.txt
index 8043ccd60bcd..1b6b76fb5272 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test3/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/CMakeLists.txt
index 6a5caf95c223..2262e371cd07 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test6
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test6/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/CMakeLists.txt
index 0885f0f21e43..f554088513cf 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test7
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test7/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/CMakeLists.txt
index 3c4b5ed36efd..9b522c4ea566 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test8
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test8/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/CMakeLists.txt
index dcbb22ebb5bb..c26eb59856f5 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfa_test9
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfA/test9/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/CMakeLists.txt
index b1c0fb3d0bd4..c5d1e40c95a3 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test1
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test1/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/CMakeLists.txt
index a5d73ed41348..37a79ed23755 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test11
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test11/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/CMakeLists.txt
index 3811fb07c96c..5797166c3bf4 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test12
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test12/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/CMakeLists.txt
index 617abb854c7f..73a08b6240b0 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test13
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test13/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/CMakeLists.txt
index 00b26da2e6bb..6412871f2049 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test2
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test2/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/CMakeLists.txt
index 25c6185d12d7..f7ea0d4e2258 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test3
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test3/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/CMakeLists.txt
index c63a4d5c820a..f0df7a3f1465 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test6
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test6/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/CMakeLists.txt
index 25e43107ff1a..0a97aa7effd3 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test7
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test7/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/CMakeLists.txt
index a6478a2af086..dfabec45d758 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test8
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test8/test.cpp
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/CMakeLists.txt b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/CMakeLists.txt
index e09867b1a714..9a573b0691b6 100644
--- a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_wsprintfw_test9
diff --git a/src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/test.c b/src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/test.c
rename to src/pal/tests/palsuite/miscellaneous/wsprintfW/test9/test.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/CMakeLists.txt
index bf1d3a91e758..515815f9d2bf 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_GetPALDirectoryW.c
+  PAL_GetPALDirectoryW.cpp
 )
 
 add_executable(paltest_pal_getpaldirectoryw_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.c b/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp
similarity index 97%
rename from src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.c
rename to src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp
index 2c67aa495490..856bfe865981 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.c
+++ b/src/pal/tests/palsuite/pal_specific/PAL_GetPALDirectoryW/test1/PAL_GetPALDirectoryW.cpp
@@ -31,7 +31,7 @@ int __cdecl main(int argc, char *argv[])
     }
 
     /*allocate momory to store the directory name*/
-    wpDirectoryName = malloc(MAX_PATH*sizeof(WCHAR));
+    wpDirectoryName = (WCHAR*)malloc(MAX_PATH*sizeof(WCHAR));
     if(NULL == wpDirectoryName)
     {
         Fail("\nFailed to allocate memory for storing directory name!\n");
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/CMakeLists.txt
index e8d3c4056502..26eb1a860b52 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_GetUserTempDirectoryW.c
+  PAL_GetUserTempDirectoryW.cpp
 )
 
 add_executable(paltest_pal_getusertempdirectoryw_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.c b/src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.c
rename to src/pal/tests/palsuite/pal_specific/PAL_GetUserTempDirectoryW/test1/PAL_GetUserTempDirectoryW.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/CMakeLists.txt
index 416439d650e9..281efcd8be99 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_Initialize_Terminate.c
+  PAL_Initialize_Terminate.cpp
 )
 
 add_executable(paltest_pal_initialize_terminate_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.c b/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.c
rename to src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test1/PAL_Initialize_Terminate.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/CMakeLists.txt
index b7661fd24098..46b42aa7141d 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_initialize_twice.c
+  pal_initialize_twice.cpp
 )
 
 add_executable(paltest_pal_initialize_terminate_test2
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.c b/src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.c
rename to src/pal/tests/palsuite/pal_specific/PAL_Initialize_Terminate/test2/pal_initialize_twice.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/CMakeLists.txt
index 2379694b2441..573ab3834add 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_RegisterLibraryW_UnregisterLibraryW.c
+  PAL_RegisterLibraryW_UnregisterLibraryW.cpp
 )
 
 add_executable(paltest_pal_registerlibraryw_unregisterlibraryw_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.c b/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.c
rename to src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test1/PAL_RegisterLibraryW_UnregisterLibraryW.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/CMakeLists.txt
index bbcb35933e85..ef5c0479b764 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  reg_unreg_libraryw_neg.c
+  reg_unreg_libraryw_neg.cpp
 )
 
 add_executable(paltest_reg_unreg_libraryw_neg
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.c b/src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.c
rename to src/pal/tests/palsuite/pal_specific/PAL_RegisterLibraryW_UnregisterLibraryW/test2_neg/reg_unreg_libraryw_neg.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/CMakeLists.txt
index 59922b194bba..d20ddd9a43c5 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_errno.c
+  PAL_errno.cpp
 )
 
 add_executable(paltest_pal_errno_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.c b/src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.c
rename to src/pal/tests/palsuite/pal_specific/PAL_errno/test1/PAL_errno.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/CMakeLists.txt
index 3436a2dfdb95..dbedac95f552 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_get_stderr.c
+  PAL_get_stderr.cpp
 )
 
 add_executable(paltest_pal_get_stderr_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.c b/src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.c
rename to src/pal/tests/palsuite/pal_specific/PAL_get_stderr/test1/PAL_get_stderr.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/CMakeLists.txt
index 592895b18c82..4d714a373522 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_get_stdin.c
+  PAL_get_stdin.cpp
 )
 
 add_executable(paltest_pal_get_stdin_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.c b/src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.c
rename to src/pal/tests/palsuite/pal_specific/PAL_get_stdin/test1/PAL_get_stdin.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/CMakeLists.txt
index 865dd52f16d7..4c2f51b50d04 100644
--- a/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  PAL_get_stdout.c
+  PAL_get_stdout.cpp
 )
 
 add_executable(paltest_pal_get_stdout_test1
diff --git a/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.c b/src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.c
rename to src/pal/tests/palsuite/pal_specific/PAL_get_stdout/test1/PAL_get_stdout.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/CMakeLists.txt
index cd18b769583f..82ff9225de1f 100644
--- a/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_entrypoint.c
+  pal_entrypoint.cpp
 )
 
 add_executable(paltest_pal_entrypoint_test1
diff --git a/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/pal_entrypoint.c b/src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/pal_entrypoint.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/pal_entrypoint.c
rename to src/pal/tests/palsuite/pal_specific/pal_entrypoint/test1/pal_entrypoint.cpp
diff --git a/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/CMakeLists.txt b/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/CMakeLists.txt
index f6e243d0c49c..56c9d02eaac4 100644
--- a/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  pal_initializedebug.c
+  pal_initializedebug.cpp
 )
 
 add_executable(paltest_pal_initializedebug_test1
diff --git a/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/pal_initializedebug.c b/src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/pal_initializedebug.cpp
similarity index 100%
rename from src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/pal_initializedebug.c
rename to src/pal/tests/palsuite/pal_specific/pal_initializedebug/test1/pal_initializedebug.cpp
diff --git a/src/pal/tests/palsuite/samples/test1/CMakeLists.txt b/src/pal/tests/palsuite/samples/test1/CMakeLists.txt
index da5892cfa61e..42f2ebdcdd59 100644
--- a/src/pal/tests/palsuite/samples/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/samples/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_samples_test1
diff --git a/src/pal/tests/palsuite/samples/test1/test.c b/src/pal/tests/palsuite/samples/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/samples/test1/test.c
rename to src/pal/tests/palsuite/samples/test1/test.cpp
diff --git a/src/pal/tests/palsuite/samples/test2/CMakeLists.txt b/src/pal/tests/palsuite/samples/test2/CMakeLists.txt
index fdef2aac6b94..1a7ce2918ea3 100644
--- a/src/pal/tests/palsuite/samples/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/samples/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_samples_test2
diff --git a/src/pal/tests/palsuite/samples/test2/test.c b/src/pal/tests/palsuite/samples/test2/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/samples/test2/test.c
rename to src/pal/tests/palsuite/samples/test2/test.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateEventA/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateEventA/test1/CMakeLists.txt
index da1232eea417..7be9481150c3 100644
--- a/src/pal/tests/palsuite/threading/CreateEventA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateEventA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_createeventa_test1
diff --git a/src/pal/tests/palsuite/threading/CreateEventA/test1/test1.c b/src/pal/tests/palsuite/threading/CreateEventA/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateEventA/test1/test1.c
rename to src/pal/tests/palsuite/threading/CreateEventA/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateEventA/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateEventA/test2/CMakeLists.txt
index f87e5bea87cb..9725c89721fe 100644
--- a/src/pal/tests/palsuite/threading/CreateEventA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateEventA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_createeventa_test2
diff --git a/src/pal/tests/palsuite/threading/CreateEventA/test2/test2.c b/src/pal/tests/palsuite/threading/CreateEventA/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateEventA/test2/test2.c
rename to src/pal/tests/palsuite/threading/CreateEventA/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateEventA/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateEventA/test3/CMakeLists.txt
index e33c404a7934..b596a881d591 100644
--- a/src/pal/tests/palsuite/threading/CreateEventA/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateEventA/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_createeventa_test3
diff --git a/src/pal/tests/palsuite/threading/CreateEventA/test3/test3.c b/src/pal/tests/palsuite/threading/CreateEventA/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateEventA/test3/test3.c
rename to src/pal/tests/palsuite/threading/CreateEventA/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateEventW/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateEventW/test1/CMakeLists.txt
index 0e8ba5bc2ac5..ef18312cdac0 100644
--- a/src/pal/tests/palsuite/threading/CreateEventW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateEventW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_createeventw_test1
diff --git a/src/pal/tests/palsuite/threading/CreateEventW/test1/test1.c b/src/pal/tests/palsuite/threading/CreateEventW/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateEventW/test1/test1.c
rename to src/pal/tests/palsuite/threading/CreateEventW/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateEventW/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateEventW/test2/CMakeLists.txt
index f6243774746a..7f9543e0cba3 100644
--- a/src/pal/tests/palsuite/threading/CreateEventW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateEventW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_createeventw_test2
diff --git a/src/pal/tests/palsuite/threading/CreateEventW/test2/test2.c b/src/pal/tests/palsuite/threading/CreateEventW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateEventW/test2/test2.c
rename to src/pal/tests/palsuite/threading/CreateEventW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateEventW/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateEventW/test3/CMakeLists.txt
index 4493ba3872a7..6778740f7eb1 100644
--- a/src/pal/tests/palsuite/threading/CreateEventW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateEventW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_createeventw_test3
diff --git a/src/pal/tests/palsuite/threading/CreateEventW/test3/test3.c b/src/pal/tests/palsuite/threading/CreateEventW/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateEventW/test3/test3.c
rename to src/pal/tests/palsuite/threading/CreateEventW/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CMakeLists.txt
index ffdf13228e67..782c671b844f 100644
--- a/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateMutexA.c
+  CreateMutexA.cpp
 )
 
 add_executable(paltest_createmutexa_releasemutex_test1
diff --git a/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CreateMutexA.c b/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CreateMutexA.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CreateMutexA.c
rename to src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test1/CreateMutexA.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CMakeLists.txt
index 925c5d41f6aa..3540cb2b8c49 100644
--- a/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateMutexA.c
+  CreateMutexA.cpp
 )
 
 add_executable(paltest_createmutexa_releasemutex_test2
diff --git a/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CreateMutexA.c b/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CreateMutexA.cpp
similarity index 99%
rename from src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CreateMutexA.c
rename to src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CreateMutexA.cpp
index 3b83ba967414..36295855e04b 100644
--- a/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CreateMutexA.c
+++ b/src/pal/tests/palsuite/threading/CreateMutexA_ReleaseMutex/test2/CreateMutexA.cpp
@@ -94,7 +94,7 @@ int __cdecl main (int argc, char **argv)
         bFailures = TRUE;
     }
 
-    free(szMaxPath);
+    free((void*)szMaxPath);
 
 
     /*
@@ -165,7 +165,7 @@ BOOL TestNamedMutex(const char *szMutexName)
     {
         Trace("ERROR: CreateMutex #2 failed. GetLastError returned %u\n",
               GetLastError());
-        free(szMutexName);
+        free((void*)szMutexName);
         return FALSE;
     }
 
diff --git a/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CMakeLists.txt
index a73ee045a3a5..aa1f7831c092 100644
--- a/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateMutexW.c
+  CreateMutexW.cpp
 )
 
 add_executable(paltest_createmutexw_releasemutex_test1
diff --git a/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.c b/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.c
rename to src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test1/CreateMutexW.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CMakeLists.txt
index b40569b3f504..5a9095cb1bae 100644
--- a/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateMutexW.c
+  CreateMutexW.cpp
 )
 
 add_executable(paltest_createmutexw_releasemutex_test2
diff --git a/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.c b/src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.c
rename to src/pal/tests/palsuite/threading/CreateMutexW_ReleaseMutex/test2/CreateMutexW.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateProcessA/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateProcessA/test1/CMakeLists.txt
index 67e53edccdfe..9cd0aa5dfd25 100644
--- a/src/pal/tests/palsuite/threading/CreateProcessA/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateProcessA/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  parentProcess.c
+  parentProcess.cpp
 )
 
 add_executable(paltest_createprocessa_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_createprocessa_test1
 
 
 set(HELPERSOURCES
-  childProcess.c
+  childProcess.cpp
 )
 
 add_executable(paltest_createprocessa_test1_child
diff --git a/src/pal/tests/palsuite/threading/CreateProcessA/test1/childProcess.c b/src/pal/tests/palsuite/threading/CreateProcessA/test1/childProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateProcessA/test1/childProcess.c
rename to src/pal/tests/palsuite/threading/CreateProcessA/test1/childProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateProcessA/test1/parentProcess.c b/src/pal/tests/palsuite/threading/CreateProcessA/test1/parentProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateProcessA/test1/parentProcess.c
rename to src/pal/tests/palsuite/threading/CreateProcessA/test1/parentProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateProcessA/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateProcessA/test2/CMakeLists.txt
index b81ea2e978c2..f035f0a888c7 100644
--- a/src/pal/tests/palsuite/threading/CreateProcessA/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateProcessA/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  parentprocess.c
+  parentprocess.cpp
 )
 
 add_executable(paltest_createprocessa_test2
@@ -20,7 +20,7 @@ target_link_libraries(paltest_createprocessa_test2
 
 
 set(HELPERSOURCES
-  childprocess.c
+  childprocess.cpp
 )
 
 add_executable(paltest_createprocessa_test2_child
diff --git a/src/pal/tests/palsuite/threading/CreateProcessA/test2/childprocess.c b/src/pal/tests/palsuite/threading/CreateProcessA/test2/childprocess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateProcessA/test2/childprocess.c
rename to src/pal/tests/palsuite/threading/CreateProcessA/test2/childprocess.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateProcessA/test2/parentprocess.c b/src/pal/tests/palsuite/threading/CreateProcessA/test2/parentprocess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateProcessA/test2/parentprocess.c
rename to src/pal/tests/palsuite/threading/CreateProcessA/test2/parentprocess.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateProcessW/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateProcessW/test1/CMakeLists.txt
index 394b12452690..174d6fe3c7d1 100644
--- a/src/pal/tests/palsuite/threading/CreateProcessW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateProcessW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  parentProcess.c
+  parentProcess.cpp
 )
 
 add_executable(paltest_createprocessw_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_createprocessw_test1
 
 
 set(HELPERSOURCES
-  childProcess.c
+  childProcess.cpp
 )
 
 add_executable(paltest_createprocessw_test1_child
diff --git a/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.c b/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.cpp
similarity index 98%
rename from src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.c
rename to src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.cpp
index c71f967b6548..a7730c6d51d7 100644
--- a/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.c
+++ b/src/pal/tests/palsuite/threading/CreateProcessW/test1/childProcess.cpp
@@ -110,7 +110,7 @@ int __cdecl main( int argc, char **argv )
     }
     
     /* set the string length for the open call */
-    szAbsPathNameA = malloc (dwSize +1);    
+    szAbsPathNameA = (char*)malloc(dwSize +1);    
 
     if (NULL == szAbsPathNameA)
     {
diff --git a/src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.c b/src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.c
rename to src/pal/tests/palsuite/threading/CreateProcessW/test1/parentProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateProcessW/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateProcessW/test2/CMakeLists.txt
index 3feef213c4e2..021a0d2da223 100644
--- a/src/pal/tests/palsuite/threading/CreateProcessW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateProcessW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  parentprocess.c
+  parentprocess.cpp
 )
 
 add_executable(paltest_createprocessw_test2
@@ -20,7 +20,7 @@ target_link_libraries(paltest_createprocessw_test2
 
 
 set(HELPERSOURCES
-  childprocess.c
+  childprocess.cpp
 )
 
 add_executable(paltest_createprocessw_test2_child
diff --git a/src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.c b/src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.c
rename to src/pal/tests/palsuite/threading/CreateProcessW/test2/childprocess.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.c b/src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.c
rename to src/pal/tests/palsuite/threading/CreateProcessW/test2/parentprocess.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CMakeLists.txt
index f89e150a32c4..8a9255ce7a0a 100644
--- a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateSemaphore.c
+  CreateSemaphore.cpp
 )
 
 add_executable(paltest_createsemaphorea_releasesemaphore_test1
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CreateSemaphore.c b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CreateSemaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CreateSemaphore.c
rename to src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test1/CreateSemaphore.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CMakeLists.txt
index f3e01749b83c..6d1249bf05b5 100644
--- a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateSemaphore.c
+  CreateSemaphore.cpp
 )
 
 add_executable(paltest_createsemaphorea_releasesemaphore_test2
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CreateSemaphore.c b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CreateSemaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CreateSemaphore.c
rename to src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test2/CreateSemaphore.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/CMakeLists.txt
index 0c604d6ced24..94998f59a9dc 100644
--- a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createsemaphore.c
+  createsemaphore.cpp
 )
 
 add_executable(paltest_createsemaphorea_releasesemaphore_test3
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/createsemaphore.c b/src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/createsemaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/createsemaphore.c
rename to src/pal/tests/palsuite/threading/CreateSemaphoreA_ReleaseSemaphore/test3/createsemaphore.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CMakeLists.txt
index b40f2695bc41..32902cf914cf 100644
--- a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateSemaphore.c
+  CreateSemaphore.cpp
 )
 
 add_executable(paltest_createsemaphorew_releasesemaphore_test1
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.c b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.c
rename to src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test1/CreateSemaphore.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CMakeLists.txt
index b14284d08f4f..bd0a5a6e53d5 100644
--- a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  CreateSemaphore.c
+  CreateSemaphore.cpp
 )
 
 add_executable(paltest_createsemaphorew_releasesemaphore_test2
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.c b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.c
rename to src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test2/CreateSemaphore.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/CMakeLists.txt
index f7f090576108..d0340c64cbbc 100644
--- a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  createsemaphore.c
+  createsemaphore.cpp
 )
 
 add_executable(paltest_createsemaphorew_releasesemaphore_test3
diff --git a/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.c b/src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.c
rename to src/pal/tests/palsuite/threading/CreateSemaphoreW_ReleaseSemaphore/test3/createsemaphore.cpp
diff --git a/src/pal/tests/palsuite/threading/CreateThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateThread/test1/CMakeLists.txt
index d3921c440979..b47afe498ae4 100644
--- a/src/pal/tests/palsuite/threading/CreateThread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateThread/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_createthread_test1
diff --git a/src/pal/tests/palsuite/threading/CreateThread/test1/test1.c b/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp
similarity index 98%
rename from src/pal/tests/palsuite/threading/CreateThread/test1/test1.c
rename to src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp
index 2dd2f6acb624..dda25f1f4b53 100644
--- a/src/pal/tests/palsuite/threading/CreateThread/test1/test1.c
+++ b/src/pal/tests/palsuite/threading/CreateThread/test1/test1.cpp
@@ -41,7 +41,7 @@ BOOL CreateThreadTest()
     LPSECURITY_ATTRIBUTES lpThreadAttributes = NULL;
     DWORD dwStackSize = 0; 
     LPTHREAD_START_ROUTINE lpStartAddress =  &CreateThreadTestThread;
-    LPVOID lpParameter = lpStartAddress;
+    LPVOID lpParameter = (LPVOID)lpStartAddress;
     DWORD dwCreationFlags = 0;  /* run immediately */
     DWORD dwThreadId = 0;
 
diff --git a/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt
index 350cf66e9b06..47877607b98b 100644
--- a/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateThread/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_createthread_test2
diff --git a/src/pal/tests/palsuite/threading/CreateThread/test2/test2.c b/src/pal/tests/palsuite/threading/CreateThread/test2/test2.cpp
similarity index 96%
rename from src/pal/tests/palsuite/threading/CreateThread/test2/test2.c
rename to src/pal/tests/palsuite/threading/CreateThread/test2/test2.cpp
index f64c32ea87f5..1ee410a6c5b4 100644
--- a/src/pal/tests/palsuite/threading/CreateThread/test2/test2.c
+++ b/src/pal/tests/palsuite/threading/CreateThread/test2/test2.cpp
@@ -34,14 +34,14 @@ struct testCase
     DWORD dwStackSize;
     LPTHREAD_START_ROUTINE lpStartAddress;
     DWORD dwCreationFlags;
-    LPVOID lpThreadId;
+    LPDWORD lpThreadId;
 };
 
 struct testCase testCases[]=
 {
     {NULL, 0, &Thread, 0, NULL},
     {NULL, 0, &Thread, CREATE_SUSPENDED, NULL},
-    {NULL, 0, &Thread, 0, (LPVOID) 1}
+    {NULL, 0, &Thread, 0, (LPDWORD) 1}
 };
 
 /*
@@ -94,7 +94,7 @@ int __cdecl main(int argc, char **argv)
         hThread[i] = CreateThread( testCases[i].lpThreadAttributes,   
                                    testCases[i].dwStackSize,          
                                    testCases[i].lpStartAddress,       
-                                   (LPVOID) i,
+                                   (LPVOID)i,
                                    testCases[i].dwCreationFlags,      
                                    testCases[i].lpThreadId);  
         if (hThread[i] == NULL)
@@ -102,7 +102,7 @@ int __cdecl main(int argc, char **argv)
             Trace("PALSUITE ERROR: CreateThread('%p' '%d' '%p' '%p' '%d' "
                   "'%p') call failed.\nGetLastError returned '%u'.\n", 
                   testCases[i].lpThreadAttributes, testCases[i].dwStackSize,
-                  testCases[i].lpStartAddress, (LPVOID) i, 
+                  testCases[i].lpStartAddress, (LPVOID)i, 
                   testCases[i].dwCreationFlags, 
                   testCases[i].lpThreadId, GetLastError());
             cleanup(i - 1);
diff --git a/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt
index 923d7a72ab3e..d454992e598f 100644
--- a/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CreateThread/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_createthread_test3
diff --git a/src/pal/tests/palsuite/threading/CreateThread/test3/test3.c b/src/pal/tests/palsuite/threading/CreateThread/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CreateThread/test3/test3.c
rename to src/pal/tests/palsuite/threading/CreateThread/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt
index 5ba04fd801f9..8d2c1441c43b 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  InitializeCriticalSection.c
+  InitializeCriticalSection.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test1
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test1/InitializeCriticalSection.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt
index d26658cf5d85..e0f59f420796 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test2
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt
index 8bd2a72878b6..11555ec484ad 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test3
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt
index 0626631640c6..8aa18854b3dc 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test4
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt
index 37d709f1211d..9474bcc6c975 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test5
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt
index c580fdbd6b6d..f4887ad67d1d 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test6
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt
index 0a12bfe3efa6..ceb78a05123b 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test7
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt
index 0d95a95410a3..d3f271d67757 100644
--- a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_criticalsectionfunctions_test8
diff --git a/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.c b/src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.c
rename to src/pal/tests/palsuite/threading/CriticalSectionFunctions/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.c b/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.c
rename to src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/testlib.c b/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/testlib.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/testlib.c
rename to src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test1/testlib.cpp
diff --git a/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain1.c b/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain1.c
rename to src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain1.cpp
diff --git a/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain2.c b/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain2.c
rename to src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/dllmain2.cpp
diff --git a/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.c b/src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.c
rename to src/pal/tests/palsuite/threading/DisableThreadLibraryCalls/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt
index 04588b75fee7..18b1927a4e54 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_duplicatehandle_test1
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt
index ba16252cb425..98c7a273dc5f 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test10/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test10.c
+  test10.cpp
 )
 
 add_executable(paltest_duplicatehandle_test10
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test10/test10.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt
index 68ce7b23fb54..f47f9bc350c0 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test11/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test11.c
+  test11.cpp
 )
 
 add_executable(paltest_duplicatehandle_test11
@@ -20,7 +20,7 @@ target_link_libraries(paltest_duplicatehandle_test11
 
 
 set(HELPERSOURCES
-  childprocess.c
+  childprocess.cpp
 )
 
 add_executable(paltest_duplicatehandle_test11_child
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test11/childprocess.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test11/test11.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt
index 961a9c64e6bb..6a50a13265af 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test12/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test12.c
+  test12.cpp
 )
 
 add_executable(paltest_duplicatehandle_test12
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test12/test12.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt
index 06529a620466..9faa58a271a3 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_duplicatehandle_test2
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt
index 7f961c221397..b161b928d330 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_duplicatehandle_test3
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt
index c3040d09ecb3..901151f4ebfc 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_duplicatehandle_test4
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt
index bc468a4a75c2..94cd07f96f64 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_duplicatehandle_test5
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt
index 20f7822b1eaf..a0dcae843c64 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_duplicatehandle_test6
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt
index df3fdf9ae01a..a222331fe78d 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_duplicatehandle_test7
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt
index 15ec23d27252..18ed969cb76a 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test8/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test8.c
+  test8.cpp
 )
 
 add_executable(paltest_duplicatehandle_test8
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test8/test8.cpp
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt b/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt
index e4442e327c6e..0383a010ac5b 100644
--- a/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/DuplicateHandle/test9/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test9.c
+  test9.cpp
 )
 
 add_executable(paltest_duplicatehandle_test9
diff --git a/src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.c b/src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.c
rename to src/pal/tests/palsuite/threading/DuplicateHandle/test9/test9.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt
index decddb8512fe..f2d28e06cad7 100644
--- a/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ExitProcess/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ExitProcess.c
+  ExitProcess.cpp
 )
 
 add_executable(paltest_exitprocess_test1
diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.c b/src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.c
rename to src/pal/tests/palsuite/threading/ExitProcess/test1/ExitProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt
index 881c7d0eeeac..5281a02aa45a 100644
--- a/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ExitProcess/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_exitprocess_test2
diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test2/test2.c b/src/pal/tests/palsuite/threading/ExitProcess/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitProcess/test2/test2.c
rename to src/pal/tests/palsuite/threading/ExitProcess/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt
index 638408e98636..3fca087d058b 100644
--- a/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ExitProcess/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_exitprocess_test3
diff --git a/src/pal/tests/palsuite/threading/ExitProcess/test3/test3.c b/src/pal/tests/palsuite/threading/ExitProcess/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitProcess/test3/test3.c
rename to src/pal/tests/palsuite/threading/ExitProcess/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt
index 15e0c1b62d39..c34b5257ab55 100644
--- a/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ExitThread/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_exitthread_test1
diff --git a/src/pal/tests/palsuite/threading/ExitThread/test1/test1.c b/src/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitThread/test1/test1.c
rename to src/pal/tests/palsuite/threading/ExitThread/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt
index aa05382feb5c..5e16d36082a9 100644
--- a/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ExitThread/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_exitthread_test2
@@ -20,7 +20,7 @@ target_link_libraries(paltest_exitthread_test2
 
 
 set(HELPERSOURCES
-  childprocess.c
+  childprocess.cpp
 )
 
 add_executable(paltest_exitthread_test2_child
diff --git a/src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.c b/src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.c
rename to src/pal/tests/palsuite/threading/ExitThread/test2/childprocess.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitThread/test2/test2.c b/src/pal/tests/palsuite/threading/ExitThread/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitThread/test2/test2.c
rename to src/pal/tests/palsuite/threading/ExitThread/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitThread/test3/dllmain.c b/src/pal/tests/palsuite/threading/ExitThread/test3/dllmain.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitThread/test3/dllmain.c
rename to src/pal/tests/palsuite/threading/ExitThread/test3/dllmain.cpp
diff --git a/src/pal/tests/palsuite/threading/ExitThread/test3/test3.c b/src/pal/tests/palsuite/threading/ExitThread/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ExitThread/test3/test3.c
rename to src/pal/tests/palsuite/threading/ExitThread/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt
index 44105348beb4..af4746bcb4f0 100644
--- a/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  process.c
+  process.cpp
 )
 
 add_executable(paltest_getcurrentprocess_test1
diff --git a/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.c b/src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.c
rename to src/pal/tests/palsuite/threading/GetCurrentProcess/test1/process.cpp
diff --git a/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt
index e5c31e6af27e..523320a53c86 100644
--- a/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  processId.c
+  processId.cpp
 )
 
 add_executable(paltest_getcurrentprocessid_test1
diff --git a/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.c b/src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.c
rename to src/pal/tests/palsuite/threading/GetCurrentProcessId/test1/processId.cpp
diff --git a/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt
index 84cbccbca060..23af2edbca4e 100644
--- a/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetCurrentThread/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  thread.c
+  thread.cpp
 )
 
 add_executable(paltest_getcurrentthread_test1
diff --git a/src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.c b/src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.c
rename to src/pal/tests/palsuite/threading/GetCurrentThread/test1/thread.cpp
diff --git a/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt
index 3fc3c3e7c623..9da2d075b222 100644
--- a/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetCurrentThread/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getcurrentthread_test2
diff --git a/src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.c b/src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.c
rename to src/pal/tests/palsuite/threading/GetCurrentThread/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt
index 490bff8f5f70..a0824ab9a230 100644
--- a/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  threadId.c
+  threadId.cpp
 )
 
 add_executable(paltest_getcurrentthreadid_test1
diff --git a/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.c b/src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.c
rename to src/pal/tests/palsuite/threading/GetCurrentThreadId/test1/threadId.cpp
diff --git a/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt
index adddd97e6d59..1ef9db22990f 100644
--- a/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getexitcodeprocess_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_getexitcodeprocess_test1
 
 
 set(HELPERSOURCES
-  childProcess.c
+  childProcess.cpp
 )
 
 add_executable(paltest_getexitcodeprocess_test1_child
diff --git a/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.c b/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.c
rename to src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/childProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.c b/src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.c
rename to src/pal/tests/palsuite/threading/GetExitCodeProcess/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt
index 0ef726020493..8e905873e90c 100644
--- a/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetProcessTimes/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_getprocesstimes_test2
diff --git a/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.c b/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.cpp
similarity index 98%
rename from src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.c
rename to src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.cpp
index 687facc58445..cc39de609bf6 100644
--- a/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.c
+++ b/src/pal/tests/palsuite/threading/GetProcessTimes/test2/test2.cpp
@@ -77,7 +77,7 @@ int __cdecl main( int argc, char **argv )
         for( j=0; j<1000; j++ )
         {
             /* do kernel work to increase system usage counters */
-            total = malloc(1024 * 1024);
+            total = (int*)malloc(1024 * 1024);
 
             *total = j * i;
             for( k=0; k<1000; k++ )
diff --git a/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt
index d7e2eb2a88e5..aa4dad11cebd 100644
--- a/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/GetThreadTimes/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_getthreadtimes_test1
diff --git a/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.c b/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.cpp
similarity index 99%
rename from src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.c
rename to src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.cpp
index 6b62c05ec712..e57a7d08bae1 100644
--- a/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.c
+++ b/src/pal/tests/palsuite/threading/GetThreadTimes/test1/test1.cpp
@@ -23,7 +23,7 @@ int __cdecl main(int argc, char *argv[]) {
         ret = PASS;
         goto EXIT;
     }    
-
+    {
     FILETIME kernelTime1, userTime1, kernelTime2, userTime2;
     /* Delta = .01 sec */
     LONG64 Actual, Expected, Delta = 850000000;
@@ -96,7 +96,7 @@ int __cdecl main(int argc, char *argv[]) {
     //printf("%llu, %llu\n", Expected, Actual);
     PAL_Terminate();
     ret = PASS;
-
+    }
 EXIT:
     return ret;
 }
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt
index 2bb61e30442b..2d5698b153a0 100644
--- a/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/OpenEventW/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_openeventw_test1
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test1/test1.c b/src/pal/tests/palsuite/threading/OpenEventW/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenEventW/test1/test1.c
rename to src/pal/tests/palsuite/threading/OpenEventW/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt
index 48fa1f2c4b47..bedf83b48729 100644
--- a/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/OpenEventW/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_openeventw_test2
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test2/test2.c b/src/pal/tests/palsuite/threading/OpenEventW/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenEventW/test2/test2.c
rename to src/pal/tests/palsuite/threading/OpenEventW/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt
index 433a3a255c5f..7f7622dca018 100644
--- a/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/OpenEventW/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_openeventw_test3
@@ -20,7 +20,7 @@ target_link_libraries(paltest_openeventw_test3
 
 
 set(HELPERSOURCES
-  childprocess.c
+  childprocess.cpp
 )
 
 add_executable(paltest_openeventw_test3_child
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.c b/src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.c
rename to src/pal/tests/palsuite/threading/OpenEventW/test3/childprocess.cpp
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test3/test3.c b/src/pal/tests/palsuite/threading/OpenEventW/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenEventW/test3/test3.c
rename to src/pal/tests/palsuite/threading/OpenEventW/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt
index ff17fea23b32..73b8904993ad 100644
--- a/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/OpenEventW/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_openeventw_test4
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test4/test4.c b/src/pal/tests/palsuite/threading/OpenEventW/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenEventW/test4/test4.c
rename to src/pal/tests/palsuite/threading/OpenEventW/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt
index b78d7fbfc08f..3bad4d9cc501 100644
--- a/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/OpenEventW/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_openeventw_test5
diff --git a/src/pal/tests/palsuite/threading/OpenEventW/test5/test5.c b/src/pal/tests/palsuite/threading/OpenEventW/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenEventW/test5/test5.c
rename to src/pal/tests/palsuite/threading/OpenEventW/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt
index 26d30547a9f7..dd2e30516c23 100644
--- a/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/OpenProcess/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_openprocess_test1
@@ -20,7 +20,7 @@ target_link_libraries(paltest_openprocess_test1
 
 
 set(HELPERSOURCES
-  childProcess.c
+  childProcess.cpp
 )
 
 add_executable(paltest_openprocess_test1_child
diff --git a/src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.c b/src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.c
rename to src/pal/tests/palsuite/threading/OpenProcess/test1/childProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/OpenProcess/test1/test1.c b/src/pal/tests/palsuite/threading/OpenProcess/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/OpenProcess/test1/test1.c
rename to src/pal/tests/palsuite/threading/OpenProcess/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt
index ad3eec1a4549..9a54ad15b6e9 100644
--- a/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_querythreadcycletime_test1
diff --git a/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.c b/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.cpp
similarity index 99%
rename from src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.c
rename to src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.cpp
index 54f0116bd074..026243c81a4a 100644
--- a/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.c
+++ b/src/pal/tests/palsuite/threading/QueryThreadCycleTime/test1/test1.cpp
@@ -23,7 +23,7 @@ int __cdecl main(int argc, char *argv[]) {
         ret = PASS;
         goto EXIT;
     }   
-
+    {
     LONG64 Actual, Expected, Delta = 850000000;
     Actual = 0;
     Expected = 0;
@@ -92,7 +92,7 @@ int __cdecl main(int argc, char *argv[]) {
     //printf("%llu, %llu\n", Expected, Actual);
     PAL_Terminate();
     ret = PASS;
-
+    }
 EXIT:
     return ret;
 }
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt
index 54a4d03719bd..a99b0a69ccd5 100644
--- a/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_queueuserapc_test1
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.c b/src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.c
rename to src/pal/tests/palsuite/threading/QueueUserAPC/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt
index 88cda5f7b1b5..5d86efddddf2 100644
--- a/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_queueuserapc_test2
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.c b/src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.c
rename to src/pal/tests/palsuite/threading/QueueUserAPC/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt
index 8475dcb03ed6..e07ab67070eb 100644
--- a/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_queueuserapc_test3
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.c b/src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.c
rename to src/pal/tests/palsuite/threading/QueueUserAPC/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt
index 2552738b50f2..08a5cc763b8b 100644
--- a/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_queueuserapc_test4
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.c b/src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.c
rename to src/pal/tests/palsuite/threading/QueueUserAPC/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt
index c2fa10de12be..0ef65ce5836d 100644
--- a/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_queueuserapc_test5
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.c b/src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.c
rename to src/pal/tests/palsuite/threading/QueueUserAPC/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt
index 3fd1b1a08ea0..2e7198358caf 100644
--- a/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_queueuserapc_test6
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.c b/src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.c
rename to src/pal/tests/palsuite/threading/QueueUserAPC/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt b/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt
index 751f3894f4ca..c27cd7e67cb9 100644
--- a/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/QueueUserAPC/test7/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test7.c
+  test7.cpp
 )
 
 add_executable(paltest_queueuserapc_test7
diff --git a/src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.c b/src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.c
rename to src/pal/tests/palsuite/threading/QueueUserAPC/test7/test7.cpp
diff --git a/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt
index 8e64c2824266..6bb3a79db435 100644
--- a/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ReleaseMutex/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ReleaseMutex.c
+  ReleaseMutex.cpp
 )
 
 add_executable(paltest_releasemutex_test3
diff --git a/src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.c b/src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.c
rename to src/pal/tests/palsuite/threading/ReleaseMutex/test3/ReleaseMutex.cpp
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt
index 78e84da2b9c9..12c83119d87e 100644
--- a/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ResetEvent/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_resetevent_test1
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test1/test1.c b/src/pal/tests/palsuite/threading/ResetEvent/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ResetEvent/test1/test1.c
rename to src/pal/tests/palsuite/threading/ResetEvent/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt
index ad0fe9b4a146..1f67b5d884f9 100644
--- a/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ResetEvent/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_resetevent_test2
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test2/test2.c b/src/pal/tests/palsuite/threading/ResetEvent/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ResetEvent/test2/test2.c
rename to src/pal/tests/palsuite/threading/ResetEvent/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt
index 3c4ea1f249bb..fd0d6e8b1630 100644
--- a/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ResetEvent/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_resetevent_test3
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test3/test3.c b/src/pal/tests/palsuite/threading/ResetEvent/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ResetEvent/test3/test3.c
rename to src/pal/tests/palsuite/threading/ResetEvent/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt
index 68ee20bc9596..ca2a91877592 100644
--- a/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ResetEvent/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_resetevent_test4
diff --git a/src/pal/tests/palsuite/threading/ResetEvent/test4/test4.c b/src/pal/tests/palsuite/threading/ResetEvent/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ResetEvent/test4/test4.c
rename to src/pal/tests/palsuite/threading/ResetEvent/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt
index 2c83dfd3d587..96d7edcbbae3 100644
--- a/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ResumeThread/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_resumethread_test1
diff --git a/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.c b/src/pal/tests/palsuite/threading/ResumeThread/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ResumeThread/test1/test1.c
rename to src/pal/tests/palsuite/threading/ResumeThread/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt
index cfdeb319506c..7c145a852863 100644
--- a/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SetErrorMode/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_seterrormode_test1
diff --git a/src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.c b/src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.c
rename to src/pal/tests/palsuite/threading/SetErrorMode/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt
index 9be8d5a42189..8d9d729554bd 100644
--- a/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SetEvent/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_setevent_test1
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test1/test1.c b/src/pal/tests/palsuite/threading/SetEvent/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SetEvent/test1/test1.c
rename to src/pal/tests/palsuite/threading/SetEvent/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt
index 87522b3ffcb6..7d33b560587a 100644
--- a/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SetEvent/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_setevent_test2
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test2/test2.c b/src/pal/tests/palsuite/threading/SetEvent/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SetEvent/test2/test2.c
rename to src/pal/tests/palsuite/threading/SetEvent/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt
index d09239b3e458..1c66460ea067 100644
--- a/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SetEvent/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_setevent_test3
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test3/test3.c b/src/pal/tests/palsuite/threading/SetEvent/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SetEvent/test3/test3.c
rename to src/pal/tests/palsuite/threading/SetEvent/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt
index 3f1d3442922f..04f1815259b4 100644
--- a/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SetEvent/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_setevent_test4
diff --git a/src/pal/tests/palsuite/threading/SetEvent/test4/test4.c b/src/pal/tests/palsuite/threading/SetEvent/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SetEvent/test4/test4.c
rename to src/pal/tests/palsuite/threading/SetEvent/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt
index b0d8db28a2f6..601789600bcf 100644
--- a/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/Sleep/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  Sleep.c
+  Sleep.cpp
 )
 
 add_executable(paltest_sleep_test1
diff --git a/src/pal/tests/palsuite/threading/Sleep/test1/Sleep.c b/src/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/Sleep/test1/Sleep.c
rename to src/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp
diff --git a/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt
index 832e8ab42db5..b8bc3ed7d715 100644
--- a/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/Sleep/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  sleep.c
+  sleep.cpp
 )
 
 add_executable(paltest_sleep_test2
diff --git a/src/pal/tests/palsuite/threading/Sleep/test2/sleep.c b/src/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/Sleep/test2/sleep.c
rename to src/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp
diff --git a/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt
index de562755fc2e..b2aed8333b0d 100644
--- a/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SleepEx/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_sleepex_test1
diff --git a/src/pal/tests/palsuite/threading/SleepEx/test1/test1.c b/src/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SleepEx/test1/test1.c
rename to src/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt
index 0ea4a44449f9..991e9b40e204 100644
--- a/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SleepEx/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_sleepex_test2
diff --git a/src/pal/tests/palsuite/threading/SleepEx/test2/test2.c b/src/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SleepEx/test2/test2.c
rename to src/pal/tests/palsuite/threading/SleepEx/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt
index 40ecc910b07d..b9008c486f4f 100644
--- a/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/SwitchToThread/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_switchtothread_test1
diff --git a/src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.c b/src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.c
rename to src/pal/tests/palsuite/threading/SwitchToThread/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt
index ff1a866eb9a2..fef741272f19 100644
--- a/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/TLS/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  TLS.c
+  TLS.cpp
 )
 
 add_executable(paltest_tls_test1
diff --git a/src/pal/tests/palsuite/threading/TLS/test1/TLS.c b/src/pal/tests/palsuite/threading/TLS/test1/TLS.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/TLS/test1/TLS.c
rename to src/pal/tests/palsuite/threading/TLS/test1/TLS.cpp
diff --git a/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt
index 5afe82b4a6f1..10c5034589a3 100644
--- a/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/TLS/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  TLS.c
+  TLS.cpp
 )
 
 add_executable(paltest_tls_test2
diff --git a/src/pal/tests/palsuite/threading/TLS/test2/TLS.c b/src/pal/tests/palsuite/threading/TLS/test2/TLS.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/TLS/test2/TLS.c
rename to src/pal/tests/palsuite/threading/TLS/test2/TLS.cpp
diff --git a/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt
index 0964d33d2c7e..6bd76d3fdf64 100644
--- a/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/TLS/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  TLS.c
+  TLS.cpp
 )
 
 add_executable(paltest_tls_test3
diff --git a/src/pal/tests/palsuite/threading/TLS/test3/TLS.c b/src/pal/tests/palsuite/threading/TLS/test3/TLS.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/TLS/test3/TLS.c
rename to src/pal/tests/palsuite/threading/TLS/test3/TLS.cpp
diff --git a/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt
index 7e7b47786a6e..73ba496f1d6f 100644
--- a/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/TLS/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_tls_test4
diff --git a/src/pal/tests/palsuite/threading/TLS/test4/test4.c b/src/pal/tests/palsuite/threading/TLS/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/TLS/test4/test4.c
rename to src/pal/tests/palsuite/threading/TLS/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt
index 5fb5c9ddfd4f..e26fcfff26cb 100644
--- a/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/TLS/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_tls_test5
diff --git a/src/pal/tests/palsuite/threading/TLS/test5/test5.c b/src/pal/tests/palsuite/threading/TLS/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/TLS/test5/test5.c
rename to src/pal/tests/palsuite/threading/TLS/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt b/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt
index 8b3a4ed64a38..bfc7b75e0ba2 100644
--- a/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_tls_test6_optimizedtls
diff --git a/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/test.c b/src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/test.c
rename to src/pal/tests/palsuite/threading/TLS/test6_optimizedtls/test.cpp
diff --git a/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt
index 37d575952ff6..382e801e298a 100644
--- a/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/TerminateProcess/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  TerminateProcess.c
+  TerminateProcess.cpp
 )
 
 add_executable(paltest_terminateprocess_test1
diff --git a/src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.c b/src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.c
rename to src/pal/tests/palsuite/threading/TerminateProcess/test1/TerminateProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt
index e341ca7435a3..026f4ed043a2 100644
--- a/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/ThreadPriority/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  ThreadPriority.c
+  ThreadPriority.cpp
 )
 
 add_executable(paltest_threadpriority_test1
diff --git a/src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.c b/src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.c
rename to src/pal/tests/palsuite/threading/ThreadPriority/test1/ThreadPriority.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt
index 2b1f946b2607..ea13c7de4cf2 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_waitformultipleobjects_test1
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjects/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt
index d035021bb9f5..59d4cd8cd429 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test1
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt
index ab47c6f2e760..e970ec526ef9 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test2.c
+  test2.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test2
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test2/test2.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt
index 645b86719d46..f1b76fb81915 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test3.c
+  test3.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test3
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test3/test3.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt
index 3cd7f72b98e4..815b2b069cb9 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test4.c
+  test4.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test4
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test4/test4.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt
index 50147e9bf3a6..730ec6064907 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test5.c
+  test5.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test5
@@ -20,7 +20,7 @@ target_link_libraries(paltest_waitformultipleobjectsex_test5
 
 
 set(HELPERSOURCES
-  helper.c
+  helper.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test5_helper
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/helper.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test5/test5.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt
index ce75cadbff81..01331821a874 100644
--- a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  test6.c
+  test6.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test6
@@ -20,7 +20,7 @@ target_link_libraries(paltest_waitformultipleobjectsex_test6
 
 
 set(HELPERSOURCES
-  child6.c
+  child6.cpp
 )
 
 add_executable(paltest_waitformultipleobjectsex_test6_child
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/child6.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.c b/src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.c
rename to src/pal/tests/palsuite/threading/WaitForMultipleObjectsEx/test6/test6.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt
index 65fa0abe14b9..816a98bf2fc7 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WFSOExMutexTest.c
+  WFSOExMutexTest.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsoexmutextest
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExMutexTest/WFSOExMutexTest.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt
index 12517e31e095..2d12b25e6903 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WFSOExSemaphoreTest.c
+  WFSOExSemaphoreTest.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsoexsemaphoretest
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt
index f3d868f0825b..915ee94a6255 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WFSOExThreadTest.c
+  WFSOExThreadTest.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsoexthreadtest
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOExThreadTest/WFSOExThreadTest.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt
index 374880e90f90..b96324d654a3 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WFSOMutexTest.c
+  WFSOMutexTest.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsomutextest
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOMutexTest/WFSOMutexTest.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt
index a70b1019887a..61e17eb3adc4 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(TESTSOURCES
-  WFSOProcessTest.c
+  WFSOProcessTest.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsoprocesstest
@@ -20,7 +20,7 @@ target_link_libraries(paltest_waitforsingleobject_wfsoprocesstest
 
 
 set(HELPERSOURCES
-  ChildProcess.c
+  ChildProcess.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsoprocesstest_child
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/ChildProcess.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOProcessTest/WFSOProcessTest.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt
index 171e0583e59e..d17f8da8e5bd 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WFSOSemaphoreTest.c
+  WFSOSemaphoreTest.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsosemaphoretest
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOSemaphoreTest/WFSOSemaphoreTest.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt
index 18701a9da50c..e2d36e08e14e 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  WFSOThreadTest.c
+  WFSOThreadTest.cpp
 )
 
 add_executable(paltest_waitforsingleobject_wfsothreadtest
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/WFSOThreadTest/WFSOThreadTest.cpp
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt
index 0a71330ba116..25f3739492d9 100644
--- a/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_waitforsingleobject_test1
diff --git a/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.c b/src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.c
rename to src/pal/tests/palsuite/threading/WaitForSingleObject/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt
index 5002bf763d99..1c600bd81cb6 100644
--- a/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/YieldProcessor/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test1.c
+  test1.cpp
 )
 
 add_executable(paltest_yieldprocessor_test1
diff --git a/src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.c b/src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.c
rename to src/pal/tests/palsuite/threading/YieldProcessor/test1/test1.cpp
diff --git a/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt b/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt
index e415f91fb27e..4f6947476d9e 100644
--- a/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt
+++ b/src/pal/tests/palsuite/threading/releasesemaphore/test1/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.12.2)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(SOURCES
-  test.c
+  test.cpp
 )
 
 add_executable(paltest_releasesemaphore_test1
diff --git a/src/pal/tests/palsuite/threading/releasesemaphore/test1/test.c b/src/pal/tests/palsuite/threading/releasesemaphore/test1/test.cpp
similarity index 100%
rename from src/pal/tests/palsuite/threading/releasesemaphore/test1/test.c
rename to src/pal/tests/palsuite/threading/releasesemaphore/test1/test.cpp
diff --git a/src/vm/microsoft.comservices_i.c b/src/vm/microsoft.comservices_i.c
index d70bc8cefedf..e20252c6d22f 100644
--- a/src/vm/microsoft.comservices_i.c
+++ b/src/vm/microsoft.comservices_i.c
@@ -23,14 +23,13 @@
 
 #if !defined(_M_IA64) && !defined(_M_AXP64)
 
+#include <rpc.h>
+#include <rpcndr.h>
+
 #ifdef __cplusplus
 extern "C"{
 #endif 
 
-
-#include <rpc.h>
-#include <rpcndr.h>
-
 #ifdef _MIDL_USE_GUIDDEF_
 
 #ifndef INITGUID
@@ -109,14 +108,13 @@ MIDL_DEFINE_GUID(CLSID, CLSID_RegistrationHelperTx,0x89A86E7B,0xC229,0x4008,0x9B
 
 #if defined(_M_IA64) || defined(_M_AXP64)
 
+#include <rpc.h>
+#include <rpcndr.h>
+
 #ifdef __cplusplus
 extern "C"{
 #endif 
 
-
-#include <rpc.h>
-#include <rpcndr.h>
-
 #ifdef _MIDL_USE_GUIDDEF_
 
 #ifndef INITGUID