Cleanup headers

stl/src/StlCompareStringA.cpp

@@ -3,7 +3,6 @@
 
 #include <crtdbg.h>
 #include <internal_shared.h>
-#include <string.h>
 
 #include <Windows.h>
 

stl/src/StlCompareStringW.cpp

@@ -1,10 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <crtdbg.h>
-#include <internal_shared.h>
-#include <string.h>
-
 #include <Windows.h>
 
 #include "awint.hpp"

stl/src/StlLCMapStringA.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 #include <internal_shared.h>
-#include <locale.h>
 
 #include "awint.hpp"
 

stl/src/StlLCMapStringW.cpp

@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <internal_shared.h>
-#include <locale.h>
-
 #include "awint.hpp"
 
 // int __cdecl __crtLCMapStringW - Get type information about a wide string.

stl/src/_tolower.cpp

@@ -5,11 +5,10 @@
 
 #include <yvals.h>
 
-#include <ctype.h>
+#include <cctype>
+#include <clocale>
+#include <cstdlib>
 #include <internal_shared.h>
-#include <locale.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <xlocinfo.h>
 
 #include "awint.hpp"

stl/src/_toupper.cpp

@@ -5,9 +5,9 @@
 
 #include <yvals.h>
 
-#include <ctype.h>
-#include <locale.h>
-#include <stddef.h>
+#include <cctype>
+#include <clocale>
+#include <cstddef>
 #include <xlocinfo.h>
 
 #include "awint.hpp"

stl/src/cond.cpp

@@ -3,9 +3,8 @@
 
 // condition variable functions
 
+#include <cstdlib>
 #include <internal_shared.h>
-#include <limits.h>
-#include <stdlib.h>
 #include <type_traits>
 #include <xthreads.h>
 #include <xtimec.h>

stl/src/cthread.cpp

@@ -3,11 +3,11 @@
 
 // thread functions
 
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <process.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <xthreads.h>
 
 #include <Windows.h>

stl/src/excptptr.cpp

@@ -18,9 +18,7 @@
 #include <malloc.h>
 #include <memory>
 #include <new>
-#include <stddef.h>
 #include <stdexcept>
-#include <string.h>
 #include <trnsctrl.h>
 #include <xcall_once.h>
 

stl/src/filesys.cpp

@@ -11,7 +11,6 @@
 #include <direct.h>
 #include <experimental/filesystem>
 #include <io.h>
-#include <string.h>
 
 #include <Windows.h>
 

stl/src/filesystem.cpp

@@ -9,16 +9,15 @@
 // Do not include or define anything else here.
 // In particular, basic_string must not be included here.
 
+#include <clocale>
 #include <corecrt_terminate.h>
+#include <cstdlib>
+#include <cstring>
 #include <internal_shared.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
 #include <xfilesystem_abi.h>
 
 #include <Windows.h>
-#include <WinIoCtl.h>
+#include <winioctl.h>
 
 // We have several switches that do not have case statements for every possible enum value.
 // Hence, disabling this warning.

stl/src/future.cpp

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <cstdlib>
 #include <exception>
 #include <future>
 

stl/src/ios.cpp

@@ -3,7 +3,6 @@
 
 // ios_base basic members
 
-#include <new>
 #include <xiosbase>
 _STD_BEGIN
 
@@ -26,20 +25,6 @@ __PURE_APPDOMAIN_GLOBAL static ios_base* stdstr[_Nstdstr + 2] = {
     nullptr}; // [1, _Nstdstr] hold pointers to standard streams
 __PURE_APPDOMAIN_GLOBAL static char stdopens[_Nstdstr + 2] = {0}; // [1, _Nstdstr] hold open counts for standard streams
 
