diff --git a/src/__support/common.h.def b/src/__support/common.h.def
index 48c63de..d2d18c6 100644
--- a/src/__support/common.h.def
+++ b/src/__support/common.h.def
@@ -21,7 +21,6 @@
 
 #ifdef LLVM_LIBC_PUBLIC_PACKAGING
 #define LLVM_LIBC_FUNCTION(type, name, arglist) \
-  type name arglist; \
   LLVM_LIBC_FUNCTION_ATTR decltype(__llvm_libc::name) __##name##_impl__ __asm__(#name); \
   decltype(__llvm_libc::name) name [[gnu::alias(#name)]]; \
   type __##name##_impl__ arglist                                        
diff --git a/src/fenv/feclearexcept.cpp b/src/fenv/feclearexcept.cpp
index be180f6..b0aa763 100644
--- a/src/fenv/feclearexcept.cpp
+++ b/src/fenv/feclearexcept.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/fenv/feclearexcept.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/FEnv.h"
 
diff --git a/src/fenv/fegetround.cpp b/src/fenv/fegetround.cpp
index 669b861..3e198f6 100644
--- a/src/fenv/fegetround.cpp
+++ b/src/fenv/fegetround.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/fenv/fegetround.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/FEnv.h"
 
diff --git a/src/fenv/feraiseexcept.cpp b/src/fenv/feraiseexcept.cpp
index cc3f11a..77128ff 100644
--- a/src/fenv/feraiseexcept.cpp
+++ b/src/fenv/feraiseexcept.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/fenv/feraiseexcept.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/FEnv.h"
 
diff --git a/src/fenv/fesetround.cpp b/src/fenv/fesetround.cpp
index 50e726f..5abd372 100644
--- a/src/fenv/fesetround.cpp
+++ b/src/fenv/fesetround.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/fenv/fesetround.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/FEnv.h"
 
diff --git a/src/fenv/fetestexcept.cpp b/src/fenv/fetestexcept.cpp
index d4f5e1e..4f698dc 100644
--- a/src/fenv/fetestexcept.cpp
+++ b/src/fenv/fetestexcept.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/fenv/fetestexcept.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/FEnv.h"
 
diff --git a/src/math/ceil.cpp b/src/math/ceil.cpp
index 7d603e7..7c59c93 100644
--- a/src/math/ceil.cpp
+++ b/src/math/ceil.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ceil.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/ceilf.cpp b/src/math/ceilf.cpp
index 361f507..9093ee1 100644
--- a/src/math/ceilf.cpp
+++ b/src/math/ceilf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ceilf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/ceill.cpp b/src/math/ceill.cpp
index 525e40b..23edb7a 100644
--- a/src/math/ceill.cpp
+++ b/src/math/ceill.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ceill.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/copysign.cpp b/src/math/copysign.cpp
index 5d7af25..f13fcbe 100644
--- a/src/math/copysign.cpp
+++ b/src/math/copysign.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/copysign.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/copysignf.cpp b/src/math/copysignf.cpp
index beec120..1ea4727 100644
--- a/src/math/copysignf.cpp
+++ b/src/math/copysignf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/copysignf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/copysignl.cpp b/src/math/copysignl.cpp
index c00b7a7..aeb8440 100644
--- a/src/math/copysignl.cpp
+++ b/src/math/copysignl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/copysignl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/cosf.cpp b/src/math/cosf.cpp
index ad0dfed..15911a5 100644
--- a/src/math/cosf.cpp
+++ b/src/math/cosf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/cosf.h"
 #include "math_utils.h"
 #include "sincosf_utils.h"
 
diff --git a/src/math/exp2f.cpp b/src/math/exp2f.cpp
index 012cb82..f9cf8d8 100644
--- a/src/math/exp2f.cpp
+++ b/src/math/exp2f.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/exp2f.h"
 #include "exp_utils.h"
 #include "math_utils.h"
 
diff --git a/src/math/exp_utils.cpp b/src/math/exp_utils.cpp
index 7635f44..a1bda63 100644
--- a/src/math/exp_utils.cpp
+++ b/src/math/exp_utils.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/exp_utils.h"
 #include "exp_utils.h"
 
 #include "math_utils.h"
diff --git a/src/math/expf.cpp b/src/math/expf.cpp
index df10e4e..451f12a 100644
--- a/src/math/expf.cpp
+++ b/src/math/expf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/expf.h"
 #include "exp_utils.h"
 #include "math_utils.h"
 
diff --git a/src/math/fabs.cpp b/src/math/fabs.cpp
index 7069e1d..e737648 100644
--- a/src/math/fabs.cpp
+++ b/src/math/fabs.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fabs.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fabsf.cpp b/src/math/fabsf.cpp
index 6ed9ef7..120e6a8 100644
--- a/src/math/fabsf.cpp
+++ b/src/math/fabsf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fabsf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fabsl.cpp b/src/math/fabsl.cpp
index 3a36459..eecb15a 100644
--- a/src/math/fabsl.cpp
+++ b/src/math/fabsl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fabsl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fdim.cpp b/src/math/fdim.cpp
index ebc998e..b6bef16 100644
--- a/src/math/fdim.cpp
+++ b/src/math/fdim.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fdim.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fdimf.cpp b/src/math/fdimf.cpp
index d922bb9..c46c95a 100644
--- a/src/math/fdimf.cpp
+++ b/src/math/fdimf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fdimf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fdiml.cpp b/src/math/fdiml.cpp
index 5149484..8f74bc0 100644
--- a/src/math/fdiml.cpp
+++ b/src/math/fdiml.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fdiml.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/floor.cpp b/src/math/floor.cpp
index a7a7d78..1f60aa7 100644
--- a/src/math/floor.cpp
+++ b/src/math/floor.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/floor.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/floorf.cpp b/src/math/floorf.cpp
index da464b6..fc251ba 100644
--- a/src/math/floorf.cpp
+++ b/src/math/floorf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/floorf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/floorl.cpp b/src/math/floorl.cpp
index 38d30b8..13253d7 100644
--- a/src/math/floorl.cpp
+++ b/src/math/floorl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/floorl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/fmaf.cpp b/src/math/fmaf.cpp
index 6b989c7..1ab1906 100644
--- a/src/math/fmaf.cpp
+++ b/src/math/fmaf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fmaf.h"
 #include "src/__support/common.h"
 
 #include "utils/FPUtil/FEnv.h"
diff --git a/src/math/fmax.cpp b/src/math/fmax.cpp
index 8090126..d6585bb 100644
--- a/src/math/fmax.cpp
+++ b/src/math/fmax.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fmax.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fmaxf.cpp b/src/math/fmaxf.cpp
index c4932c4..2fc862c 100644
--- a/src/math/fmaxf.cpp
+++ b/src/math/fmaxf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fmaxf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fmaxl.cpp b/src/math/fmaxl.cpp
index acfa9f2..172c2d4 100644
--- a/src/math/fmaxl.cpp
+++ b/src/math/fmaxl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fmaxl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fmin.cpp b/src/math/fmin.cpp
index f4a0056..d5b1d49 100644
--- a/src/math/fmin.cpp
+++ b/src/math/fmin.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fmin.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fminf.cpp b/src/math/fminf.cpp
index a5c8579..0a332c5 100644
--- a/src/math/fminf.cpp
+++ b/src/math/fminf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fminf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/fminl.cpp b/src/math/fminl.cpp
index 9324c14..00bdf00 100644
--- a/src/math/fminl.cpp
+++ b/src/math/fminl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/fminl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/BasicOperations.h"
 
diff --git a/src/math/frexp.cpp b/src/math/frexp.cpp
index 81d5f9e..76a85ef 100644
--- a/src/math/frexp.cpp
+++ b/src/math/frexp.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/frexp.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/frexpf.cpp b/src/math/frexpf.cpp
index 5d9a5b5..5c2655e 100644
--- a/src/math/frexpf.cpp
+++ b/src/math/frexpf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/frexpf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/frexpl.cpp b/src/math/frexpl.cpp
index ccdc184..16c5088 100644
--- a/src/math/frexpl.cpp
+++ b/src/math/frexpl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/frexpl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/hypot.cpp b/src/math/hypot.cpp
index 77a83d8..228f2fd 100644
--- a/src/math/hypot.cpp
+++ b/src/math/hypot.cpp
@@ -6,8 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "utils/FPUtil/Hypot.h"
+#include "src/math/hypot.h"
 #include "src/__support/common.h"
+#include "utils/FPUtil/Hypot.h"
 
 namespace __llvm_libc {
 
diff --git a/src/math/hypotf.cpp b/src/math/hypotf.cpp
index eefc47e..cd37a23 100644
--- a/src/math/hypotf.cpp
+++ b/src/math/hypotf.cpp
@@ -5,6 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
+#include "src/math/hypotf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/Hypot.h"
 
diff --git a/src/math/ilogb.cpp b/src/math/ilogb.cpp
index d2d3772..4f43a5a 100644
--- a/src/math/ilogb.cpp
+++ b/src/math/ilogb.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ilogb.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/ilogbf.cpp b/src/math/ilogbf.cpp
index 529530d..0245777 100644
--- a/src/math/ilogbf.cpp
+++ b/src/math/ilogbf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ilogbf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/ilogbl.cpp b/src/math/ilogbl.cpp
index 92d9936..e4aca46 100644
--- a/src/math/ilogbl.cpp
+++ b/src/math/ilogbl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ilogbl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/ldexp.cpp b/src/math/ldexp.cpp
index 9d8ffb5..b4e5ff4 100644
--- a/src/math/ldexp.cpp
+++ b/src/math/ldexp.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ldexp.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/ldexpf.cpp b/src/math/ldexpf.cpp
index 94030c0..3e3257b 100644
--- a/src/math/ldexpf.cpp
+++ b/src/math/ldexpf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ldexpf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/ldexpl.cpp b/src/math/ldexpl.cpp
index 08aba33..018d5b4 100644
--- a/src/math/ldexpl.cpp
+++ b/src/math/ldexpl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/ldexpl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/llrint.cpp b/src/math/llrint.cpp
index 2f41526..e640cff 100644
--- a/src/math/llrint.cpp
+++ b/src/math/llrint.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/llrint.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/llrintf.cpp b/src/math/llrintf.cpp
index 35dca58..0c292f7 100644
--- a/src/math/llrintf.cpp
+++ b/src/math/llrintf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/llrintf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/llrintl.cpp b/src/math/llrintl.cpp
index 9628863..91659fa 100644
--- a/src/math/llrintl.cpp
+++ b/src/math/llrintl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/llrintl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/llround.cpp b/src/math/llround.cpp
index 79042cf..bfcd8af 100644
--- a/src/math/llround.cpp
+++ b/src/math/llround.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/llround.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/llroundf.cpp b/src/math/llroundf.cpp
index 5601676..13f6eb6 100644
--- a/src/math/llroundf.cpp
+++ b/src/math/llroundf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/llroundf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/llroundl.cpp b/src/math/llroundl.cpp
index 88bd699..4aa3614 100644
--- a/src/math/llroundl.cpp
+++ b/src/math/llroundl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/llroundl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/logb.cpp b/src/math/logb.cpp
index d1f5a5e..8c12062 100644
--- a/src/math/logb.cpp
+++ b/src/math/logb.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/logb.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/logbf.cpp b/src/math/logbf.cpp
index 03a4c6d..45e9b91 100644
--- a/src/math/logbf.cpp
+++ b/src/math/logbf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/logbf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/logbl.cpp b/src/math/logbl.cpp
index 386a504..71ee929 100644
--- a/src/math/logbl.cpp
+++ b/src/math/logbl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/logbl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/lrint.cpp b/src/math/lrint.cpp
index 2cfdf34..2a91c33 100644
--- a/src/math/lrint.cpp
+++ b/src/math/lrint.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/lrint.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/lrintf.cpp b/src/math/lrintf.cpp
index a5eb5f0..e9e1ea1 100644
--- a/src/math/lrintf.cpp
+++ b/src/math/lrintf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/lrintf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/lrintl.cpp b/src/math/lrintl.cpp
index 0157ed1..c7a688e 100644
--- a/src/math/lrintl.cpp
+++ b/src/math/lrintl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/lrintl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/lround.cpp b/src/math/lround.cpp
index 669b5c4..f0a25b7 100644
--- a/src/math/lround.cpp
+++ b/src/math/lround.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/lround.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/lroundf.cpp b/src/math/lroundf.cpp
index ae69637..c4b100a 100644
--- a/src/math/lroundf.cpp
+++ b/src/math/lroundf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/lroundf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/lroundl.cpp b/src/math/lroundl.cpp
index 36ea2ae..4caa95b 100644
--- a/src/math/lroundl.cpp
+++ b/src/math/lroundl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/lroundl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/math_utils.cpp b/src/math/math_utils.cpp
index 42a912b..b72dc27 100644
--- a/src/math/math_utils.cpp
+++ b/src/math/math_utils.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/math_utils.h"
 #include "math_utils.h"
 
 namespace __llvm_libc {
diff --git a/src/math/modf.cpp b/src/math/modf.cpp
index 1942f8f..c0fe74b 100644
--- a/src/math/modf.cpp
+++ b/src/math/modf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/modf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/modff.cpp b/src/math/modff.cpp
index 603f2c7..fced925 100644
--- a/src/math/modff.cpp
+++ b/src/math/modff.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/modff.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/modfl.cpp b/src/math/modfl.cpp
index 8102bc5..b0c1a6e 100644
--- a/src/math/modfl.cpp
+++ b/src/math/modfl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/modfl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/nearbyint.cpp b/src/math/nearbyint.cpp
index 26ff0f4..c4704a2 100644
--- a/src/math/nearbyint.cpp
+++ b/src/math/nearbyint.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/nearbyint.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/nearbyintf.cpp b/src/math/nearbyintf.cpp
index d073dc1..31042d5 100644
--- a/src/math/nearbyintf.cpp
+++ b/src/math/nearbyintf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/nearbyintf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/nearbyintl.cpp b/src/math/nearbyintl.cpp
index d10e1db..b550520 100644
--- a/src/math/nearbyintl.cpp
+++ b/src/math/nearbyintl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/nearbyintl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/nextafter.cpp b/src/math/nextafter.cpp
index 80eabbd..92c96c0 100644
--- a/src/math/nextafter.cpp
+++ b/src/math/nextafter.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/nextafter.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/nextafterf.cpp b/src/math/nextafterf.cpp
index acde903..1e848e3 100644
--- a/src/math/nextafterf.cpp
+++ b/src/math/nextafterf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/nextafterf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/nextafterl.cpp b/src/math/nextafterl.cpp
index c4eee4c..c958e20 100644
--- a/src/math/nextafterl.cpp
+++ b/src/math/nextafterl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/nextafterl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/ManipulationFunctions.h"
 
diff --git a/src/math/remainder.cpp b/src/math/remainder.cpp
index d8e254b..521f66f 100644
--- a/src/math/remainder.cpp
+++ b/src/math/remainder.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/remainder.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/DivisionAndRemainderOperations.h"
 
diff --git a/src/math/remainderf.cpp b/src/math/remainderf.cpp
index 3c4e564..59d21f7 100644
--- a/src/math/remainderf.cpp
+++ b/src/math/remainderf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/remainderf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/DivisionAndRemainderOperations.h"
 
diff --git a/src/math/remainderl.cpp b/src/math/remainderl.cpp
index 842595e..b13ddb6 100644
--- a/src/math/remainderl.cpp
+++ b/src/math/remainderl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/remainderl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/DivisionAndRemainderOperations.h"
 
diff --git a/src/math/remquo.cpp b/src/math/remquo.cpp
index 89803ba..acecce4 100644
--- a/src/math/remquo.cpp
+++ b/src/math/remquo.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/remquo.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/DivisionAndRemainderOperations.h"
 
diff --git a/src/math/remquof.cpp b/src/math/remquof.cpp
index 0330c43..a579137 100644
--- a/src/math/remquof.cpp
+++ b/src/math/remquof.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/remquof.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/DivisionAndRemainderOperations.h"
 
diff --git a/src/math/remquol.cpp b/src/math/remquol.cpp
index 9a30acd..9457aec 100644
--- a/src/math/remquol.cpp
+++ b/src/math/remquol.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/remquol.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/DivisionAndRemainderOperations.h"
 
diff --git a/src/math/rint.cpp b/src/math/rint.cpp
index 056d05a..27a55c8 100644
--- a/src/math/rint.cpp
+++ b/src/math/rint.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/rint.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/rintf.cpp b/src/math/rintf.cpp
index 77a28c8..0800483 100644
--- a/src/math/rintf.cpp
+++ b/src/math/rintf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/rintf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/rintl.cpp b/src/math/rintl.cpp
index fb4819a..b4f417e 100644
--- a/src/math/rintl.cpp
+++ b/src/math/rintl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/rintl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/round.cpp b/src/math/round.cpp
index ed36a12..9687837 100644
--- a/src/math/round.cpp
+++ b/src/math/round.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/round.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/roundf.cpp b/src/math/roundf.cpp
index a2be709..b075e5f 100644
--- a/src/math/roundf.cpp
+++ b/src/math/roundf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/roundf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/roundl.cpp b/src/math/roundl.cpp
index 7e3ba5e..18c8d85 100644
--- a/src/math/roundl.cpp
+++ b/src/math/roundl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/roundl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/sincosf.cpp b/src/math/sincosf.cpp
index 4903af3..c032cd3 100644
--- a/src/math/sincosf.cpp
+++ b/src/math/sincosf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/sincosf.h"
 #include "math_utils.h"
 #include "sincosf_utils.h"
 
diff --git a/src/math/sinf.cpp b/src/math/sinf.cpp
index 40bdc44..467480e 100644
--- a/src/math/sinf.cpp
+++ b/src/math/sinf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/sinf.h"
 #include "math_utils.h"
 #include "sincosf_utils.h"
 
diff --git a/src/math/sqrt.cpp b/src/math/sqrt.cpp
index 7c6a115..2f17f4e 100644
--- a/src/math/sqrt.cpp
+++ b/src/math/sqrt.cpp
@@ -6,8 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "utils/FPUtil/Sqrt.h"
+#include "src/math/sqrt.h"
 #include "src/__support/common.h"
+#include "utils/FPUtil/Sqrt.h"
 
 namespace __llvm_libc {
 
diff --git a/src/math/sqrtf.cpp b/src/math/sqrtf.cpp
index 5383e93..026c2f9 100644
--- a/src/math/sqrtf.cpp
+++ b/src/math/sqrtf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/sqrtf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/Sqrt.h"
 
diff --git a/src/math/sqrtl.cpp b/src/math/sqrtl.cpp
index a526e5e..0c7b806 100644
--- a/src/math/sqrtl.cpp
+++ b/src/math/sqrtl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/sqrtl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/Sqrt.h"
 
diff --git a/src/math/trunc.cpp b/src/math/trunc.cpp
index 68b5b85..e3174cc 100644
--- a/src/math/trunc.cpp
+++ b/src/math/trunc.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/trunc.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/truncf.cpp b/src/math/truncf.cpp
index 8b9949f..cd8c8ab 100644
--- a/src/math/truncf.cpp
+++ b/src/math/truncf.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/truncf.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/math/truncl.cpp b/src/math/truncl.cpp
index f78a193..0106fb8 100644
--- a/src/math/truncl.cpp
+++ b/src/math/truncl.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/math/truncl.h"
 #include "src/__support/common.h"
 #include "utils/FPUtil/NearestIntegerOperations.h"
 
diff --git a/src/threads/linux/call_once.cpp b/src/threads/linux/call_once.cpp
index 9e1d935..ac8aca4 100644
--- a/src/threads/linux/call_once.cpp
+++ b/src/threads/linux/call_once.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/threads/call_once.h"
 #include "config/linux/syscall.h" // For syscall functions.
 #include "include/sys/syscall.h"  // For syscall numbers.
 #include "include/threads.h"      // For call_once related type definition.
diff --git a/src/threads/linux/mtx_init.cpp b/src/threads/linux/mtx_init.cpp
index 610098a..1a77dcb 100644
--- a/src/threads/linux/mtx_init.cpp
+++ b/src/threads/linux/mtx_init.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/threads/mtx_init.h"
 #include "include/threads.h" // For mtx_t definition.
 #include "src/__support/common.h"
 #include "src/threads/linux/thread_utils.h"
diff --git a/src/threads/linux/mtx_lock.cpp b/src/threads/linux/mtx_lock.cpp
index 923b1b6..7ae30a7 100644
--- a/src/threads/linux/mtx_lock.cpp
+++ b/src/threads/linux/mtx_lock.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/threads/mtx_lock.h"
 #include "config/linux/syscall.h" // For syscall functions.
 #include "include/sys/syscall.h"  // For syscall numbers.
 #include "include/threads.h"      // For mtx_t definition.
diff --git a/src/threads/linux/mtx_unlock.cpp b/src/threads/linux/mtx_unlock.cpp
index 370e1b1..02e2f1a 100644
--- a/src/threads/linux/mtx_unlock.cpp
+++ b/src/threads/linux/mtx_unlock.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/threads/mtx_unlock.h"
 #include "config/linux/syscall.h" // For syscall functions.
 #include "include/sys/syscall.h"  // For syscall numbers.
 #include "include/threads.h"      // For mtx_t definition.
diff --git a/src/threads/linux/thrd_create.cpp b/src/threads/linux/thrd_create.cpp
index ff47e53..8b68f2a 100644
--- a/src/threads/linux/thrd_create.cpp
+++ b/src/threads/linux/thrd_create.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/threads/thrd_create.h"
 #include "config/linux/syscall.h" // For syscall function.
 #include "include/errno.h"        // For E* error values.
 #include "include/sys/mman.h"     // For PROT_* and MAP_* definitions.
diff --git a/src/threads/linux/thrd_join.cpp b/src/threads/linux/thrd_join.cpp
index c0ad33c..7b6cbb7 100644
--- a/src/threads/linux/thrd_join.cpp
+++ b/src/threads/linux/thrd_join.cpp
@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "src/threads/thrd_join.h"
 #include "config/linux/syscall.h" // For syscall function.
 #include "include/sys/syscall.h"  // For syscall numbers.
 #include "include/threads.h"      // For thrd_* type definitions.