From 6300c50b3c8770de4a0f01a947531d891fe05bcc Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Mon, 7 Apr 2025 22:01:30 -0400
Subject: [PATCH 01/22] Add ssize_t

---
 src/ystdlib/wrapped_facade_headers/CMakeLists.txt      |  1 +
 .../wrapped_facade_headers/test/test_ssize_t.cpp       | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp

diff --git a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
index df0a0fe..690d82f 100644
--- a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
+++ b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
@@ -5,4 +5,5 @@ cpp_library(
         sys/types.h
     TESTS_SOURCES
         test/test_off_t.cpp
+        test/test_ssize_t.cpp
 )
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
new file mode 100644
index 0000000..4583b5e
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
@@ -0,0 +1,10 @@
+#include <unistd.h>
+
+#include <catch2/catch_test_macros.hpp>
+
+namespace ystdlib::wrapped_facade_headers::test {
+TEST_CASE("test_ssize_t", "[wrapped_facade_headers][ssize_t]") {
+    ssize_t const i{0};
+    REQUIRE((0 == i));
+}
+}  // namespace ystdlib::wrapped_facade_headers::test

From 0d2ea1cc20c13fda09942ec7b13e69449bf58b52 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Mon, 7 Apr 2025 22:17:20 -0400
Subject: [PATCH 02/22] Change inlcude header

---
 src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
index 4583b5e..ec7f599 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
@@ -1,4 +1,4 @@
-#include <unistd.h>
+#include <sys/types.h>
 
 #include <catch2/catch_test_macros.hpp>
 

From c06ece1dbb69dc41b2f55d3537d86a4a2483a8c3 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 00:53:31 -0400
Subject: [PATCH 03/22] Redo syys types

---
 .../wrapped_facade_headers/CMakeLists.txt     |  3 +-
 .../wrapped_facade_headers/sys/types.h        |  7 ++-
 .../test/test_off_t.cpp                       | 10 ----
 .../test/test_ssize_t.cpp                     | 10 ----
 .../test/test_sys_types.cpp                   | 48 +++++++++++++++++++
 5 files changed, 55 insertions(+), 23 deletions(-)
 delete mode 100644 src/ystdlib/wrapped_facade_headers/test/test_off_t.cpp
 delete mode 100644 src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
 create mode 100644 src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp

diff --git a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
index 690d82f..ece0a32 100644
--- a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
+++ b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
@@ -4,6 +4,5 @@ cpp_library(
     PUBLIC_HEADERS
         sys/types.h
     TESTS_SOURCES
-        test/test_off_t.cpp
-        test/test_ssize_t.cpp
+        test/test_sys_types.cpp
 )
diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index c767c2f..6ee53d4 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -3,7 +3,12 @@
 #include <sys/types.h>
 
 #if defined(__APPLE__)
-#include <sys/_types/_off_t.h>
+#include <sys/_types/_u_char.h>
+#include <sys/_types/_u_short.h>
+#include <sys/_types/_u_int.h>
+#include <sys/_types/_quad_t.h>
+#include <sys/_types/_u_quad_t.h>
+#include <sys/_types/_fsid_t.h>
 #endif
 // IWYU pragma: end_exports
 // clang-format on
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_off_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_off_t.cpp
deleted file mode 100644
index 2e92cb9..0000000
--- a/src/ystdlib/wrapped_facade_headers/test/test_off_t.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <ystdlib/wrapped_facade_headers/sys/types.h>
-
-#include <catch2/catch_test_macros.hpp>
-
-namespace ystdlib::wrapped_facade_headers::test {
-TEST_CASE("test_off_t", "[wrapped_facade_headers][off_t]") {
-    off_t const i{0};
-    REQUIRE((0 == i));
-}
-}  // namespace ystdlib::wrapped_facade_headers::test
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
deleted file mode 100644
index ec7f599..0000000
--- a/src/ystdlib/wrapped_facade_headers/test/test_ssize_t.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <sys/types.h>
-
-#include <catch2/catch_test_macros.hpp>
-
-namespace ystdlib::wrapped_facade_headers::test {
-TEST_CASE("test_ssize_t", "[wrapped_facade_headers][ssize_t]") {
-    ssize_t const i{0};
-    REQUIRE((0 == i));
-}
-}  // namespace ystdlib::wrapped_facade_headers::test
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
new file mode 100644
index 0000000..4faf2b0
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -0,0 +1,48 @@
+#include <ystdlib/wrapped_facade_headers/sys/types.h>
+
+#include <catch2/catch_test_macros.hpp>
+
+namespace ystdlib::wrapped_facade_headers::test {
+TEST_CASE("test_sys_types_u_char", "[wrapped_facade_headers][sys_types][u_char]") {
+    u_char const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_u_short", "[wrapped_facade_headers][sys_types][u_short]") {
+    u_short const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_u_int", "[wrapped_facade_headers][sys_types][u_int]") {
+    u_int const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_u_long", "[wrapped_facade_headers][sys_types][u_long]") {
+    u_long const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_quad_t", "[wrapped_facade_headers][sys_types][quad_t]") {
+    quad_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_u_quad_t", "[wrapped_facade_headers][sys_types][u_quad_t]") {
+    u_quad_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_fsid_t", "[wrapped_facade_headers][sys_types][fsid_t]") {
+    fsid_t const i{{0, 0}};
+    REQUIRE(0 == i.__val[0]);
+    REQUIRE(0 == i.__val[1]);
+}
+
+#if defined(__linux__)
+TEST_CASE("test_sys_types_loff_t", "[wrapped_facade_headers][sys_types][loff_t]") {
+    loff_t const i{0};
+    REQUIRE(0 == i);
+}
+#endif
+}  // namespace ystdlib::wrapped_facade_headers::test