-// void __CLR_OR_THIS_CALL ios_base::clear(iostate state, bool reraise) { // set state, possibly reraise exception
-//     _Mystate = (iostate)(state & _Statmask);
-//     if ((_Mystate & _Except) == 0)
-//         ;
-//     else if (reraise)
-//         _RERAISE;
-//     else if (_Mystate & _Except & badbit)
-//         _THROW(failure("ios_base::badbit set"));
-//     else if (_Mystate & _Except & failbit)
-//         _THROW(failure("ios_base::failbit set"));
-//     else
-//         _THROW(failure("ios_base::eofbit set"));
-// }
-
 void __CLRCALL_PURE_OR_CDECL ios_base::_Ios_base_dtor(ios_base* _This) { // destroy the object
     if (0 < _This->_Stdstr && 0 < --stdopens[_This->_Stdstr]) {
         return;
@@ -49,30 +34,6 @@ void __CLRCALL_PURE_OR_CDECL ios_base::_Ios_base_dtor(ios_base* _This) { // dest
     delete _This->_Ploc;
 }
 
-// ios_base::_Iosarray& __CLR_OR_THIS_CALL ios_base::_Findarr(int idx) { // locate or make a variable array element
-//     static _Iosarray stub(0, 0);
-//     _Iosarray *p, *q;
-//
-//     if (idx < 0) { // handle bad index
-//         setstate(badbit);
-//         return stub;
-//     }
-//
-//     for (p = _Arr, q = 0; p != 0; p = p->_Next)
-//         if (p->_Index == idx)
-//             return *p; // found element, return it
-//         else if (q == 0 && p->_Lo == 0 && p->_Vp == 0)
-//             q = p; // found recycling candidate
-//
-//     if (q != 0) { // recycle existing element
-//         q->_Index = idx;
-//         return *q;
-//     }
-//
-//     _Arr = new _Iosarray(idx, _Arr); // make a new element
-//     return *_Arr;
-// }
-
 void __CLRCALL_PURE_OR_CDECL ios_base::_Addstd(ios_base* _This) { // add standard stream to destructor list
     _BEGIN_LOCK(_LOCK_STREAM)
     for (_This->_Stdstr = 1; _This->_Stdstr < _Nstdstr; ++_This->_Stdstr) {

stl/src/locale0.cpp

@@ -73,8 +73,8 @@ _STD_END
 
 #if !STDCPP_IMPLIB || defined(_M_CEE_PURE)
 
+#include <cstdlib>
 #include <locale>
-#include <stdlib.h>
 
 _EXTERN_C
 

stl/src/mpiostream.cpp

@@ -6,7 +6,6 @@
 #error This file must be built with /clr:pure.
 #endif
 
-#include <fstream>
 #include <iostream>
 
 #pragma warning(disable : 4074)

stl/src/mutex.cpp

@@ -3,9 +3,9 @@
 
 // mutex functions
 
+#include <cstdio>
+#include <cstdlib>
 #include <internal_shared.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <type_traits>
 #include <xthreads.h>
 #include <xtimec.h>

stl/src/nothrow.cpp

@@ -11,8 +11,6 @@
 #undef MRTDLL
 #endif
 
-#include <yvals.h>
-
 #include <new>
 _STD_BEGIN
 

stl/src/ppltasks.cpp

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include <crtdbg.h>
 #include <crtdefs.h>
 #include <pplinterface.h>
 #include <ppltasks.h>

stl/src/primitives.hpp

@@ -9,7 +9,6 @@
 #include <crtdefs.h>
 #include <exception>
 #include <new>
-#include <stdlib.h>
 
 #include <Windows.h>
 

stl/src/special_math.cpp

@@ -23,16 +23,12 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/special_functions/ellint_1.hpp>
-#include <boost/math/special_functions/ellint_2.hpp>
 #include <boost/math/special_functions/ellint_3.hpp>
 #include <boost/math/special_functions/expint.hpp>
 #include <boost/math/special_functions/hermite.hpp>
 #include <boost/math/special_functions/laguerre.hpp>
-#include <boost/math/special_functions/legendre.hpp>
 #include <boost/math/special_functions/spherical_harmonic.hpp>
-#include <boost/math/special_functions/zeta.hpp>
 #include <boost/math/tools/config.hpp>
-#include <boost/math/tools/precision.hpp>
 
 #pragma warning(pop)
 

stl/src/taskscheduler.cpp

@@ -4,7 +4,6 @@
 #include <condition_variable>
 #include <mutex>
 #include <ppltaskscheduler.h>
-#include <stddef.h>
 
 #include <Windows.h>
 

stl/src/thread0.cpp

@@ -5,7 +5,7 @@
 
 #include <yvals.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <system_error>
 #include <xthreads.h>
 

stl/src/vector_algorithms.cpp

@@ -11,7 +11,6 @@
 #include <immintrin.h>
 #include <intrin0.h>
 #include <isa_availability.h>
-#include <xmmintrin.h>
 
 extern "C" long __isa_enabled;
 

stl/src/winapinls.cpp

@@ -6,8 +6,7 @@
 #if _STL_WIN32_WINNT < _WIN32_WINNT_VISTA
 
 #include <algorithm>
-#include <ctype.h>
-#include <stdlib.h>
+#include <cctype>
 #include <string_view>
 
 namespace {

stl/src/winapisupp.cpp

@@ -4,18 +4,16 @@
 // clang-format off
 // Prevent clang-format from reordering <AppModel.h> before <Windows.h>
 #include <Windows.h>
-#include <AppModel.h>
 #include "awint.hpp"
 #include <internal_shared.h>
-#include <stdlib.h>
+#include <cstdlib>
 // clang-format on
 
 #pragma warning(push)
 #pragma warning(disable : 4265) // non-virtual destructor in base class
 #include <wrl/wrappers/corewrappers.h>
 #pragma warning(pop)
-#include <intrin.h>
-#include <stdint.h>
+#include <cstdint>
 
 #if !defined(_CRT_WINDOWS) && !defined(UNDOCKED_WINDOWS_UCRT)
 // GetCurrentPackageId retrieves the current package id, if the app is deployed via a package.

stl/src/xferaise.cpp

@@ -5,7 +5,7 @@
 
 #include <yvals.h>
 
-#include <errno.h>
+#include <cerrno>
 #include <ymath.h>
 
 _EXTERN_C_UNLESS_PURE

stl/src/xfprec.cpp

@@ -3,6 +3,5 @@
 
 // _FXp* functions
 
-#include "xmath.hpp"
 #include "xxfftype.hpp"
 #include "xxxprec.hpp"

stl/src/xgetwctype.cpp

@@ -5,7 +5,7 @@
 
 #include <yvals.h>
 
-#include <wchar.h>
+#include <cwchar>
 #include <xlocinfo.h>
 
 #include "awint.hpp"

stl/src/xlock.cpp

@@ -5,8 +5,8 @@
 
 #include <yvals.h>
 
-#include <locale.h>
-#include <stdlib.h>
+#include <clocale>
+#include <cstdlib>
 
 #include "xmtx.hpp"
 

stl/src/xlprec.cpp

@@ -3,6 +3,5 @@
 
 // _LXp* functions
 
-#include "xmath.hpp"
 #include "xxlftype.hpp"
 #include "xxxprec.hpp"

stl/src/xmath.hpp

@@ -3,9 +3,7 @@
 
 #ifndef _XMATH
 #define _XMATH
-#include <errno.h>
-#include <math.h>
-#include <stddef.h>
+#include <cmath>
 #include <ymath.h>
 
 // FLOAT PROPERTIES

stl/src/xmbtowc.cpp

@@ -3,14 +3,11 @@
 
 // Convert multibyte char to wide char.
 
+#include <cctype>
+#include <cerrno>
+#include <climits> // for INT_MAX
 #include <crtdbg.h>
-#include <ctype.h>
-#include <errno.h>
 #include <internal_shared.h>
-#include <limits.h> // for INT_MAX
-#include <locale.h>
-#include <stdio.h> // for EOF
-#include <stdlib.h>
 #include <xlocinfo.h> // for _Cvtvec, _Mbrtowc
 
 _EXTERN_C_UNLESS_PURE