diff --git a/src/modules/keyboardmanager/ui/pch.h b/src/modules/keyboardmanager/ui/pch.h
index a50bdd6d26..7207832c32 100644
--- a/src/modules/keyboardmanager/ui/pch.h
+++ b/src/modules/keyboardmanager/ui/pch.h
@@ -2,8 +2,8 @@
 // Do not define WIN32_LEAN_AND_MEAN as WinUI doesn't work when it is defined
 #include <unknwn.h>
 #include <windows.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <thread>
 #include <winrt/Windows.system.h>
 #include <winrt/windows.ui.xaml.hosting.h>
diff --git a/tools/CleanUp_tool/main.cpp b/tools/CleanUp_tool/main.cpp
index 9dd1f6688a..6ebfef0462 100644
--- a/tools/CleanUp_tool/main.cpp
+++ b/tools/CleanUp_tool/main.cpp
@@ -1,6 +1,6 @@
 #include <windows.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 #include <shlwapi.h>
 #include <shlobj.h>