diff --git a/.lintrunner.toml b/.lintrunner.toml
index 22bbdaa261b5..5e24d8317a08 100644
--- a/.lintrunner.toml
+++ b/.lintrunner.toml
@@ -216,7 +216,6 @@ exclude_patterns = [
     'c10/util/complex_math.h',
     'c10/util/complex_utils.h',
     'c10/util/flat_hash_map.h',
-    'c10/util/Float8*.h',
     'c10/util/logging*.h',
     'c10/util/hash.h',
     'c10/util/strong_type.h',
diff --git a/c10/util/Float8_e4m3fn-inl.h b/c10/util/Float8_e4m3fn-inl.h
index 291899a39537..e2d6a36da179 100644
--- a/c10/util/Float8_e4m3fn-inl.h
+++ b/c10/util/Float8_e4m3fn-inl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <c10/macros/Macros.h>
-#include <cstring>
+#include <cstdint>
 #include <limits>
 
 C10_CLANG_DIAGNOSTIC_PUSH()
diff --git a/c10/util/Float8_e4m3fn.h b/c10/util/Float8_e4m3fn.h
index e7a59e343c1f..f18a005bd1ee 100644
--- a/c10/util/Float8_e4m3fn.h
+++ b/c10/util/Float8_e4m3fn.h
@@ -15,9 +15,7 @@
 /// and inspired by Half implementation from pytorch/c10/util/Half.h
 
 #include <c10/macros/Macros.h>
-#include <c10/util/TypeSafeSignMath.h>
 #include <c10/util/floating_point_utils.h>
-#include <type_traits>
 
 #if defined(__cplusplus)
 #include <cmath>
@@ -32,16 +30,7 @@
 #endif
 
 #include <climits>
-#include <cstdint>
-#include <cstring>
-#include <iosfwd>
-#include <limits>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <utility>
-
-#include <typeinfo> // operator typeid
+#include <iostream>
 
 namespace c10 {
 
diff --git a/c10/util/Float8_e4m3fnuz.cpp b/c10/util/Float8_e4m3fnuz.cpp
index b18167f692c7..de2f92684dd7 100644
--- a/c10/util/Float8_e4m3fnuz.cpp
+++ b/c10/util/Float8_e4m3fnuz.cpp
@@ -1,3 +1,4 @@
+#include <c10/macros/Macros.h>
 #include <c10/util/Float8_e4m3fnuz.h>
 
 namespace c10 {
diff --git a/c10/util/Float8_e4m3fnuz.h b/c10/util/Float8_e4m3fnuz.h
index cf73b322e899..6738e9d73c40 100644
--- a/c10/util/Float8_e4m3fnuz.h
+++ b/c10/util/Float8_e4m3fnuz.h
@@ -17,8 +17,8 @@
 /// Implementation based on the paper https://arxiv.org/pdf/2206.02915.pdf and
 /// the existing Float8_e4m3fn implementation.
 
+#include <c10/macros/Export.h>
 #include <c10/macros/Macros.h>
-#include <c10/util/TypeSafeSignMath.h>
 #include <c10/util/floating_point_utils.h>
 #include <type_traits>
 
diff --git a/c10/util/Float8_e5m2.cpp b/c10/util/Float8_e5m2.cpp
index 3a9fc99981f2..d667ef495977 100644
--- a/c10/util/Float8_e5m2.cpp
+++ b/c10/util/Float8_e5m2.cpp
@@ -3,7 +3,7 @@
 namespace c10 {
 
 static_assert(
-    std::is_standard_layout<Float8_e5m2>::value,
+    std::is_standard_layout_v<Float8_e5m2>,
     "c10::Float8_e5m2 must be standard layout.");
 
 } // namespace c10
diff --git a/c10/util/Float8_e5m2fnuz.cpp b/c10/util/Float8_e5m2fnuz.cpp
index e3349b587248..80cfd40b67aa 100644
--- a/c10/util/Float8_e5m2fnuz.cpp
+++ b/c10/util/Float8_e5m2fnuz.cpp
@@ -1,3 +1,4 @@
+#include <c10/macros/Macros.h>
 #include <c10/util/Float8_e5m2fnuz.h>
 
 namespace c10 {