From 5565409b48bb703de671ba3a79964d9206e9db2b Mon Sep 17 00:00:00 2001 From: Allofich <19624336+Allofich@users.noreply.github.com> Date: Sat, 12 Jun 2021 20:36:28 +0900 Subject: [PATCH] Remove unneeded includes Replace config.h include in qcow2_disk.h with standard library includes, since that's all it was used for. --- include/pc98_cg.h | 2 -- include/programs.h | 5 ----- include/qcow2_disk.h | 4 +++- include/regionalloctracking.h | 2 -- include/render.h | 2 -- include/sdlmain.h | 1 - include/serialport.h | 3 --- include/shell.h | 3 --- 8 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/pc98_cg.h b/include/pc98_cg.h index 67b397c94..06d2990eb 100644 --- a/include/pc98_cg.h +++ b/include/pc98_cg.h @@ -1,6 +1,4 @@ -#include "vga.h" /* uses VGA font RAM as CG ROM */ - /* mapping function from 16-bit WORD to font RAM offset */ /* in: code = 16-bit JIS code word (unshifted) * line = scan line within character cell diff --git a/include/programs.h b/include/programs.h index 956acc1ef..829d680b6 100644 --- a/include/programs.h +++ b/include/programs.h @@ -20,11 +20,6 @@ #ifndef DOSBOX_PROGRAMS_H #define DOSBOX_PROGRAMS_H -#include - -#ifndef DOSBOX_DOSBOX_H -#include "dosbox.h" -#endif #ifndef DOSBOX_DOS_INC_H #include "dos_inc.h" #endif diff --git a/include/qcow2_disk.h b/include/qcow2_disk.h index 11729496c..f0eaeb109 100644 --- a/include/qcow2_disk.h +++ b/include/qcow2_disk.h @@ -20,7 +20,9 @@ #ifndef DOSBOX_QCOW2_DISK_H #define DOSBOX_QCOW2_DISK_H -#include "config.h" +#include +#include + #include "bios_disk.h" class QCow2Image{ diff --git a/include/regionalloctracking.h b/include/regionalloctracking.h index c9e2dd2ae..a77e06c31 100644 --- a/include/regionalloctracking.h +++ b/include/regionalloctracking.h @@ -1,6 +1,4 @@ -#include "dosbox.h" - #ifndef DOSBOX_REGIONALLOCTRACKING_H #define DOSBOX_REGIONALLOCTRACKING_H diff --git a/include/render.h b/include/render.h index c0bb92219..3eda00f7b 100644 --- a/include/render.h +++ b/include/render.h @@ -25,8 +25,6 @@ // 3: complex scalers on #define RENDER_USE_ADVANCED_SCALERS 3 -#include "config.h" - #include "../src/gui/render_scalers.h" #define RENDER_SKIP_CACHE 16 diff --git a/include/sdlmain.h b/include/sdlmain.h index fb2e605d4..469c64bf9 100644 --- a/include/sdlmain.h +++ b/include/sdlmain.h @@ -1,4 +1,3 @@ -#include "dosbox.h" #include "control.h" #include "menu.h" diff --git a/include/serialport.h b/include/serialport.h index deab2d90d..cfdf956e0 100644 --- a/include/serialport.h +++ b/include/serialport.h @@ -20,9 +20,6 @@ #ifndef DOSBOX_SERIALPORT_H #define DOSBOX_SERIALPORT_H -#ifndef DOSBOX_DOSBOX_H -#include "dosbox.h" -#endif #ifndef DOSBOX_INOUT_H #include "inout.h" #endif diff --git a/include/shell.h b/include/shell.h index 97a0033cc..3536fc9d8 100644 --- a/include/shell.h +++ b/include/shell.h @@ -20,9 +20,6 @@ #ifndef DOSBOX_SHELL_H #define DOSBOX_SHELL_H -#ifndef DOSBOX_DOSBOX_H -#include "dosbox.h" -#endif #ifndef DOSBOX_PROGRAMS_H #include "programs.h" #endif