From 96c2ca8c5930bf60dba64b0ff9bc901239997547 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 01:05:09 -0400
Subject: [PATCH 04/22] Update src/ystdlib/wrapped_facade_headers/sys/types.h

---
 src/ystdlib/wrapped_facade_headers/sys/types.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index 6ee53d4..a64404a 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -6,8 +6,6 @@
 #include <sys/_types/_u_char.h>
 #include <sys/_types/_u_short.h>
 #include <sys/_types/_u_int.h>
-#include <sys/_types/_quad_t.h>
-#include <sys/_types/_u_quad_t.h>
 #include <sys/_types/_fsid_t.h>
 #endif
 // IWYU pragma: end_exports

From 879b9f68bfb9ca092b16ddccfeea054d169ce616 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 01:15:48 -0400
Subject: [PATCH 05/22] Fix fsid_t

---
 src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
index 4faf2b0..cb31815 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -35,8 +35,13 @@ TEST_CASE("test_sys_types_u_quad_t", "[wrapped_facade_headers][sys_types][u_quad
 
 TEST_CASE("test_sys_types_fsid_t", "[wrapped_facade_headers][sys_types][fsid_t]") {
     fsid_t const i{{0, 0}};
+#if defined(__linux__)
     REQUIRE(0 == i.__val[0]);
     REQUIRE(0 == i.__val[1]);
+#elif defined(__APPLE__)
+    REQUIRE(0 == i.val[0]);
+    REQUIRE(0 == i.val[1]);
+#endif
 }
 
 #if defined(__linux__)

From 74a01a02566f1f6bcf8baee3f8ddef9086426285 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 01:33:32 -0400
Subject: [PATCH 06/22] Add more types

---
 .../wrapped_facade_headers/sys/types.h        | 15 ++++
 .../test/test_sys_types.cpp                   | 75 +++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index a64404a..fac9bfc 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -7,6 +7,21 @@
 #include <sys/_types/_u_short.h>
 #include <sys/_types/_u_int.h>
 #include <sys/_types/_fsid_t.h>
+#include <sys/_types/_ino_t.h>
+#include <sys/_types/_ino64_t.h>
+#include <sys/_types/_dev_t.h>
+#include <sys/_types/_gid_t.h>
+#include <sys/_types/_mode_t.h>
+#include <sys/_types/_nlink_t.h>
+#include <sys/_types/_uid_t.h>
+#include <sys/_types/_off_t.h>
+#include <sys/dtrace.h>  # For off64_t
+#include <sys/_types/_pid_t.h>
+#include <sys/_types/_id_t.h>
+#include <sys/_types/_ssize_t.h>
+#include <sys/_types/_daddr_t.h>
+#include <sys/_types/_caddr_t.h>
+#include <sys/_types/_key_t.h>
 #endif
 // IWYU pragma: end_exports
 // clang-format on
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
index cb31815..0b8b810 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -50,4 +50,79 @@ TEST_CASE("test_sys_types_loff_t", "[wrapped_facade_headers][sys_types][loff_t]"
     REQUIRE(0 == i);
 }
 #endif
+
+TEST_CASE("test_sys_types_ino_t", "[wrapped_facade_headers][sys_types][ino_t]") {
+    ino_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_ino64_t", "[wrapped_facade_headers][sys_types][ino64_t]") {
+    ino64_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_dev_t", "[wrapped_facade_headers][sys_types][dev_t]") {
+    dev_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_gid_t", "[wrapped_facade_headers][sys_types][gid_t]") {
+    gid_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_mode_t", "[wrapped_facade_headers][sys_types][mode_t]") {
+    mode_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_nlink_t", "[wrapped_facade_headers][sys_types][nlink_t]") {
+    nlink_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_uid_t", "[wrapped_facade_headers][sys_types][uid_t]") {
+    uid_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_off_t", "[wrapped_facade_headers][sys_types][off_t]") {
+    off_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_off64_t", "[wrapped_facade_headers][sys_types][off64_t]") {
+    off64_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_pid_t", "[wrapped_facade_headers][sys_types][pid_t]") {
+    pid_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_id_t", "[wrapped_facade_headers][sys_types][id_t]") {
+    id_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_ssize_t", "[wrapped_facade_headers][sys_types][ssize_t]") {
+    ssize_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_daddr_t", "[wrapped_facade_headers][sys_types][daddr_t]") {
+    daddr_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_caddr_t", "[wrapped_facade_headers][sys_types][caddr_t]") {
+    caddr_t const p{nullptr};
+    REQUIRE(nullptr == p);
+}
+
+TEST_CASE("test_sys_types_key_t", "[wrapped_facade_headers][sys_types][key_t]") {
+    key_t const i{0};
+    REQUIRE(0 == i);
+}
 }  // namespace ystdlib::wrapped_facade_headers::test

