[libc-commits] [libc] a1dc546 - [libc] add missing headers in stdfix (#162078)

[via libc-commits]

Author: Shreeyash Pandey
Date: 2025-10-24T10:42:31-07:00
New Revision: a1dc546f7f2130b2a9b8c29f24ee57ad9002f5a3

URL: https://github.com/llvm/llvm-project/commit/a1dc546f7f2130b2a9b8c29f24ee57ad9002f5a3
DIFF: https://github.com/llvm/llvm-project/commit/a1dc546f7f2130b2a9b8c29f24ee57ad9002f5a3.diff

LOG: [libc] add missing headers in stdfix (#162078)

Fixes https://github.com/llvm/llvm-project/issues/129361

@michaelrj-google @PiJoules

---------

Signed-off-by: Shreeyash Pandey <shreeyash335 at gmail.com>
Co-authored-by: Michael Jones <michaelrj at google.com>

Added: 
    libc/include/llvm-libc-types/int_hk_t.h
    libc/include/llvm-libc-types/int_hr_t.h
    libc/include/llvm-libc-types/int_k_t.h
    libc/include/llvm-libc-types/int_lk_t.h
    libc/include/llvm-libc-types/int_lr_t.h
    libc/include/llvm-libc-types/int_r_t.h
    libc/include/llvm-libc-types/uint_uhk_t.h
    libc/include/llvm-libc-types/uint_uhr_t.h
    libc/include/llvm-libc-types/uint_uk_t.h
    libc/include/llvm-libc-types/uint_ulk_t.h
    libc/include/llvm-libc-types/uint_ulr_t.h
    libc/include/llvm-libc-types/uint_ur_t.h

Modified: 
    libc/include/CMakeLists.txt
    libc/include/llvm-libc-types/CMakeLists.txt
    libc/include/stdfix.yaml
    libc/src/stdfix/CMakeLists.txt
    libc/src/stdfix/bitshk.cpp
    libc/src/stdfix/bitshk.h
    libc/src/stdfix/bitshr.cpp
    libc/src/stdfix/bitshr.h
    libc/src/stdfix/bitsk.cpp
    libc/src/stdfix/bitsk.h
    libc/src/stdfix/bitslk.cpp
    libc/src/stdfix/bitslk.h
    libc/src/stdfix/bitslr.cpp
    libc/src/stdfix/bitslr.h
    libc/src/stdfix/bitsr.cpp
    libc/src/stdfix/bitsr.h
    libc/src/stdfix/bitsuhk.cpp
    libc/src/stdfix/bitsuhk.h
    libc/src/stdfix/bitsuhr.cpp
    libc/src/stdfix/bitsuhr.h
    libc/src/stdfix/bitsuk.cpp
    libc/src/stdfix/bitsuk.h
    libc/src/stdfix/bitsulk.cpp
    libc/src/stdfix/bitsulk.h
    libc/src/stdfix/bitsulr.cpp
    libc/src/stdfix/bitsulr.h
    libc/src/stdfix/bitsur.cpp
    libc/src/stdfix/bitsur.h
    libc/src/stdfix/bitusk.cpp
    libc/src/stdfix/hkbits.h
    libc/src/stdfix/hrbits.h
    libc/src/stdfix/kbits.h
    libc/src/stdfix/lkbits.h
    libc/src/stdfix/lrbits.h
    libc/src/stdfix/rbits.h
    libc/src/stdfix/uhkbits.h
    libc/src/stdfix/uhrbits.h
    libc/src/stdfix/ukbits.h
    libc/src/stdfix/ulkbits.h
    libc/src/stdfix/ulrbits.h
    libc/src/stdfix/urbits.h
    libc/test/src/stdfix/CMakeLists.txt
    libc/test/src/stdfix/FxBitsTest.h
    libc/test/src/stdfix/bitshk_test.cpp
    libc/test/src/stdfix/bitshr_test.cpp
    libc/test/src/stdfix/bitsk_test.cpp
    libc/test/src/stdfix/bitslk_test.cpp
    libc/test/src/stdfix/bitslr_test.cpp
    libc/test/src/stdfix/bitsr_test.cpp
    libc/test/src/stdfix/bitsuhk_test.cpp
    libc/test/src/stdfix/bitsuhr_test.cpp
    libc/test/src/stdfix/bitsuk_test.cpp
    libc/test/src/stdfix/bitsulk_test.cpp
    libc/test/src/stdfix/bitsulr_test.cpp
    libc/test/src/stdfix/bitsur_test.cpp

Removed: 
    libc/include/llvm-libc-types/stdfix-types.h


################################################################################
diff  --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index a277690ae2e17..7b52daf9a8062 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -166,7 +166,18 @@ add_header_macro(
   stdfix.h
   DEPENDS
     .llvm-libc-macros.stdfix_macros
-    .llvm-libc-types.stdfix-types
+    .llvm-libc-types.int_hk_t
+    .llvm-libc-types.int_hr_t
+    .llvm-libc-types.int_k_t
+    .llvm-libc-types.int_lk_t
+    .llvm-libc-types.int_lr_t
+    .llvm-libc-types.int_r_t
+    .llvm-libc-types.uint_uhk_t
+    .llvm-libc-types.uint_uhr_t
+    .llvm-libc-types.uint_uk_t
+    .llvm-libc-types.uint_ulk_t
+    .llvm-libc-types.uint_ulr_t
+    .llvm-libc-types.uint_ur_t
 )
 
 

diff  --git a/libc/include/llvm-libc-types/CMakeLists.txt b/libc/include/llvm-libc-types/CMakeLists.txt
index a428a0e73aab2..fcd0e1245a4a8 100644
--- a/libc/include/llvm-libc-types/CMakeLists.txt
+++ b/libc/include/llvm-libc-types/CMakeLists.txt
@@ -174,7 +174,18 @@ DEPENDS
 )
 add_header(locale_t HDR locale_t.h)
 add_header(struct_lconv HDR struct_lconv.h)
-add_header(stdfix-types HDR stdfix-types.h)
+add_header(int_hk_t HDR int_hk_t.h)
+add_header(int_hr_t HDR int_hr_t.h)
+add_header(int_k_t HDR int_k_t.h)
+add_header(int_lk_t HDR int_lk_t.h)
+add_header(int_lr_t HDR int_lr_t.h)
+add_header(int_r_t HDR int_r_t.h)
+add_header(uint_uhk_t HDR uint_uhk_t.h)
+add_header(uint_uhr_t HDR uint_uhr_t.h)
+add_header(uint_uk_t HDR uint_uk_t.h)
+add_header(uint_ulk_t HDR uint_ulk_t.h)
+add_header(uint_ulr_t HDR uint_ulr_t.h)
+add_header(uint_ur_t HDR uint_ur_t.h)
 
 # UEFI
 add_header(EFI_GUID HDR EFI_GUID.h DEPENDS libc.include.llvm-libc-macros.stdint_macros)

diff  --git a/libc/include/llvm-libc-types/int_hk_t.h b/libc/include/llvm-libc-types/int_hk_t.h
new file mode 100644
index 0000000000000..eb172245e457b
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_hk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_HK_T_H
+#define LLVM_LIBC_TYPES_INT_HK_T_H
+
+typedef signed short int_hk_t;
+
+#endif // LLVM_LIBC_TYPES_INT_HK_T_H

diff  --git a/libc/include/llvm-libc-types/int_hr_t.h b/libc/include/llvm-libc-types/int_hr_t.h
new file mode 100644
index 0000000000000..89b57a80a15a6
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_hr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_HR_T_H
+#define LLVM_LIBC_TYPES_INT_HR_T_H
+
+typedef signed char int_hr_t;
+
+#endif // LLVM_LIBC_TYPES_INT_HR_T_H

diff  --git a/libc/include/llvm-libc-types/int_k_t.h b/libc/include/llvm-libc-types/int_k_t.h
new file mode 100644
index 0000000000000..193f9d823808f
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_k_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_K_T_H
+#define LLVM_LIBC_TYPES_INT_K_T_H
+
+typedef signed int int_k_t;
+
+#endif // LLVM_LIBC_TYPES_INT_K_T_H

diff  --git a/libc/include/llvm-libc-types/int_lk_t.h b/libc/include/llvm-libc-types/int_lk_t.h
new file mode 100644
index 0000000000000..c8f31373d0f46
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_lk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_LK_T_H
+#define LLVM_LIBC_TYPES_INT_LK_T_H
+
+typedef signed long long int_lk_t;
+
+#endif // LLVM_LIBC_TYPES_INT_LK_T_H

diff  --git a/libc/include/llvm-libc-types/int_lr_t.h b/libc/include/llvm-libc-types/int_lr_t.h
new file mode 100644
index 0000000000000..f2987e8d708d1
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_lr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_LR_T_H
+#define LLVM_LIBC_TYPES_INT_LR_T_H
+
+typedef signed int int_lr_t;
+
+#endif // LLVM_LIBC_TYPES_INT_LR_T_H

diff  --git a/libc/include/llvm-libc-types/int_r_t.h b/libc/include/llvm-libc-types/int_r_t.h
new file mode 100644
index 0000000000000..6b528f4a84bdf
--- /dev/null
+++ b/libc/include/llvm-libc-types/int_r_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_INT_R_T_H
+#define LLVM_LIBC_TYPES_INT_R_T_H
+
+typedef signed short int int_r_t;
+
+#endif // LLVM_LIBC_TYPES_INT_R_T_H

diff  --git a/libc/include/llvm-libc-types/stdfix-types.h b/libc/include/llvm-libc-types/stdfix-types.h
deleted file mode 100644
index 542d45ea97e96..0000000000000
--- a/libc/include/llvm-libc-types/stdfix-types.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//===-- Definition of stdfix integer types --------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_LIBC_TYPES_STDFIX_TYPES_H
-#define LLVM_LIBC_TYPES_STDFIX_TYPES_H
-
-typedef signed char int_hr_t;
-typedef signed short int int_r_t;
-typedef signed int int_lr_t;
-typedef signed short int_hk_t;
-typedef signed int int_k_t;
-typedef signed long long int_lk_t;
-typedef unsigned char uint_uhr_t;
-typedef unsigned short int uint_ur_t;
-typedef unsigned int uint_ulr_t;
-typedef unsigned short int uint_uhk_t;
-typedef unsigned int uint_uk_t;
-typedef unsigned long long uint_ulk_t;
-
-#endif // LLVM_LIBC_TYPES_STDFIX_TYPES_H

diff  --git a/libc/include/llvm-libc-types/uint_uhk_t.h b/libc/include/llvm-libc-types/uint_uhk_t.h
new file mode 100644
index 0000000000000..ed0f427ebecac
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_uhk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UHK_T_H
+#define LLVM_LIBC_TYPES_UINT_UHK_T_H
+
+typedef unsigned short int uint_uhk_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UHK_T_H

diff  --git a/libc/include/llvm-libc-types/uint_uhr_t.h b/libc/include/llvm-libc-types/uint_uhr_t.h
new file mode 100644
index 0000000000000..e3eab1c24d0dd
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_uhr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UHR_T_H
+#define LLVM_LIBC_TYPES_UINT_UHR_T_H
+
+typedef unsigned char uint_uhr_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UHR_T_H

diff  --git a/libc/include/llvm-libc-types/uint_uk_t.h b/libc/include/llvm-libc-types/uint_uk_t.h
new file mode 100644
index 0000000000000..f9bbc7b78f9af
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_uk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UK_T_H
+#define LLVM_LIBC_TYPES_UINT_UK_T_H
+
+typedef unsigned int uint_uk_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UK_T_H

diff  --git a/libc/include/llvm-libc-types/uint_ulk_t.h b/libc/include/llvm-libc-types/uint_ulk_t.h
new file mode 100644
index 0000000000000..b7a54b02d19d4
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_ulk_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_ULK_T_H
+#define LLVM_LIBC_TYPES_UINT_ULK_T_H
+
+typedef unsigned long long uint_ulk_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_ULK_T_H

diff  --git a/libc/include/llvm-libc-types/uint_ulr_t.h b/libc/include/llvm-libc-types/uint_ulr_t.h
new file mode 100644
index 0000000000000..9f4682c29c536
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_ulr_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_ULR_T_H
+#define LLVM_LIBC_TYPES_UINT_ULR_T_H
+
+typedef unsigned int uint_ulr_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_ULR_T_H

diff  --git a/libc/include/llvm-libc-types/uint_ur_t.h b/libc/include/llvm-libc-types/uint_ur_t.h
new file mode 100644
index 0000000000000..267c9c44e9fd9
--- /dev/null
+++ b/libc/include/llvm-libc-types/uint_ur_t.h
@@ -0,0 +1,14 @@
+//===-- LLVM LIBC TYPES --------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_TYPES_UINT_UR_T_H
+#define LLVM_LIBC_TYPES_UINT_UR_T_H
+
+typedef unsigned short int uint_ur_t;
+
+#endif // LLVM_LIBC_TYPES_UINT_UR_T_H

diff  --git a/libc/include/stdfix.yaml b/libc/include/stdfix.yaml
index 451330c3478d2..9f1a32f25c8b6 100644
--- a/libc/include/stdfix.yaml
+++ b/libc/include/stdfix.yaml
@@ -8,7 +8,19 @@ macros:
   - macro_name: roundfx
     macro_header: stdfix-macros.h
 types:
-  - type_name: stdfix-types
+  - type_name: int_hk_t
+  - type_name: int_hr_t
+  - type_name: int_k_t
+  - type_name: int_lk_t
+  - type_name: int_lr_t
+  - type_name: int_r_t
+  - type_name: uint_uhk_t
+  - type_name: uint_uhr_t
+  - type_name: uint_uk_t
+  - type_name: uint_ulk_t
+  - type_name: uint_ulr_t
+  - type_name: uint_ur_t
+
 enums: []
 objects: []
 functions:

diff  --git a/libc/src/stdfix/CMakeLists.txt b/libc/src/stdfix/CMakeLists.txt
index 3cbabd17ad34c..e9841cd940315 100644
--- a/libc/src/stdfix/CMakeLists.txt
+++ b/libc/src/stdfix/CMakeLists.txt
@@ -58,7 +58,6 @@ foreach(suffix IN ITEMS hr r lr hk k lk uhr ur ulr uhk uk ulk)
       ${libc_opt_high_flag}
     DEPENDS
       libc.src.__support.fixed_point.fx_bits
-      libc.include.llvm-libc-types.stdfix-types
       libc.include.llvm-libc-macros.stdfix_macros
   )
 

