Clean up includes so that osdep.h is included first and headers which it implies are not included manually.
This commit was created with scripts/clean-includes. Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> --- bsd-user/bsdload.c | 8 +------- bsd-user/elfload.c | 8 +------- bsd-user/main.c | 8 +------- bsd-user/mmap.c | 7 +------ bsd-user/signal.c | 7 +------ bsd-user/strace.c | 6 +----- bsd-user/syscall.c | 12 +----------- bsd-user/uaccess.c | 3 +-- 8 files changed, 8 insertions(+), 51 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index 2abc713..94eec36 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -1,12 +1,6 @@ /* Code for loading BSD executables. Mostly linux kernel code. */ -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <errno.h> -#include <unistd.h> -#include <stdio.h> -#include <stdlib.h> +#include "qemu/osdep.h" #include "qemu.h" diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 59a7bdf..0a6092b 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -1,13 +1,7 @@ /* This is the Linux kernel elf-loading code, ported into user space */ -#include <stdio.h> -#include <sys/types.h> -#include <fcntl.h> -#include <errno.h> -#include <unistd.h> +#include "qemu/osdep.h" #include <sys/mman.h> -#include <stdlib.h> -#include <string.h> #include "qemu.h" #include "disas/disas.h" diff --git a/bsd-user/main.c b/bsd-user/main.c index 1ecaeb5..1f3575d 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -16,14 +16,8 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> +#include "qemu/osdep.h" #include <machine/trap.h> -#include <sys/types.h> #include <sys/mman.h> #include "qemu.h" diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 092bf7f..6ab5334 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -16,12 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdarg.h> -#include <string.h> -#include <unistd.h> -#include <errno.h> +#include "qemu/osdep.h" #include <sys/mman.h> #include "qemu.h" diff --git a/bsd-user/signal.c b/bsd-user/signal.c index 4887ecc..f6f7aa2 100644 --- a/bsd-user/signal.c +++ b/bsd-user/signal.c @@ -16,12 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <stdarg.h> -#include <unistd.h> -#include <errno.h> +#include "qemu/osdep.h" #include "qemu.h" #include "target_signal.h" diff --git a/bsd-user/strace.c b/bsd-user/strace.c index e33dd4d..fa66fe1 100644 --- a/bsd-user/strace.c +++ b/bsd-user/strace.c @@ -16,14 +16,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> -#include <errno.h> +#include "qemu/osdep.h" #include <sys/select.h> -#include <sys/types.h> -#include <unistd.h> #include <sys/syscall.h> #include <sys/ioccom.h> -#include <ctype.h> #include "qemu.h" diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index a4d1583..35f784c 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -16,17 +16,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdlib.h> -#include <stdio.h> -#include <stdint.h> -#include <stdarg.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <fcntl.h> -#include <time.h> -#include <limits.h> -#include <sys/types.h> +#include "qemu/osdep.h" #include <sys/mman.h> #include <sys/syscall.h> #include <sys/param.h> diff --git a/bsd-user/uaccess.c b/bsd-user/uaccess.c index 677f19c..7cb6d17 100644 --- a/bsd-user/uaccess.c +++ b/bsd-user/uaccess.c @@ -1,6 +1,5 @@ /* User memory access */ -#include <stdio.h> -#include <string.h> +#include "qemu/osdep.h" #include "qemu.h" -- 1.9.1