From 5334aeef8ae58af5c2fda54c4e0e84be5c1f97fa Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 01:33:59 -0400
Subject: [PATCH 07/22] Fix wrong include

---
 src/ystdlib/wrapped_facade_headers/sys/types.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index fac9bfc..d94d2d8 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -19,7 +19,6 @@
 #include <sys/_types/_pid_t.h>
 #include <sys/_types/_id_t.h>
 #include <sys/_types/_ssize_t.h>
-#include <sys/_types/_daddr_t.h>
 #include <sys/_types/_caddr_t.h>
 #include <sys/_types/_key_t.h>
 #endif

From a1819ff284f8ea5dac66008497476edd99cad2ad Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 01:40:20 -0400
Subject: [PATCH 08/22] Silence warning

---
 src/ystdlib/wrapped_facade_headers/sys/types.h             | 4 +++-
 src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index d94d2d8..6254817 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -15,12 +15,14 @@
 #include <sys/_types/_nlink_t.h>
 #include <sys/_types/_uid_t.h>
 #include <sys/_types/_off_t.h>
-#include <sys/dtrace.h>  # For off64_t
 #include <sys/_types/_pid_t.h>
 #include <sys/_types/_id_t.h>
 #include <sys/_types/_ssize_t.h>
 #include <sys/_types/_caddr_t.h>
 #include <sys/_types/_key_t.h>
+
+# For off64_t
+#include <sys/dtrace.h>
 #endif
 // IWYU pragma: end_exports
 // clang-format on
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
index 0b8b810..e004d4d 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -117,6 +117,7 @@ TEST_CASE("test_sys_types_daddr_t", "[wrapped_facade_headers][sys_types][daddr_t
 }
 
 TEST_CASE("test_sys_types_caddr_t", "[wrapped_facade_headers][sys_types][caddr_t]") {
+    // NOLINTNEXTLINE(misc-misplaced-const)
     caddr_t const p{nullptr};
     REQUIRE(nullptr == p);
 }

From a911d5436ffe524cc116775d59b4afdbfae5d280 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 01:40:54 -0400
Subject: [PATCH 09/22] Fix comment

---
 src/ystdlib/wrapped_facade_headers/sys/types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index 6254817..c62263f 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -21,7 +21,7 @@
 #include <sys/_types/_caddr_t.h>
 #include <sys/_types/_key_t.h>
 
-# For off64_t
+// For off64_t
 #include <sys/dtrace.h>
 #endif
 // IWYU pragma: end_exports

From 3555c5bf61ca40f30b32474db20a33716bf53bd9 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 02:33:16 -0400
Subject: [PATCH 10/22] Add time types

---
 src/ystdlib/wrapped_facade_headers/CMakeLists.txt  |  3 +++
 .../wrapped_facade_headers/bits/types/clock_t.h    | 14 ++++++++++++++
 .../wrapped_facade_headers/bits/types/clockid_t.h  | 14 ++++++++++++++
 .../wrapped_facade_headers/bits/types/time_t.h     | 14 ++++++++++++++
 .../test/test_bits_types_clock_t.cpp               | 10 ++++++++++
 .../test/test_bits_types_clockid_t.cpp             | 12 ++++++++++++
 .../test/test_bits_types_time_t.cpp                | 11 +++++++++++
 7 files changed, 78 insertions(+)
 create mode 100644 src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
 create mode 100644 src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
 create mode 100644 src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
 create mode 100644 src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp
 create mode 100644 src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
 create mode 100644 src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp

diff --git a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
index ece0a32..43257d8 100644
--- a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
+++ b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
@@ -4,5 +4,8 @@ cpp_library(
     PUBLIC_HEADERS
         sys/types.h
     TESTS_SOURCES
+        test/test_bits_types_clock_t.cpp
+        test/test_bits_types_clockid_t.cpp
+        test/test_bits_types_time_t.cpp
         test/test_sys_types.cpp
 )
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
new file mode 100644
index 0000000..b0e66ac
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
@@ -0,0 +1,14 @@
+#ifndef YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
+#define YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
+
+// clang-format off
+// IWYU pragma: begin_exports
+#include <bits/types/clock_t.h>
+
+#if defined(__APPLE__)
+#include <sys/_types/_clock_t.h>
+#endif
+// IWYU pragma: end_exports
+// clang-format on
+
+#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
new file mode 100644
index 0000000..1de5b1f
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
@@ -0,0 +1,14 @@
+#ifndef YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCKID_T_HPP
+#define YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCKID_T_HPP
+
+// clang-format off
+// IWYU pragma: begin_exports
+#include <bits/types/clockid_t.h>
+
+#if defined(__APPLE__)
+#include <_time.h>
+#endif
+// IWYU pragma: end_exports
+// clang-format on
+
+#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
new file mode 100644
index 0000000..3bc7f88
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
@@ -0,0 +1,14 @@
+#ifndef YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_TIME_T_HPP
+#define YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_TIME_T_HPP
+
+// clang-format off
+// IWYU pragma: begin_exports
+#include <bits/types/time_t.h>
+
+#if defined(__APPLE__)
+#include <sys/_types/_time_t.h>
+#endif
+// IWYU pragma: end_exports
+// clang-format on
+
+#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_TIME_T_HPP
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp
new file mode 100644
index 0000000..2548e53
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp
@@ -0,0 +1,10 @@
+#include <ystdlib/wrapped_facade_headers/bits/types/clock_t.h>
+
+#include <catch2/catch_test_macros.hpp>
+
+namespace ystdlib::wrapped_facade_headers::test {
+TEST_CASE("test_bits_types_clock_t", "[wrapped_facade_headers][bits_types][clock_t]") {
+    clock_t const i{0};
+    REQUIRE(0 == i);
+}
+}  // namespace ystdlib::wrapped_facade_headers::test
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
new file mode 100644
index 0000000..8e5355a
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
@@ -0,0 +1,12 @@
+#include <bits/time.h>
+
+#include <ystdlib/wrapped_facade_headers/bits/types/clockid_t.h>
+
+#include <catch2/catch_test_macros.hpp>
+
+namespace ystdlib::wrapped_facade_headers::test {
+TEST_CASE("test_bits_types_clockid_t", "[wrapped_facade_headers][bits_types][clockid_t]") {
+    clockid_t const i{CLOCK_REALTIME};
+    REQUIRE(CLOCK_REALTIME == i);
+}
+}  // namespace ystdlib::wrapped_facade_headers::test
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp
new file mode 100644
index 0000000..8c4f15c
--- /dev/null
+++ b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp
@@ -0,0 +1,11 @@
+#include <ystdlib/wrapped_facade_headers/bits/types/time_t.h>
+
+#include <catch2/catch_test_macros.hpp>
+
+namespace ystdlib::wrapped_facade_headers::test {
+TEST_CASE("test_bits_types_time_t", "[wrapped_facade_headers][bits_types][time_t]") {
+    time_t const i{0};
+    REQUIRE(0 == i);
+}
+}  // namespace ystdlib::wrapped_facade_headers::test
+

From 2ff2d3a0186e11a15dcca47c6d616997155c7860 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 02:34:46 -0400
Subject: [PATCH 11/22] Add missing exports

---
 src/ystdlib/wrapped_facade_headers/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