diff  --git a/libc/src/stdfix/bitshk.cpp b/libc/src/stdfix/bitshk.cpp
index d0a3e128bdd65..be4e71a06557d 100644
--- a/libc/src/stdfix/bitshk.cpp
+++ b/libc/src/stdfix/bitshk.cpp
@@ -8,7 +8,7 @@
 
 #include "bitshk.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // short accum
-#include "include/llvm-libc-types/stdfix-types.h"   // int_hk_t
+#include "include/llvm-libc-types/int_hk_t.h"
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitshk.h b/libc/src/stdfix/bitshk.h
index a1505e2e56d85..24395762e0166 100644
--- a/libc/src/stdfix/bitshk.h
+++ b/libc/src/stdfix/bitshk.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSHK_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // short accum
-#include "include/llvm-libc-types/stdfix-types.h"   // int_hk_t
+#include "include/llvm-libc-types/int_hk_t.h"       // int_hk_t
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitshr.cpp b/libc/src/stdfix/bitshr.cpp
index 394d1f08f6ae5..e70bf0a9e55a7 100644
--- a/libc/src/stdfix/bitshr.cpp
+++ b/libc/src/stdfix/bitshr.cpp
@@ -8,7 +8,7 @@
 
 #include "bitshr.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // short fract
-#include "include/llvm-libc-types/stdfix-types.h"   // int_hr_t
+#include "include/llvm-libc-types/int_hr_t.h"
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitshr.h b/libc/src/stdfix/bitshr.h
index d5b4b8f56a7e9..c1517a969f77b 100644
--- a/libc/src/stdfix/bitshr.h
+++ b/libc/src/stdfix/bitshr.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSHR_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // short fract
-#include "include/llvm-libc-types/stdfix-types.h"   // int_hr_t
+#include "include/llvm-libc-types/int_hr_t.h"
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsk.cpp b/libc/src/stdfix/bitsk.cpp
index f8c9d77d56e9c..0f1a3f3d0175b 100644
--- a/libc/src/stdfix/bitsk.cpp
+++ b/libc/src/stdfix/bitsk.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsk.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // accum
-#include "include/llvm-libc-types/stdfix-types.h"   // int_k_t
+#include "include/llvm-libc-types/int_k_t.h"
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsk.h b/libc/src/stdfix/bitsk.h
index 32d5a724dfb0b..3e41b4359cc3f 100644
--- a/libc/src/stdfix/bitsk.h
+++ b/libc/src/stdfix/bitsk.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSK_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // accum
-#include "include/llvm-libc-types/stdfix-types.h"   // int_k_t
+#include "include/llvm-libc-types/int_k_t.h"
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitslk.cpp b/libc/src/stdfix/bitslk.cpp
index f4af2a8cd8b99..1065c3223ac45 100644
--- a/libc/src/stdfix/bitslk.cpp
+++ b/libc/src/stdfix/bitslk.cpp
@@ -8,7 +8,7 @@
 
 #include "bitslk.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // long accum
