diff --git a/std/c/freebsd.zig b/std/c/freebsd.zig
index 2f2f4c0a1b75f1e93596d50d7727b25968caa8f2..b51764cb7a72b077d053212d7e05b4c59aff8ce5 100644
--- a/std/c/freebsd.zig
+++ b/std/c/freebsd.zig
@@ -42,14 +42,19 @@ pub const pthread_attr_t = extern struct {
 };
 
 pub const msghdr = extern struct {
-    msg_name: *u8,
+    /// optional address
+    msg_name: ?*sockaddr,
+    /// size of address
     msg_namelen: socklen_t,
-    msg_iov: *iovec,
+    /// scatter/gather array
+    msg_iov: [*]iovec,
+    /// # elements in msg_iov
     msg_iovlen: i32,
-    __pad1: i32,
-    msg_control: *u8,
+    /// ancillary data
+    msg_control: ?*c_void,
+    /// ancillary data buffer len
     msg_controllen: socklen_t,
-    __pad2: socklen_t,
+    /// flags on received message
     msg_flags: i32,
 };
 
diff --git a/std/c/netbsd.zig b/std/c/netbsd.zig
index 796d45dafccbf6572530464c75d496afc04cb759..26a95c0796deb089a13754d0a6c04a0c62963987 100644
--- a/std/c/netbsd.zig
+++ b/std/c/netbsd.zig
@@ -42,14 +42,19 @@ pub const pthread_attr_t = extern struct {
 };
 
 pub const msghdr = extern struct {
-    msg_name: *u8,
+    /// optional address
+    msg_name: ?*sockaddr,
+    /// size of address
     msg_namelen: socklen_t,
-    msg_iov: *iovec,
+    /// scatter/gather array
+    msg_iov: [*]iovec,
+    /// # elements in msg_iov
     msg_iovlen: i32,
-    __pad1: i32,
-    msg_control: *u8,
+    /// ancillary data
+    msg_control: ?*c_void,
+    /// ancillary data buffer len
     msg_controllen: socklen_t,
-    __pad2: socklen_t,
+    /// flags on received message
     msg_flags: i32,
 };
 
diff --git a/std/os/linux/arm64.zig b/std/os/linux/arm64.zig
index ac2c18ee5f2abf19081940c47b4d6252b45ce952..25806640bbf05a965ae3605903c8e862280d96e1 100644
--- a/std/os/linux/arm64.zig
+++ b/std/os/linux/arm64.zig
@@ -415,12 +415,12 @@ pub fn syscall6(
 pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
 
 pub const msghdr = extern struct {
-    msg_name: *u8,
+    msg_name: ?*sockaddr,
     msg_namelen: socklen_t,
-    msg_iov: *iovec,
+    msg_iov: [*]iovec,
     msg_iovlen: i32,
     __pad1: i32,
-    msg_control: *u8,
+    msg_control: ?*c_void,
     msg_controllen: socklen_t,
     __pad2: socklen_t,
     msg_flags: i32,
diff --git a/std/os/linux/x86_64.zig b/std/os/linux/x86_64.zig
index d194cd4003cf760c49bb67784448d8782634e54f..70818de17bc3f446eaef9eb2dfdbd158b5d3424a 100644
--- a/std/os/linux/x86_64.zig
+++ b/std/os/linux/x86_64.zig
@@ -1,5 +1,6 @@
 const std = @import("../../std.zig");
 const linux = std.os.linux;
+const sockaddr = linux.sockaddr;
 const socklen_t = linux.socklen_t;
 const iovec = linux.iovec;
 
@@ -483,12 +484,12 @@ pub nakedcc fn restore_rt() void {
 }
 
 pub const msghdr = extern struct {
-    msg_name: *u8,
+    msg_name: ?*sockaddr,
     msg_namelen: socklen_t,
-    msg_iov: *iovec,
+    msg_iov: [*]iovec,
     msg_iovlen: i32,
     __pad1: i32,
-    msg_control: *u8,
+    msg_control: ?*c_void,
     msg_controllen: socklen_t,
     __pad2: socklen_t,
     msg_flags: i32,