index 43257d8..7f487bf 100644
--- a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
+++ b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
@@ -2,6 +2,9 @@ cpp_library(
     NAME wrapped_facade_headers
     NAMESPACE ystdlib
     PUBLIC_HEADERS
+        bits/types/clock_t.h
+        bits/types/clockid_t.h
+        bits/types/time_t.h
         sys/types.h
     TESTS_SOURCES
         test/test_bits_types_clock_t.cpp

From 920ef53c97cd7026728b6f743cdd69e5f5c58820 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 02:39:16 -0400
Subject: [PATCH 12/22] Make clearer distinctions between OS includes

---
 src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h  | 4 ++--
 .../wrapped_facade_headers/bits/types/clockid_t.h        | 6 +++---
 src/ystdlib/wrapped_facade_headers/bits/types/time_t.h   | 4 ++--
 src/ystdlib/wrapped_facade_headers/sys/types.h           | 9 +++++++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
index b0e66ac..0196b51 100644
--- a/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
@@ -3,9 +3,9 @@
 
 // clang-format off
 // IWYU pragma: begin_exports
+#if defined(__linux__)
 #include <bits/types/clock_t.h>
-
-#if defined(__APPLE__)
+#elif defined(__APPLE__)
 #include <sys/_types/_clock_t.h>
 #endif
 // IWYU pragma: end_exports
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
index 1de5b1f..8be0b92 100644
--- a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
@@ -3,12 +3,12 @@
 
 // clang-format off
 // IWYU pragma: begin_exports
+#if defined(__linux__)
 #include <bits/types/clockid_t.h>
-
-#if defined(__APPLE__)
+#elif defined(__APPLE__)
 #include <_time.h>
 #endif
 // IWYU pragma: end_exports
 // clang-format on
 
-#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
+#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCKID_T_HPP
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
index 3bc7f88..95648ef 100644
--- a/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
@@ -3,9 +3,9 @@
 
 // clang-format off
 // IWYU pragma: begin_exports
+#if defined(__linux__)
 #include <bits/types/time_t.h>
-
-#if defined(__APPLE__)
+#elif defined(__APPLE__)
 #include <sys/_types/_time_t.h>
 #endif
 // IWYU pragma: end_exports
diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index c62263f..472f022 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -1,8 +1,11 @@
+#ifndef YSTDLIB_WRAPPED_FACADE_HEADERS_SYS_TYPES_HPP
+#define YSTDLIB_WRAPPED_FACADE_HEADERS_SYS_TYPES_HPP
+
 // clang-format off
 // IWYU pragma: begin_exports
+#if defined(__linux__)
 #include <sys/types.h>
-
-#if defined(__APPLE__)
+#elif defined(__APPLE__)
 #include <sys/_types/_u_char.h>
 #include <sys/_types/_u_short.h>
 #include <sys/_types/_u_int.h>
@@ -26,3 +29,5 @@
 #endif
 // IWYU pragma: end_exports
 // clang-format on
+
+#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_SYS_TYPES_HPP

From 0919e3a4a0f84311ccdfe86ac81c74f820f0e65d Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 02:44:08 -0400
Subject: [PATCH 13/22] move clockid_t enums to facade header

---
 src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h       | 1 +
 .../wrapped_facade_headers/test/test_bits_types_clockid_t.cpp   | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
index 8be0b92..8d9f17b 100644
--- a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
@@ -4,6 +4,7 @@
 // clang-format off
 // IWYU pragma: begin_exports
 #if defined(__linux__)
+#include <bits/time.h>
 #include <bits/types/clockid_t.h>
 #elif defined(__APPLE__)
 #include <_time.h>
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
index 8e5355a..d1ab65e 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
@@ -1,5 +1,3 @@
-#include <bits/time.h>
-
 #include <ystdlib/wrapped_facade_headers/bits/types/clockid_t.h>
 
 #include <catch2/catch_test_macros.hpp>

From a0202f278c18dcaf5212ad12ff934fe7c2475822 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 02:55:02 -0400
Subject: [PATCH 14/22] Differentiate macos versions

---
 src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
index 8d9f17b..557e6d2 100644
--- a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
+++ b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
@@ -7,7 +7,13 @@
 #include <bits/time.h>
 #include <bits/types/clockid_t.h>
 #elif defined(__APPLE__)
+
+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 150000
 #include <_time.h>
+#else
+#include <time.h>
+#endif
+
 #endif
 // IWYU pragma: end_exports
 // clang-format on

From 3265dbec64ea4f6165c6bf026ead27cf120cad73 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 02:58:19 -0400
Subject: [PATCH 15/22] Add all machines to lint checks

---
 .github/workflows/code-linting-checks.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/code-linting-checks.yaml b/.github/workflows/code-linting-checks.yaml
index cc757fe..b6dda0b 100644
--- a/.github/workflows/code-linting-checks.yaml
+++ b/.github/workflows/code-linting-checks.yaml
@@ -21,7 +21,9 @@ jobs:
     strategy:
       matrix:
         os:
+          - "macos-14"
           - "macos-15"
+          - "ubuntu-22.04"
           - "ubuntu-24.04"
     runs-on: "${{matrix.os}}"
     steps:

From 709f31b2868c7c1a38a830246b92171806fb018c Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 03:03:55 -0400
Subject: [PATCH 16/22] Revert 1 commit

---
 .github/workflows/code-linting-checks.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/code-linting-checks.yaml b/.github/workflows/code-linting-checks.yaml
index b6dda0b..cc757fe 100644
--- a/.github/workflows/code-linting-checks.yaml
+++ b/.github/workflows/code-linting-checks.yaml
@@ -21,9 +21,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - "macos-14"
           - "macos-15"
-          - "ubuntu-22.04"
           - "ubuntu-24.04"
     runs-on: "${{matrix.os}}"
     steps:

From c5f885237730429aeb17a2047844e46d8d03ec36 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 03:04:57 -0400
Subject: [PATCH 17/22] Remove clockid_t

---
 .../wrapped_facade_headers/CMakeLists.txt     |  2 --
 .../bits/types/clockid_t.h                    | 21 -------------------
 .../test/test_bits_types_clockid_t.cpp        | 10 ---------
 3 files changed, 33 deletions(-)
 delete mode 100644 src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
 delete mode 100644 src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp

diff --git a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
index 7f487bf..166a57d 100644
--- a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
+++ b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
@@ -3,12 +3,10 @@ cpp_library(
     NAMESPACE ystdlib
     PUBLIC_HEADERS
         bits/types/clock_t.h
-        bits/types/clockid_t.h
         bits/types/time_t.h
         sys/types.h
     TESTS_SOURCES
         test/test_bits_types_clock_t.cpp
-        test/test_bits_types_clockid_t.cpp
         test/test_bits_types_time_t.cpp
         test/test_sys_types.cpp
 )
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
deleted file mode 100644
index 557e6d2..0000000
--- a/src/ystdlib/wrapped_facade_headers/bits/types/clockid_t.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCKID_T_HPP
-#define YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCKID_T_HPP
-
-// clang-format off
-// IWYU pragma: begin_exports
-#if defined(__linux__)
-#include <bits/time.h>
-#include <bits/types/clockid_t.h>
-#elif defined(__APPLE__)
-
-#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 150000
-#include <_time.h>
-#else
-#include <time.h>
-#endif
-
-#endif
-// IWYU pragma: end_exports
-// clang-format on
-
-#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCKID_T_HPP
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
deleted file mode 100644
index d1ab65e..0000000
--- a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clockid_t.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <ystdlib/wrapped_facade_headers/bits/types/clockid_t.h>
-
-#include <catch2/catch_test_macros.hpp>
-
-namespace ystdlib::wrapped_facade_headers::test {
-TEST_CASE("test_bits_types_clockid_t", "[wrapped_facade_headers][bits_types][clockid_t]") {
-    clockid_t const i{CLOCK_REALTIME};
-    REQUIRE(CLOCK_REALTIME == i);
-}
-}  // namespace ystdlib::wrapped_facade_headers::test

From 913e008f455872c266e26ea51c19155de3844f3a Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 03:10:05 -0400
Subject: [PATCH 18/22] Add useconds type

---
 src/ystdlib/wrapped_facade_headers/sys/types.h         |  2 ++
 .../wrapped_facade_headers/test/test_sys_types.cpp     | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index 472f022..b3116c2 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -23,6 +23,8 @@
 #include <sys/_types/_ssize_t.h>
 #include <sys/_types/_caddr_t.h>
 #include <sys/_types/_key_t.h>
+#include <sys/_types/_useconds_t.h>
+#include <sys/_types/_suseconds_t.h>
 
 // For off64_t
 #include <sys/dtrace.h>
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
index e004d4d..0a87c76 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -126,4 +126,14 @@ TEST_CASE("test_sys_types_key_t", "[wrapped_facade_headers][sys_types][key_t]")
     key_t const i{0};
     REQUIRE(0 == i);
 }