-#include "include/llvm-libc-types/stdfix-types.h"   // int_lk_t
+#include "include/llvm-libc-types/int_lk_t.h"       // int_lk_t
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitslk.h b/libc/src/stdfix/bitslk.h
index 821116b9a7c1b..e1a0c18b5e67e 100644
--- a/libc/src/stdfix/bitslk.h
+++ b/libc/src/stdfix/bitslk.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSLK_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // long accum
-#include "include/llvm-libc-types/stdfix-types.h"   // int_lk_t
+#include "include/llvm-libc-types/int_lk_t.h"
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitslr.cpp b/libc/src/stdfix/bitslr.cpp
index 3b38aa21a6338..e8a499389db03 100644
--- a/libc/src/stdfix/bitslr.cpp
+++ b/libc/src/stdfix/bitslr.cpp
@@ -8,7 +8,7 @@
 
 #include "bitslr.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // long fract
-#include "include/llvm-libc-types/stdfix-types.h"   // int_lr_t
+#include "include/llvm-libc-types/int_lr_t.h"       // int_lr_t
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitslr.h b/libc/src/stdfix/bitslr.h
index 0cb597214f550..d0e468b63e32a 100644
--- a/libc/src/stdfix/bitslr.h
+++ b/libc/src/stdfix/bitslr.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSLR_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // long fract
-#include "include/llvm-libc-types/stdfix-types.h"   // int_lr_t
+#include "include/llvm-libc-types/int_lr_t.h"       // int_lr_t
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsr.cpp b/libc/src/stdfix/bitsr.cpp
index 2b6ad2cfe189a..4eefe28a71f91 100644
--- a/libc/src/stdfix/bitsr.cpp
+++ b/libc/src/stdfix/bitsr.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsr.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // fract
-#include "include/llvm-libc-types/stdfix-types.h"   // int_r_t
+#include "include/llvm-libc-types/int_r_t.h"        // int_r_t
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsr.h b/libc/src/stdfix/bitsr.h
index e071f034cd107..5742a59bb1d61 100644
--- a/libc/src/stdfix/bitsr.h
+++ b/libc/src/stdfix/bitsr.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSR_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // fract
-#include "include/llvm-libc-types/stdfix-types.h"   // int_r_t
+#include "include/llvm-libc-types/int_r_t.h"
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsuhk.cpp b/libc/src/stdfix/bitsuhk.cpp
index 1b0bf59a550f1..62f7cf3d454d5 100755
--- a/libc/src/stdfix/bitsuhk.cpp
+++ b/libc/src/stdfix/bitsuhk.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsuhk.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short accum
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_uhk_t
+#include "include/llvm-libc-types/uint_uhk_t.h"     // uint_uhk_t
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsuhk.h b/libc/src/stdfix/bitsuhk.h
index 1e80286d77099..b3082829892aa 100755
--- a/libc/src/stdfix/bitsuhk.h
+++ b/libc/src/stdfix/bitsuhk.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSUHK_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short accum
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_uhk_t
+#include "include/llvm-libc-types/uint_uhk_t.h"     // uint_uhk_t
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsuhr.cpp b/libc/src/stdfix/bitsuhr.cpp
index 66152e14bb209..236b2a0879533 100755
--- a/libc/src/stdfix/bitsuhr.cpp
+++ b/libc/src/stdfix/bitsuhr.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsuhr.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short fract
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_uhr_t
+#include "include/llvm-libc-types/uint_uhr_t.h"
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsuhr.h b/libc/src/stdfix/bitsuhr.h
index 0311665bc17f3..662cd9cd2f5b6 100755
--- a/libc/src/stdfix/bitsuhr.h
+++ b/libc/src/stdfix/bitsuhr.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSUHR_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned short fract
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_uhr_t
+#include "include/llvm-libc-types/uint_uhr_t.h"
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsuk.cpp b/libc/src/stdfix/bitsuk.cpp
index b0a92bd92d4ea..32a4fbea03ab4 100755
--- a/libc/src/stdfix/bitsuk.cpp
+++ b/libc/src/stdfix/bitsuk.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsuk.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned accum
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_uk_t
+#include "include/llvm-libc-types/uint_uk_t.h"      // uint_uk_t
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsuk.h b/libc/src/stdfix/bitsuk.h
index fce37e82d44c1..b73d64ba7e657 100755
--- a/libc/src/stdfix/bitsuk.h
+++ b/libc/src/stdfix/bitsuk.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSUK_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned accum
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_uk_t
+#include "include/llvm-libc-types/uint_uk_t.h"
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsulk.cpp b/libc/src/stdfix/bitsulk.cpp
index b8f61a16eb61e..d1000da7a2ec2 100755
--- a/libc/src/stdfix/bitsulk.cpp
+++ b/libc/src/stdfix/bitsulk.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsulk.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long accum
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_ulk_t
+#include "include/llvm-libc-types/uint_ulk_t.h"     // uint_ulk_t
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsulk.h b/libc/src/stdfix/bitsulk.h
index 1bf681ee751c6..9a1a9e90d55d8 100755
--- a/libc/src/stdfix/bitsulk.h
+++ b/libc/src/stdfix/bitsulk.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSLK_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long accum
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_ulk_t
+#include "include/llvm-libc-types/uint_ulk_t.h"
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsulr.cpp b/libc/src/stdfix/bitsulr.cpp
index 9fd1b15bedad9..4099b715846e1 100755
--- a/libc/src/stdfix/bitsulr.cpp
+++ b/libc/src/stdfix/bitsulr.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsulr.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long fract
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_ulr_t
+#include "include/llvm-libc-types/uint_ulr_t.h"
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsulr.h b/libc/src/stdfix/bitsulr.h
index cf0f6fbe6698d..7ca985d863349 100755
--- a/libc/src/stdfix/bitsulr.h
+++ b/libc/src/stdfix/bitsulr.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSULR_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned long fract
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_ulr_t
+#include "include/llvm-libc-types/uint_ulr_t.h"     // uint_ulr_t
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitsur.cpp b/libc/src/stdfix/bitsur.cpp
index ffb52de9257bf..8d422d4df6623 100755
--- a/libc/src/stdfix/bitsur.cpp
+++ b/libc/src/stdfix/bitsur.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsur.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned fract
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_ur_t
+#include "include/llvm-libc-types/uint_ur_t.h"
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/bitsur.h b/libc/src/stdfix/bitsur.h
index 4c938bb65ec8d..c413ef6d0a00a 100755
--- a/libc/src/stdfix/bitsur.h
+++ b/libc/src/stdfix/bitsur.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_BITSUR_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned fract
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_ur_t
+#include "include/llvm-libc-types/uint_ur_t.h"      // uint_ur_t
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/bitusk.cpp b/libc/src/stdfix/bitusk.cpp
index ac0852e078c60..8309927f9ed82 100755
--- a/libc/src/stdfix/bitusk.cpp
+++ b/libc/src/stdfix/bitusk.cpp
@@ -8,7 +8,7 @@
 
 #include "bitsuk.h"
 #include "include/llvm-libc-macros/stdfix-macros.h" // unsigned accum
