Commit 6b0d081e60 for qemu.org
commit 6b0d081e6049732e1130b23221f59ee99feedac6
Author: Peter Maydell <peter.maydell@linaro.org>
Date: Fri Jan 16 12:58:28 2026 +0000
bsd-user: Clean up includes
This commit was created with scripts/clean-includes:
./scripts/clean-includes '--git' 'bsd-user' 'bsd-user'
All .c should include qemu/osdep.h first. The script performs three
related cleanups:
* Ensure .c files include qemu/osdep.h first.
* Including it in a .h is redundant, since the .c already includes
it. Drop such inclusions.
* Likewise, including headers qemu/osdep.h includes is redundant.
Drop these, too.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Warner Losh <imp@bsdimp.com>
Message-id: 20260116125830.926296-3-peter.maydell@linaro.org
diff --git a/bsd-user/bsd-mem.h b/bsd-user/bsd-mem.h
index 416d0f8c23..a118e57260 100644
--- a/bsd-user/bsd-mem.h
+++ b/bsd-user/bsd-mem.h
@@ -49,11 +49,8 @@
#ifndef BSD_USER_BSD_MEM_H
#define BSD_USER_BSD_MEM_H
-#include <sys/types.h>
#include <sys/ipc.h>
-#include <sys/mman.h>
#include <sys/shm.h>
-#include <fcntl.h>
#include "qemu-bsd.h"
#include "exec/mmap-lock.h"
diff --git a/bsd-user/bsd-proc.c b/bsd-user/bsd-proc.c
index ca3c1bf94f..8dcac9608d 100644
--- a/bsd-user/bsd-proc.c
+++ b/bsd-user/bsd-proc.c
@@ -19,7 +19,6 @@
#include "qemu/osdep.h"
#include <sys/param.h>
-#include <sys/types.h>
#include <sys/cpuset.h>
#include <sys/resource.h>
#include <sys/wait.h>
diff --git a/bsd-user/freebsd/os-proc.h b/bsd-user/freebsd/os-proc.h
index 3003c8cb63..cc53215138 100644
--- a/bsd-user/freebsd/os-proc.h
+++ b/bsd-user/freebsd/os-proc.h
@@ -23,10 +23,8 @@
#include <sys/param.h>
#include <sys/procctl.h>
#include <sys/signal.h>
-#include <sys/types.h>
#include <sys/procdesc.h>
#include <sys/wait.h>
-#include <unistd.h>
#include "target_arch_cpu.h"
diff --git a/bsd-user/qemu-bsd.h b/bsd-user/qemu-bsd.h
index ffc64bb244..56affcd31d 100644
--- a/bsd-user/qemu-bsd.h
+++ b/bsd-user/qemu-bsd.h
@@ -20,7 +20,6 @@
#ifndef QEMU_BSD_H
#define QEMU_BSD_H
-#include <sys/types.h>
#include <sys/resource.h>
#include <sys/ipc.h>
#include <sys/msg.h>