+
+TEST_CASE("test_sys_types_useconds_t", "[wrapped_facade_headers][sys_types][useconds_t]") {
+    useconds_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_suseconds_t", "[wrapped_facade_headers][sys_types][suseconds_t]") {
+    suseconds_t const i{0};
+    REQUIRE(0 == i);
+}
 }  // namespace ystdlib::wrapped_facade_headers::test

From 6e3b78610977325edcf884a039a6bcfd5b0e8952 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 03:33:35 -0400
Subject: [PATCH 19/22] Remove time related types due to ctime resolving
 everything

---
 src/ystdlib/wrapped_facade_headers/CMakeLists.txt  |  4 ----
 .../wrapped_facade_headers/bits/types/clock_t.h    | 14 --------------
 .../wrapped_facade_headers/bits/types/time_t.h     | 14 --------------
 .../test/test_bits_types_clock_t.cpp               | 10 ----------
 .../test/test_bits_types_time_t.cpp                | 11 -----------
 5 files changed, 53 deletions(-)
 delete mode 100644 src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
 delete mode 100644 src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
 delete mode 100644 src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp
 delete mode 100644 src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp

diff --git a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
index 166a57d..ece0a32 100644
--- a/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
+++ b/src/ystdlib/wrapped_facade_headers/CMakeLists.txt
@@ -2,11 +2,7 @@ cpp_library(
     NAME wrapped_facade_headers
     NAMESPACE ystdlib
     PUBLIC_HEADERS
-        bits/types/clock_t.h
-        bits/types/time_t.h
         sys/types.h
     TESTS_SOURCES
-        test/test_bits_types_clock_t.cpp
-        test/test_bits_types_time_t.cpp
         test/test_sys_types.cpp
 )
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
deleted file mode 100644
index 0196b51..0000000
--- a/src/ystdlib/wrapped_facade_headers/bits/types/clock_t.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
-#define YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
-
-// clang-format off
-// IWYU pragma: begin_exports
-#if defined(__linux__)
-#include <bits/types/clock_t.h>
-#elif defined(__APPLE__)
-#include <sys/_types/_clock_t.h>
-#endif
-// IWYU pragma: end_exports
-// clang-format on
-
-#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_CLOCK_T_HPP
diff --git a/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h b/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
deleted file mode 100644
index 95648ef..0000000
--- a/src/ystdlib/wrapped_facade_headers/bits/types/time_t.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_TIME_T_HPP
-#define YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_TIME_T_HPP
-
-// clang-format off
-// IWYU pragma: begin_exports
-#if defined(__linux__)
-#include <bits/types/time_t.h>
-#elif defined(__APPLE__)
-#include <sys/_types/_time_t.h>
-#endif
-// IWYU pragma: end_exports
-// clang-format on
-
-#endif  // YSTDLIB_WRAPPED_FACADE_HEADERS_BITS_TYPES_TIME_T_HPP
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp
deleted file mode 100644
index 2548e53..0000000
--- a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_clock_t.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <ystdlib/wrapped_facade_headers/bits/types/clock_t.h>
-
-#include <catch2/catch_test_macros.hpp>
-
-namespace ystdlib::wrapped_facade_headers::test {
-TEST_CASE("test_bits_types_clock_t", "[wrapped_facade_headers][bits_types][clock_t]") {
-    clock_t const i{0};
-    REQUIRE(0 == i);
-}
-}  // namespace ystdlib::wrapped_facade_headers::test
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp b/src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp
deleted file mode 100644
index 8c4f15c..0000000
--- a/src/ystdlib/wrapped_facade_headers/test/test_bits_types_time_t.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <ystdlib/wrapped_facade_headers/bits/types/time_t.h>
-
-#include <catch2/catch_test_macros.hpp>
-
-namespace ystdlib::wrapped_facade_headers::test {
-TEST_CASE("test_bits_types_time_t", "[wrapped_facade_headers][bits_types][time_t]") {
-    time_t const i{0};
-    REQUIRE(0 == i);
-}
-}  // namespace ystdlib::wrapped_facade_headers::test
-

