diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
index ba1ab462..fc8fbb3f 100644
--- a/include/fmt/format-inl.h
+++ b/include/fmt/format-inl.h
@@ -9,13 +9,9 @@
 #define FMT_FORMAT_INL_H_
 
 #include <algorithm>
-#include <cctype>
 #include <cerrno>  // errno
 #include <climits>
 #include <cmath>
-#include <cstdarg>
-#include <cstring>  // std::memmove
-#include <cwchar>
 #include <exception>
 
 #ifndef FMT_STATIC_THOUSANDS_SEPARATOR
diff --git a/src/fmt.cc b/src/fmt.cc
index 2b62c263..c26f0f74 100644
--- a/src/fmt.cc
+++ b/src/fmt.cc
@@ -4,9 +4,6 @@ module;
 #  error module not supported
 #endif
 
-#if !defined(_CRT_SECURE_NO_WARNINGS) && defined(_MSC_VER)
-#  define _CRT_SECURE_NO_WARNINGS
-#endif
 #if !defined(WIN32_LEAN_AND_MEAN) && defined(_WIN32)
 #  define WIN32_LEAN_AND_MEAN
 #endif
@@ -14,20 +11,16 @@ module;
 // Put all implementation-provided headers into the global module fragment
 // to prevent attachment to this module.
 #include <algorithm>
-#include <cctype>
 #include <cerrno>
 #include <chrono>
 #include <climits>
-#include <clocale>
 #include <cmath>
-#include <cstdarg>
 #include <cstddef>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
-#include <cwchar>
 #include <exception>
 #include <functional>
 #include <iterator>
@@ -35,7 +28,6 @@ module;
 #include <locale>
 #include <memory>
 #include <ostream>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <string_view>