-#include "include/llvm-libc-types/stdfix-types.h"   // uint_uk_t
+#include "include/llvm-libc-types/uint_uk_t.h"
 #include "src/__support/common.h"                   // LLVM_LIBC_FUNCTION
 #include "src/__support/fixed_point/fx_bits.h"      // fixed_point
 #include "src/__support/macros/config.h"            // LIBC_NAMESPACE_DECL

diff  --git a/libc/src/stdfix/hkbits.h b/libc/src/stdfix/hkbits.h
index bf1bf82f9f445..f674492d570d7 100644
--- a/libc/src/stdfix/hkbits.h
+++ b/libc/src/stdfix/hkbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_HKBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_hk_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/hrbits.h b/libc/src/stdfix/hrbits.h
index c6bd99a2acb19..7cfda64f8ce8a 100644
--- a/libc/src/stdfix/hrbits.h
+++ b/libc/src/stdfix/hrbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_HRBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_hr_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/kbits.h b/libc/src/stdfix/kbits.h
index 7e709af442466..c45cf8ddc60f9 100644
--- a/libc/src/stdfix/kbits.h
+++ b/libc/src/stdfix/kbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_KBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_k_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/lkbits.h b/libc/src/stdfix/lkbits.h
index 177f121e2358e..2d30bdbaf0101 100644
--- a/libc/src/stdfix/lkbits.h
+++ b/libc/src/stdfix/lkbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_LKBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_lk_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/lrbits.h b/libc/src/stdfix/lrbits.h
index 087aa19779e62..000594ff9a8f8 100644
--- a/libc/src/stdfix/lrbits.h
+++ b/libc/src/stdfix/lrbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_LRBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_lr_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/rbits.h b/libc/src/stdfix/rbits.h
index 4922e1c3a2e5f..df11cec791ed1 100644
--- a/libc/src/stdfix/rbits.h
+++ b/libc/src/stdfix/rbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_RBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/int_r_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/uhkbits.h b/libc/src/stdfix/uhkbits.h
index 7ef15986f696c..3eef3aa4224a5 100644
--- a/libc/src/stdfix/uhkbits.h
+++ b/libc/src/stdfix/uhkbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_UHKBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_uhk_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/uhrbits.h b/libc/src/stdfix/uhrbits.h
index 4011a0e118c7b..7198e7052ee4b 100644
--- a/libc/src/stdfix/uhrbits.h
+++ b/libc/src/stdfix/uhrbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_UHRBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_uhr_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/ukbits.h b/libc/src/stdfix/ukbits.h
index 2374f48a4dbb6..20302cd90ec1e 100644
--- a/libc/src/stdfix/ukbits.h
+++ b/libc/src/stdfix/ukbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_UKBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_uk_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/ulkbits.h b/libc/src/stdfix/ulkbits.h
index 955c96c6a4957..04a74f35a2ffb 100644
--- a/libc/src/stdfix/ulkbits.h
+++ b/libc/src/stdfix/ulkbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_ULKBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_ulk_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/ulrbits.h b/libc/src/stdfix/ulrbits.h
index 7ae49ba212b72..e5d55ab81539d 100644
--- a/libc/src/stdfix/ulrbits.h
+++ b/libc/src/stdfix/ulrbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_ULRBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_ulr_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/src/stdfix/urbits.h b/libc/src/stdfix/urbits.h
index 8fc0881cf645b..ffa3b38529fda 100644
--- a/libc/src/stdfix/urbits.h
+++ b/libc/src/stdfix/urbits.h
@@ -10,7 +10,7 @@
 #define LLVM_LIBC_SRC_STDFIX_URBITS_H
 
 #include "include/llvm-libc-macros/stdfix-macros.h"