From ce384be403992cdf593e064e02394df133e5bbbf Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 03:39:47 -0400
Subject: [PATCH 20/22] Add uints

---
 .../wrapped_facade_headers/sys/types.h        |  4 ++++
 .../test/test_sys_types.cpp                   | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index b3116c2..5f4d3a8 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -25,6 +25,10 @@
 #include <sys/_types/_key_t.h>
 #include <sys/_types/_useconds_t.h>
 #include <sys/_types/_suseconds_t.h>
+#include <sys/_types/_u_int8_t.h>
+#include <sys/_types/_u_int16_t.h>
+#include <sys/_types/_u_int32_t.h>
+#include <sys/_types/_u_int64_t.h>
 
 // For off64_t
 #include <sys/dtrace.h>
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
index 0a87c76..39f0974 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -136,4 +136,24 @@ TEST_CASE("test_sys_types_suseconds_t", "[wrapped_facade_headers][sys_types][sus
     suseconds_t const i{0};
     REQUIRE(0 == i);
 }
+
+TEST_CASE("test_sys_types_u_int8_t", "[wrapped_facade_headers][sys_types][u_int8_t]") {
+    u_int8_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_u_int16_t", "[wrapped_facade_headers][sys_types][u_int16_t]") {
+    u_int16_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_u_int32_t", "[wrapped_facade_headers][sys_types][u_int32_t]") {
+    u_int32_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_u_int64_t", "[wrapped_facade_headers][sys_types][u_int64_t]") {
+    u_int64_t const i{0};
+    REQUIRE(0 == i);
+}
 }  // namespace ystdlib::wrapped_facade_headers::test

From e9ea397dae9714e4711cfb298d9bf6884c008c33 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Tue, 8 Apr 2025 03:54:08 -0400
Subject: [PATCH 21/22] Add remaining types

