diff --git a/mozconfigs/windows/uxp-win64-msvc b/mozconfigs/windows/uxp-win64-msvc
index 0ec522f966..5253203ea7 100644
--- a/mozconfigs/windows/uxp-win64-msvc
+++ b/mozconfigs/windows/uxp-win64-msvc
@@ -1,69 +1,69 @@
-# 16 jobs for 16 cores
-mk_add_options MOZ_MAKE_FLAGS="-j16"
-
-# x64 build
-ac_add_options --host=x86_64-pc-mingw32
-ac_add_options --target=x86_64-pc-mingw32
-
-# Build only Dactyloidae
-ac_add_options --enable-application=browser
-ac_add_options --disable-artifact-builds
-
-# Updater stuffs
-ac_add_options --disable-updater
-# Enable if update server and signatures are figured out
-#ac_add_options --enable-nss-mar
-
-# Optimization settings
-ac_add_options --disable-accessibility
-ac_add_options --disable-debug
-ac_add_options --disable-debug-js-modules
-ac_add_options --disable-debug-symbols
-ac_add_options --disable-tests
-ac_add_options --enable-devtools
-#ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-js-lto
-ac_add_options --enable-phoenix-extensions
-ac_add_options --enable-release
-ac_add_options --enable-shared-js
-ac_add_options --enable-strip
-MOZ_OPTIMIZE=1
-export MOZ_OPTIMIZE=1
-mk_add_options MOZ_OPTIMIZE=1
-export MOZILLA_OFFICIAL=1
-
-# Media settings
-ac_add_options --enable-av1
-ac_add_options --enable-jxl
-ac_add_options --enable-raw
-ac_add_options --disable-webrtc
-
-# Client settings
-ac_add_options --disable-crashreporter
-ac_add_options --disable-eme
-ac_add_options --disable-maintenance-service
-ac_add_options --disable-parental-controls
-mk_add_options MOZ_SERVICES_HEALTHREPORT=0
-export CROSS_COMPILE=0
-export MOZ_CRASHREPORTER=0
-export MOZ_DATA_REPORTING=0
-export MOZ_INCLUDE_SOURCE_INFO=1
-export MOZ_REQUIRE_SIGNING=
-export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
-export MOZ_TELEMETRY_REPORTING=
-export MOZ_PACKAGE_JSSHELL=1
-
-# Set -Copt-level=3
-export OPT_LEVEL="3"
-ac_add_options OPT_LEVEL="3"
-
-# Compiler and Linker flags
-export CFLAGS="-O2"
-export CPPFLAGS="-O2"
-export CXXFLAGS="-O2"
-ac_add_options --enable-optimize="-O2 -Ob2ity -GS- -Qpar -Qfast_transcendentals -openmp -Oi -Gy -Gw -GF -GT -fp:precise -Zc:inline -Zc:throwingNew -Zc:__cplusplus -arch:SSE2"
-mk_add_options "LDFLAGS=-OPT:REF,ICF,WIN64,LBR -OPT:ICF=3 -INCREMENTAL:NO -LTCG:NO -DYNAMICBASE -NXCOMPAT -MACHINE:X64 -SUBSYSTEM:WINDOWS,5.2 -Brepro -FUNCTIONPADMIN -ALIGN:4096 -RELEASE"
-export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
-export STRIP_FLAGS="--strip-all --remove-section=.comment --remove-section=.note --remove-section=.eh_frame"
-export VERBOSE=1
+# 16 jobs for 16 cores
+mk_add_options MOZ_MAKE_FLAGS="-j16"
+
+# x64 build
+ac_add_options --host=x86_64-pc-mingw32
+ac_add_options --target=x86_64-pc-mingw32
+
+# Build only Dactyloidae
+ac_add_options --enable-application=browser
+ac_add_options --disable-artifact-builds
+
+# Updater stuffs
+ac_add_options --disable-updater
+# Enable if update server and signatures are figured out
+#ac_add_options --enable-nss-mar
+
+# Optimization settings
+ac_add_options --disable-accessibility
+ac_add_options --disable-debug
+ac_add_options --disable-debug-js-modules
+ac_add_options --disable-debug-symbols
+ac_add_options --disable-tests
+ac_add_options --enable-devtools
+#ac_add_options --enable-install-strip
+ac_add_options --enable-jemalloc
+ac_add_options --enable-js-lto
+ac_add_options --enable-phoenix-extensions
+ac_add_options --enable-release
+ac_add_options --enable-shared-js
+ac_add_options --enable-strip
+MOZ_OPTIMIZE=1
+export MOZ_OPTIMIZE=1
+mk_add_options MOZ_OPTIMIZE=1
+export MOZILLA_OFFICIAL=1
+
+# Media settings
+ac_add_options --disable-av1
+ac_add_options --enable-jxl
+ac_add_options --enable-raw
+ac_add_options --disable-webrtc
+
+# Client settings
+ac_add_options --disable-crashreporter
+ac_add_options --disable-eme
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-parental-controls
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+export CROSS_COMPILE=0
+export MOZ_CRASHREPORTER=0
+export MOZ_DATA_REPORTING=0
+export MOZ_INCLUDE_SOURCE_INFO=1
+export MOZ_REQUIRE_SIGNING=
+export MOZ_SOURCE_CHANGESET=iloveneedingtobodgechangesetfornoreason
+export MOZ_TELEMETRY_REPORTING=
+export MOZ_PACKAGE_JSSHELL=1
+
+# Set -Copt-level=3
+export OPT_LEVEL="3"
+ac_add_options OPT_LEVEL="3"
+
+# Compiler and Linker flags
+export CFLAGS="-O2"
+export CPPFLAGS="-O2"
+export CXXFLAGS="-O2"
+ac_add_options --enable-optimize="-O2 -Ob2ity -GS- -Qpar -Qfast_transcendentals -openmp -Oi -Gy -Gw -GF -GT -fp:precise -Zc:inline -Zc:throwingNew -Zc:__cplusplus -arch:SSE2 -std:c++17 -D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS""
+mk_add_options "LDFLAGS=-OPT:REF,ICF,WIN64,LBR -OPT:ICF=3 -INCREMENTAL:NO -LTCG:NO -DYNAMICBASE -NXCOMPAT -MACHINE:X64 -SUBSYSTEM:WINDOWS,5.2 -Brepro -FUNCTIONPADMIN -ALIGN:4096 -RELEASE"
+export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
+export STRIP_FLAGS="--strip-all --remove-section=.comment --remove-section=.note --remove-section=.eh_frame"
+export VERBOSE=1