-#include "include/llvm-libc-types/stdfix-types.h"
+#include "include/llvm-libc-types/uint_ur_t.h"
 #include "src/__support/macros/config.h"
 
 namespace LIBC_NAMESPACE_DECL {

diff  --git a/libc/test/src/stdfix/CMakeLists.txt b/libc/test/src/stdfix/CMakeLists.txt
index 741522276feaa..04bedc3e00fe2 100644
--- a/libc/test/src/stdfix/CMakeLists.txt
+++ b/libc/test/src/stdfix/CMakeLists.txt
@@ -4,7 +4,6 @@ endif()
 
 add_custom_target(libc-stdfix-tests)
 
-
 foreach(suffix IN ITEMS hr r lr hk k lk)
   add_libc_test(
     abs${suffix}_test
@@ -84,6 +83,18 @@ foreach(suffix IN ITEMS hr r lr hk k lk uhr ur ulr uhk uk ulk)
     SRCS
       bits${suffix}_test.cpp
     DEPENDS
+      libc.include.llvm-libc-types.int_k_t
+      libc.include.llvm-libc-types.int_hr_t
+      libc.include.llvm-libc-types.int_lk_t
+      libc.include.llvm-libc-types.int_lr_t
+      libc.include.llvm-libc-types.int_r_t
+      libc.include.llvm-libc-types.uint_uhk_t
+      libc.include.llvm-libc-types.uint_uhr_t
+      libc.include.llvm-libc-types.uint_uk_t
+      libc.include.llvm-libc-types.uint_ulk_t
+      libc.include.llvm-libc-types.uint_ulr_t
+      libc.include.llvm-libc-types.uint_ur_t
+      libc.include.llvm-libc-types.int_hk_t
       libc.src.stdfix.bits${suffix}
       libc.src.__support.fixed_point.fx_rep
       libc.src.__support.fixed_point.fx_bits

diff  --git a/libc/test/src/stdfix/FxBitsTest.h b/libc/test/src/stdfix/FxBitsTest.h
index ae04cc145f271..18dacadf08b03 100644
--- a/libc/test/src/stdfix/FxBitsTest.h
+++ b/libc/test/src/stdfix/FxBitsTest.h
@@ -8,7 +8,6 @@
 
 #include "test/UnitTest/Test.h"
 
-#include "include/llvm-libc-types/stdfix-types.h"
 #include "src/__support/CPP/bit.h"
 #include "src/__support/fixed_point/fx_bits.h"
 

diff  --git a/libc/test/src/stdfix/bitshk_test.cpp b/libc/test/src/stdfix/bitshk_test.cpp
index ca83162d439a6..85dbf0a8067ab 100644
--- a/libc/test/src/stdfix/bitshk_test.cpp
+++ b/libc/test/src/stdfix/bitshk_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // int_hk_t
+#include "llvm-libc-types/int_hk_t.h" // int_hk_t
 #include "src/stdfix/bitshk.h"
 
 LIST_BITSFX_TESTS(hk, short accum, int_hk_t, LIBC_NAMESPACE::bitshk);

diff  --git a/libc/test/src/stdfix/bitshr_test.cpp b/libc/test/src/stdfix/bitshr_test.cpp
index 220d7f6a69c16..d9583ad2bf4df 100644
--- a/libc/test/src/stdfix/bitshr_test.cpp
+++ b/libc/test/src/stdfix/bitshr_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // int_hr_t
+#include "llvm-libc-types/int_hr_t.h" // int_hr_t
 #include "src/stdfix/bitshr.h"
 
 LIST_BITSFX_TESTS(hr, short fract, int_hr_t, LIBC_NAMESPACE::bitshr);

diff  --git a/libc/test/src/stdfix/bitsk_test.cpp b/libc/test/src/stdfix/bitsk_test.cpp
index 7e0057bae4657..8d38ab5eb5fda 100644
--- a/libc/test/src/stdfix/bitsk_test.cpp
+++ b/libc/test/src/stdfix/bitsk_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // int_k_t
+#include "llvm-libc-types/int_k_t.h" // int_k_t
 #include "src/stdfix/bitsk.h"
 
 LIST_BITSFX_TESTS(k, accum, int_k_t, LIBC_NAMESPACE::bitsk);

diff  --git a/libc/test/src/stdfix/bitslk_test.cpp b/libc/test/src/stdfix/bitslk_test.cpp
index 46c04e2f75511..fc6fcbb0d94e1 100644
--- a/libc/test/src/stdfix/bitslk_test.cpp
+++ b/libc/test/src/stdfix/bitslk_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // int_lk_t
+#include "llvm-libc-types/int_lk_t.h" // int_lk_t
 #include "src/stdfix/bitslk.h"
 
 LIST_BITSFX_TESTS(lk, long accum, int_lk_t, LIBC_NAMESPACE::bitslk);

diff  --git a/libc/test/src/stdfix/bitslr_test.cpp b/libc/test/src/stdfix/bitslr_test.cpp
index ef68d2831fb9d..f88580c4b5a25 100644
--- a/libc/test/src/stdfix/bitslr_test.cpp
+++ b/libc/test/src/stdfix/bitslr_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // int_lr_t
+#include "llvm-libc-types/int_lr_t.h" // int_lr_t
 #include "src/stdfix/bitslr.h"
 
 LIST_BITSFX_TESTS(hk, long fract, int_lr_t, LIBC_NAMESPACE::bitslr);

diff  --git a/libc/test/src/stdfix/bitsr_test.cpp b/libc/test/src/stdfix/bitsr_test.cpp
index 0aeb980e30382..e987a7f80f568 100644
--- a/libc/test/src/stdfix/bitsr_test.cpp
+++ b/libc/test/src/stdfix/bitsr_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // int_r_t
+#include "llvm-libc-types/int_r_t.h" // int_r_t
 #include "src/stdfix/bitsr.h"
 
 LIST_BITSFX_TESTS(r, fract, int_r_t, LIBC_NAMESPACE::bitsr);

diff  --git a/libc/test/src/stdfix/bitsuhk_test.cpp b/libc/test/src/stdfix/bitsuhk_test.cpp
index 5ddb78383df02..5b09453641205 100644
--- a/libc/test/src/stdfix/bitsuhk_test.cpp
+++ b/libc/test/src/stdfix/bitsuhk_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // uint_uhk_t
+#include "llvm-libc-types/uint_uhk_t.h" // uint_uhk_t
 #include "src/stdfix/bitsuhk.h"
 
 LIST_BITSFX_TESTS(uhk, unsigned short accum, uint_uhk_t,

diff  --git a/libc/test/src/stdfix/bitsuhr_test.cpp b/libc/test/src/stdfix/bitsuhr_test.cpp
index 6f5d559859456..0d006a35ece6d 100644
--- a/libc/test/src/stdfix/bitsuhr_test.cpp
+++ b/libc/test/src/stdfix/bitsuhr_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // uint_uhr_t
+#include "llvm-libc-types/uint_uhr_t.h" // uint_uhr_t
 #include "src/stdfix/bitsuhr.h"
 
 LIST_BITSFX_TESTS(uhr, unsigned short fract, uint_uhr_t,

diff  --git a/libc/test/src/stdfix/bitsuk_test.cpp b/libc/test/src/stdfix/bitsuk_test.cpp
index 309c525f3fd2d..06a8a4e515890 100644
--- a/libc/test/src/stdfix/bitsuk_test.cpp
+++ b/libc/test/src/stdfix/bitsuk_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // uint_uk_t
+#include "llvm-libc-types/uint_uk_t.h" // uint_uk_t
 #include "src/stdfix/bitsuk.h"
 
 LIST_BITSFX_TESTS(uk, unsigned accum, uint_uk_t, LIBC_NAMESPACE::bitsuk);

diff  --git a/libc/test/src/stdfix/bitsulk_test.cpp b/libc/test/src/stdfix/bitsulk_test.cpp
index cba011d5f222d..9d56a183cef46 100644
--- a/libc/test/src/stdfix/bitsulk_test.cpp
+++ b/libc/test/src/stdfix/bitsulk_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // uint_ulk_t
+#include "llvm-libc-types/uint_ulk_t.h" // uint_ulk_t
 #include "src/stdfix/bitsulk.h"
 
 LIST_BITSFX_TESTS(ulk, unsigned long accum, uint_ulk_t,

diff  --git a/libc/test/src/stdfix/bitsulr_test.cpp b/libc/test/src/stdfix/bitsulr_test.cpp
index 39b21c424199e..3ebbf8acd14d3 100644
--- a/libc/test/src/stdfix/bitsulr_test.cpp
+++ b/libc/test/src/stdfix/bitsulr_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // uint_ulr_t
+#include "llvm-libc-types/uint_ulr_t.h" // uint_ulr_t
 #include "src/stdfix/bitsulr.h"
 
 LIST_BITSFX_TESTS(ulr, unsigned long fract, uint_ulr_t,

diff  --git a/libc/test/src/stdfix/bitsur_test.cpp b/libc/test/src/stdfix/bitsur_test.cpp
index b7c4b0617eb6e..4f368075d8279 100644
--- a/libc/test/src/stdfix/bitsur_test.cpp
+++ b/libc/test/src/stdfix/bitsur_test.cpp
@@ -8,7 +8,7 @@
 
 #include "BitsFxTest.h"
 
-#include "llvm-libc-types/stdfix-types.h" // uint_ur_t
+#include "llvm-libc-types/uint_ur_t.h" // uint_ur_t
 #include "src/stdfix/bitsur.h"
 
 LIST_BITSFX_TESTS(ur, unsigned fract, uint_ur_t, LIBC_NAMESPACE::bitsur);