---
 .../wrapped_facade_headers/sys/types.h        | 11 ++++---
 .../test/test_sys_types.cpp                   | 32 ++++++++++++-------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/src/ystdlib/wrapped_facade_headers/sys/types.h b/src/ystdlib/wrapped_facade_headers/sys/types.h
index 5f4d3a8..f8f3433 100644
--- a/src/ystdlib/wrapped_facade_headers/sys/types.h
+++ b/src/ystdlib/wrapped_facade_headers/sys/types.h
@@ -3,9 +3,9 @@
 
 // clang-format off
 // IWYU pragma: begin_exports
-#if defined(__linux__)
 #include <sys/types.h>
-#elif defined(__APPLE__)
+
+#if defined(__APPLE__)
 #include <sys/_types/_u_char.h>
 #include <sys/_types/_u_short.h>
 #include <sys/_types/_u_int.h>
@@ -29,9 +29,10 @@
 #include <sys/_types/_u_int16_t.h>
 #include <sys/_types/_u_int32_t.h>
 #include <sys/_types/_u_int64_t.h>
-
-// For off64_t
-#include <sys/dtrace.h>
+#include <sys/_types/_blksize_t.h>
+#include <sys/_types/_blkcnt_t.h>
+#include <sys/_types/_fsblkcnt_t.h>
+#include <sys/_types/_fsfilcnt_t.h>
 #endif
 // IWYU pragma: end_exports
 // clang-format on
diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
index 39f0974..b1d7c9f 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -44,13 +44,6 @@ TEST_CASE("test_sys_types_fsid_t", "[wrapped_facade_headers][sys_types][fsid_t]"
 #endif
 }
 
-#if defined(__linux__)
-TEST_CASE("test_sys_types_loff_t", "[wrapped_facade_headers][sys_types][loff_t]") {
-    loff_t const i{0};
-    REQUIRE(0 == i);
-}
-#endif
-
 TEST_CASE("test_sys_types_ino_t", "[wrapped_facade_headers][sys_types][ino_t]") {
     ino_t const i{0};
     REQUIRE(0 == i);
@@ -91,11 +84,6 @@ TEST_CASE("test_sys_types_off_t", "[wrapped_facade_headers][sys_types][off_t]")
     REQUIRE(0 == i);
 }
 
-TEST_CASE("test_sys_types_off64_t", "[wrapped_facade_headers][sys_types][off64_t]") {
-    off64_t const i{0};
-    REQUIRE(0 == i);
-}
-
 TEST_CASE("test_sys_types_pid_t", "[wrapped_facade_headers][sys_types][pid_t]") {
     pid_t const i{0};
     REQUIRE(0 == i);
@@ -156,4 +144,24 @@ TEST_CASE("test_sys_types_u_int64_t", "[wrapped_facade_headers][sys_types][u_int
     u_int64_t const i{0};
     REQUIRE(0 == i);
 }
+
+TEST_CASE("test_sys_types_blksize_t", "[wrapped_facade_headers][sys_types][blksize_t]") {
+    blksize_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_blkcnt_t", "[wrapped_facade_headers][sys_types][blkcnt_t]") {
+    blkcnt_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_fsblkcnt_t", "[wrapped_facade_headers][sys_types][fsblkcnt_t]") {
+    fsblkcnt_t const i{0};
+    REQUIRE(0 == i);
+}
+
+TEST_CASE("test_sys_types_fsfilcnt_t", "[wrapped_facade_headers][sys_types][fsfilcnt_t]") {
+    fsfilcnt_t const i{0};
+    REQUIRE(0 == i);
+}
 }  // namespace ystdlib::wrapped_facade_headers::test

From 2cca40c0277c7b9c22fb4ca5c397e1da81a0e538 Mon Sep 17 00:00:00 2001
From: Bingran Hu <bingran.hu@yscope.com>
Date: Wed, 9 Apr 2025 01:46:12 -0400
Subject: [PATCH 22/22] Remove NOLINT

---
 src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
index b1d7c9f..ab2e122 100644
--- a/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
+++ b/src/ystdlib/wrapped_facade_headers/test/test_sys_types.cpp
@@ -105,8 +105,7 @@ TEST_CASE("test_sys_types_daddr_t", "[wrapped_facade_headers][sys_types][daddr_t
 }
 
 TEST_CASE("test_sys_types_caddr_t", "[wrapped_facade_headers][sys_types][caddr_t]") {
-    // NOLINTNEXTLINE(misc-misplaced-const)
-    caddr_t const p{nullptr};
+    caddr_t p{nullptr};
     REQUIRE(nullptr == p);
 }