From 87c90393fedc8bb278d189aa53bcd93f4892012b Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Mon, 19 Apr 2021 13:04:30 -0700 Subject: [PATCH] Cleanup of config/includes. Remove a use of AH_BOTTOM from configure.ac. This macro is used by autoheader to add '#include' of some include file to the end of config.h.in and then to config.h. OpenOCD can be built with a custom config.h, so it's preferable to move these '#include' statement directly in the C files that need them dropping this unneeded dependency. It also causes problems when I want to use the gnulib library (which comes with its own Makefile, and does not have the same include path as the top-level Makefile). So this change touches a lot of files, but is actually really simple. It does not affect functionality at all. Change-Id: I52c70bf15eb2edc1dd10e0fde23b2bcd4caec000 Signed-off-by: Tim Newsome Reviewed-on: http://openocd.zylin.com/6171 Tested-by: jenkins Reviewed-by: Antonio Borneo --- configure.ac | 5 ----- src/flash/common.h | 1 + src/flash/nor/bluenrg-x.c | 1 + src/helper/binarybuffer.c | 1 + src/helper/bits.h | 1 + src/helper/configuration.c | 2 ++ src/helper/fileio.c | 1 + src/helper/fileio.h | 2 ++ src/helper/log.c | 1 + src/helper/options.c | 1 + src/helper/replacements.c | 1 + src/helper/replacements.h | 1 + src/helper/system.h | 18 +++++++++--------- src/helper/time_support.h | 1 + src/jtag/aice/aice_pipe.c | 2 ++ src/jtag/aice/aice_transport.c | 1 + src/jtag/aice/aice_usb.c | 1 + src/jtag/core.c | 1 + src/jtag/drivers/arm-jtag-ew.c | 1 + src/jtag/drivers/cmsis_dap.c | 1 + src/jtag/drivers/cmsis_dap_usb_bulk.c | 2 ++ src/jtag/drivers/cmsis_dap_usb_hid.c | 1 + src/jtag/drivers/ftdi.c | 1 + src/jtag/drivers/jlink.c | 1 + src/jtag/drivers/jtag_usb_common.c | 1 + src/jtag/drivers/jtag_usb_common.h | 3 +++ src/jtag/drivers/jtag_vpi.c | 2 +- src/jtag/drivers/mpsse.c | 1 + src/jtag/drivers/remote_bitbang.c | 2 ++ src/jtag/drivers/rlink.c | 1 + src/jtag/drivers/rlink.h | 1 + src/jtag/drivers/stlink_usb.c | 1 + src/jtag/drivers/ulink.c | 1 + .../usb_blaster/ublast2_access_libusb.c | 1 + src/jtag/drivers/usb_blaster/usb_blaster.c | 1 + src/jtag/drivers/versaloon/versaloon.c | 3 ++- src/jtag/drivers/versaloon/versaloon_include.h | 1 + src/jtag/jtag.h | 1 + src/main.c | 1 + src/pld/pld.c | 1 + src/pld/xilinx_bit.c | 2 +- src/pld/xilinx_bit.h | 2 ++ src/server/server.c | 1 + src/server/server.h | 1 + src/svf/svf.c | 1 + src/target/algorithm.h | 3 +++ src/target/armv4_5_cache.h | 2 ++ src/target/breakpoints.h | 2 ++ src/target/image.h | 1 + src/target/nds32_edm.h | 2 ++ src/target/register.h | 3 +++ src/target/semihosting_common.h | 1 + src/target/target.h | 2 ++ src/target/trace.h | 2 ++ src/transport/transport.c | 1 + src/xsvf/xsvf.c | 1 + 56 files changed, 81 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 979bb161b3..58be790394 100644 --- a/configure.ac +++ b/configure.ac @@ -17,11 +17,6 @@ AC_SUBST([MAKEINFO]) AM_INIT_AUTOMAKE([-Wall -Wno-portability dist-bzip2 dist-zip subdir-objects]) AC_CONFIG_HEADERS([config.h]) -AH_BOTTOM([ -#include -#include -#include -]) AC_LANG([C]) AC_PROG_CC diff --git a/src/flash/common.h b/src/flash/common.h index 4244f13606..69f60d9a34 100644 --- a/src/flash/common.h +++ b/src/flash/common.h @@ -19,6 +19,7 @@ #define OPENOCD_FLASH_COMMON_H #include +#include /** * Parses the optional '.index' portion of a flash bank identifier. diff --git a/src/flash/nor/bluenrg-x.c b/src/flash/nor/bluenrg-x.c index 57aebc597a..cf968cb8c2 100644 --- a/src/flash/nor/bluenrg-x.c +++ b/src/flash/nor/bluenrg-x.c @@ -20,6 +20,7 @@ #include "config.h" #endif +#include "helper/types.h" #include #include #include diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c index 44d139f58d..3d35702ac9 100644 --- a/src/helper/binarybuffer.c +++ b/src/helper/binarybuffer.c @@ -23,6 +23,7 @@ #include "config.h" #endif +#include "helper/replacements.h" #include "log.h" #include "binarybuffer.h" diff --git a/src/helper/bits.h b/src/helper/bits.h index cdcac9eafa..00d3c02707 100644 --- a/src/helper/bits.h +++ b/src/helper/bits.h @@ -24,6 +24,7 @@ #ifndef OPENOCD_HELPER_BITS_H #define OPENOCD_HELPER_BITS_H +#include #include #define BIT(nr) (1UL << (nr)) diff --git a/src/helper/configuration.c b/src/helper/configuration.c index 114ad2c6c9..8f4f118334 100644 --- a/src/helper/configuration.c +++ b/src/helper/configuration.c @@ -18,12 +18,14 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see . * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif #include "configuration.h" #include "log.h" +#include "replacements.h" static size_t num_config_files; static char **config_file_names; diff --git a/src/helper/fileio.c b/src/helper/fileio.c index 9dd57e72a1..b6f1f4e2c0 100644 --- a/src/helper/fileio.c +++ b/src/helper/fileio.c @@ -29,6 +29,7 @@ #include "log.h" #include "configuration.h" #include "fileio.h" +#include "replacements.h" struct fileio { char *url; diff --git a/src/helper/fileio.h b/src/helper/fileio.h index 02592e28d0..16c1046575 100644 --- a/src/helper/fileio.h +++ b/src/helper/fileio.h @@ -25,6 +25,8 @@ #ifndef OPENOCD_HELPER_FILEIO_H #define OPENOCD_HELPER_FILEIO_H +#include "types.h" + #define FILEIO_MAX_ERROR_STRING (128) enum fileio_type { diff --git a/src/helper/log.c b/src/helper/log.c index 7440b70f62..f5a80623f3 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -28,6 +28,7 @@ #include "log.h" #include "command.h" +#include "replacements.h" #include "time_support.h" #include diff --git a/src/helper/options.c b/src/helper/options.c index 477d7b303d..f996749ea8 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -31,6 +31,7 @@ #include #include +#include #if IS_DARWIN #include #endif diff --git a/src/helper/replacements.c b/src/helper/replacements.c index b4bb94f06e..f4ecb8dfcc 100644 --- a/src/helper/replacements.c +++ b/src/helper/replacements.c @@ -62,6 +62,7 @@ void *fill_malloc(size_t size) #ifdef _WIN32 #include +#include #endif /* replacements for gettimeofday */ diff --git a/src/helper/replacements.h b/src/helper/replacements.h index a0c59a79e8..5aecf41822 100644 --- a/src/helper/replacements.h +++ b/src/helper/replacements.h @@ -26,6 +26,7 @@ #define OPENOCD_HELPER_REPLACEMENTS_H #include +#include /* MIN,MAX macros */ #ifndef MIN diff --git a/src/helper/system.h b/src/helper/system.h index 1aaca3b33e..0d8be648cb 100644 --- a/src/helper/system.h +++ b/src/helper/system.h @@ -21,6 +21,15 @@ #ifndef OPENOCD_HELPER_SYSTEM_H #define OPENOCD_HELPER_SYSTEM_H +/* +++ platform specific headers +++ */ +#ifdef _WIN32 +#include +#include +#include +#include +#endif +/* --- platform specific headers --- */ + /* standard C library header files */ #include #include @@ -34,15 +43,6 @@ #include #endif -/* +++ platform specific headers +++ */ -#ifdef _WIN32 -#include -#include -#include -#include -#endif -/* --- platform specific headers --- */ - #ifdef HAVE_SYS_SOCKET_H #include #endif diff --git a/src/helper/time_support.h b/src/helper/time_support.h index a9f2dffad0..3c7d4255b9 100644 --- a/src/helper/time_support.h +++ b/src/helper/time_support.h @@ -26,6 +26,7 @@ #define OPENOCD_HELPER_TIME_SUPPORT_H #include +#include "types.h" #ifdef HAVE_SYS_TIME_H #include diff --git a/src/jtag/aice/aice_pipe.c b/src/jtag/aice/aice_pipe.c index c0e532c9db..5a8cbab78c 100644 --- a/src/jtag/aice/aice_pipe.c +++ b/src/jtag/aice/aice_pipe.c @@ -19,6 +19,8 @@ #include "config.h" #endif +#include + #ifdef _WIN32 #include #else diff --git a/src/jtag/aice/aice_transport.c b/src/jtag/aice/aice_transport.c index e3d431b2ec..c02a42f3b8 100644 --- a/src/jtag/aice/aice_transport.c +++ b/src/jtag/aice/aice_transport.c @@ -27,6 +27,7 @@ #include #include #include +#include /* */ static int jim_newtap_expected_id(Jim_Nvp *n, Jim_GetOptInfo *goi, diff --git a/src/jtag/aice/aice_usb.c b/src/jtag/aice/aice_usb.c index 0c219805f6..6c452a3276 100644 --- a/src/jtag/aice/aice_usb.c +++ b/src/jtag/aice/aice_usb.c @@ -19,6 +19,7 @@ #include "config.h" #endif +#include #include #include #include diff --git a/src/jtag/core.c b/src/jtag/core.c index 6604c5ae84..37924aad03 100644 --- a/src/jtag/core.c +++ b/src/jtag/core.c @@ -35,6 +35,7 @@ #include "interface.h" #include #include +#include "helper/system.h" #ifdef HAVE_STRINGS_H #include diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c index d7afbe24df..62d863191c 100644 --- a/src/jtag/drivers/arm-jtag-ew.c +++ b/src/jtag/drivers/arm-jtag-ew.c @@ -22,6 +22,7 @@ #include #include +#include "helper/system.h" #include "libusb_helper.h" #define USB_VID 0x15ba diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c index fb5c86aecc..26e576b8ed 100644 --- a/src/jtag/drivers/cmsis_dap.c +++ b/src/jtag/drivers/cmsis_dap.c @@ -36,6 +36,7 @@ #endif #include +#include "helper/replacements.h" #include #include #include diff --git a/src/jtag/drivers/cmsis_dap_usb_bulk.c b/src/jtag/drivers/cmsis_dap_usb_bulk.c index f535119f30..a588b1bd8d 100644 --- a/src/jtag/drivers/cmsis_dap_usb_bulk.c +++ b/src/jtag/drivers/cmsis_dap_usb_bulk.c @@ -35,8 +35,10 @@ #include "config.h" #endif +#include #include #include +#include #include "cmsis_dap.h" diff --git a/src/jtag/drivers/cmsis_dap_usb_hid.c b/src/jtag/drivers/cmsis_dap_usb_hid.c index e83ad1feb1..38069f8400 100644 --- a/src/jtag/drivers/cmsis_dap_usb_hid.c +++ b/src/jtag/drivers/cmsis_dap_usb_hid.c @@ -35,6 +35,7 @@ #include "config.h" #endif +#include #include #include diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c index 8c83d459d5..e13977fb0d 100644 --- a/src/jtag/drivers/ftdi.c +++ b/src/jtag/drivers/ftdi.c @@ -74,6 +74,7 @@ #include #include #include +#include #if IS_CYGWIN == 1 #include diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c index 15d252cfba..8c1a8116d7 100644 --- a/src/jtag/drivers/jlink.c +++ b/src/jtag/drivers/jlink.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include diff --git a/src/jtag/drivers/jtag_usb_common.c b/src/jtag/drivers/jtag_usb_common.c index 309f8c462f..fdd7137834 100644 --- a/src/jtag/drivers/jtag_usb_common.c +++ b/src/jtag/drivers/jtag_usb_common.c @@ -4,6 +4,7 @@ */ #include +#include #include "jtag_usb_common.h" diff --git a/src/jtag/drivers/jtag_usb_common.h b/src/jtag/drivers/jtag_usb_common.h index 8c03742e92..c4c28cc913 100644 --- a/src/jtag/drivers/jtag_usb_common.h +++ b/src/jtag/drivers/jtag_usb_common.h @@ -6,6 +6,9 @@ #ifndef OPENOCD_JTAG_USB_COMMON_H #define OPENOCD_JTAG_USB_COMMON_H +#include +#include + void jtag_usb_set_location(const char *location); const char *jtag_usb_get_location(void); bool jtag_usb_location_equal(uint8_t dev_bus, uint8_t *port_path, diff --git a/src/jtag/drivers/jtag_vpi.c b/src/jtag/drivers/jtag_vpi.c index c5ffe83ba5..aeed6a56c7 100644 --- a/src/jtag/drivers/jtag_vpi.c +++ b/src/jtag/drivers/jtag_vpi.c @@ -33,7 +33,7 @@ #include #endif -#include +#include "helper/replacements.h" #define NO_TAP_SHIFT 0 #define TAP_SHIFT 1 diff --git a/src/jtag/drivers/mpsse.c b/src/jtag/drivers/mpsse.c index 7cda3b8165..9ba1e2502d 100644 --- a/src/jtag/drivers/mpsse.c +++ b/src/jtag/drivers/mpsse.c @@ -22,6 +22,7 @@ #include "mpsse.h" #include "helper/log.h" +#include "helper/replacements.h" #include "helper/time_support.h" #include diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c index 114e018b71..f7b88303ba 100644 --- a/src/jtag/drivers/remote_bitbang.c +++ b/src/jtag/drivers/remote_bitbang.c @@ -24,6 +24,8 @@ #include #include #endif +#include "helper/system.h" +#include "helper/replacements.h" #include #include "bitbang.h" diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c index ad629ca68b..a88731f4ab 100644 --- a/src/jtag/drivers/rlink.c +++ b/src/jtag/drivers/rlink.c @@ -29,6 +29,7 @@ /* project specific includes */ #include #include +#include "helper/replacements.h" #include "rlink.h" #include "rlink_st7.h" #include "rlink_ep1_cmd.h" diff --git a/src/jtag/drivers/rlink.h b/src/jtag/drivers/rlink.h index 74b62580c2..0c15a3223d 100644 --- a/src/jtag/drivers/rlink.h +++ b/src/jtag/drivers/rlink.h @@ -19,6 +19,7 @@ #ifndef OPENOCD_JTAG_DRIVERS_RLINK_H #define OPENOCD_JTAG_DRIVERS_RLINK_H +#include "helper/types.h" struct rlink_speed_table { uint8_t const *dtc; uint16_t dtc_size; diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index a088a83ee1..60a2c319f5 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -35,6 +35,7 @@ /* project specific includes */ #include #include +#include #include #include #include diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c index 096e254faf..fe95e7d18b 100644 --- a/src/jtag/drivers/ulink.c +++ b/src/jtag/drivers/ulink.c @@ -21,6 +21,7 @@ #endif #include +#include "helper/system.h" #include #include #include diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c index 4dec89b113..d55bf85cd9 100644 --- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c +++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c @@ -23,6 +23,7 @@ #endif #include #include +#include "helper/system.h" #include #include diff --git a/src/jtag/drivers/usb_blaster/usb_blaster.c b/src/jtag/drivers/usb_blaster/usb_blaster.c index 5002a5f537..c312468b41 100644 --- a/src/jtag/drivers/usb_blaster/usb_blaster.c +++ b/src/jtag/drivers/usb_blaster/usb_blaster.c @@ -77,6 +77,7 @@ #include #include #include +#include #include "ublast_access.h" /* system includes */ diff --git a/src/jtag/drivers/versaloon/versaloon.c b/src/jtag/drivers/versaloon/versaloon.c index 194a3751c4..6fea888ab0 100644 --- a/src/jtag/drivers/versaloon/versaloon.c +++ b/src/jtag/drivers/versaloon/versaloon.c @@ -19,11 +19,12 @@ #include "config.h" #endif +#include "versaloon_include.h" + #include #include #include -#include "versaloon_include.h" #include "versaloon.h" #include "versaloon_internal.h" #include "usbtoxxx/usbtoxxx.h" diff --git a/src/jtag/drivers/versaloon/versaloon_include.h b/src/jtag/drivers/versaloon/versaloon_include.h index 901402520f..4ca81d5e2a 100644 --- a/src/jtag/drivers/versaloon/versaloon_include.h +++ b/src/jtag/drivers/versaloon/versaloon_include.h @@ -18,6 +18,7 @@ #ifndef OPENOCD_JTAG_DRIVERS_VERSALOON_VERSALOON_INCLUDE_H #define OPENOCD_JTAG_DRIVERS_VERSALOON_VERSALOON_INCLUDE_H +#include "helper/system.h" /* This file is used to include different header and macros */ /* according to different platform */ #include diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index 86091e6a71..feb4614fa6 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -24,6 +24,7 @@ #include #include +#include #ifndef DEBUG_JTAG_IOZ #define DEBUG_JTAG_IOZ 64 diff --git a/src/main.c b/src/main.c index 83e60d8e0e..a437b6b4c9 100644 --- a/src/main.c +++ b/src/main.c @@ -20,6 +20,7 @@ #include "config.h" #endif #include "openocd.h" +#include "helper/system.h" /* This is the main entry for developer PC hosted OpenOCD. * diff --git a/src/pld/pld.c b/src/pld/pld.c index 9e8c07d809..66f5d44bce 100644 --- a/src/pld/pld.c +++ b/src/pld/pld.c @@ -22,6 +22,7 @@ #include "pld.h" #include +#include #include diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c index f83d8942d3..a530ee776d 100644 --- a/src/pld/xilinx_bit.c +++ b/src/pld/xilinx_bit.c @@ -25,7 +25,7 @@ #include #include - +#include static int read_section(FILE *input_file, int length_size, char section, uint32_t *buffer_length, uint8_t **buffer) diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h index 1a35c3be22..625a9d35e9 100644 --- a/src/pld/xilinx_bit.h +++ b/src/pld/xilinx_bit.h @@ -19,6 +19,8 @@ #ifndef OPENOCD_PLD_XILINX_BIT_H #define OPENOCD_PLD_XILINX_BIT_H +#include "helper/types.h" + struct xilinx_bit_file { uint8_t unknown_header[13]; uint8_t *source_file; diff --git a/src/server/server.c b/src/server/server.c index e53f37d0b8..307266389f 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -33,6 +33,7 @@ #include "openocd.h" #include "tcl_server.h" #include "telnet_server.h" +#include "time_support.h" #include diff --git a/src/server/server.h b/src/server/server.h index ff2ada9cbe..de18d2b4b6 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -30,6 +30,7 @@ #endif #include +#include #ifdef HAVE_NETINET_IN_H #include diff --git a/src/svf/svf.c b/src/svf/svf.c index 608703434a..f35c61314e 100644 --- a/src/svf/svf.c +++ b/src/svf/svf.c @@ -31,6 +31,7 @@ #include #include "svf.h" +#include "helper/system.h" #include /* SVF command */ diff --git a/src/target/algorithm.h b/src/target/algorithm.h index 8894241c04..0fc49d0694 100644 --- a/src/target/algorithm.h +++ b/src/target/algorithm.h @@ -19,6 +19,9 @@ #ifndef OPENOCD_TARGET_ALGORITHM_H #define OPENOCD_TARGET_ALGORITHM_H +#include "helper/types.h" +#include "helper/replacements.h" + enum param_direction { PARAM_IN, PARAM_OUT, diff --git a/src/target/armv4_5_cache.h b/src/target/armv4_5_cache.h index 768938fd1f..985a3a770d 100644 --- a/src/target/armv4_5_cache.h +++ b/src/target/armv4_5_cache.h @@ -19,6 +19,8 @@ #ifndef OPENOCD_TARGET_ARMV4_5_CACHE_H #define OPENOCD_TARGET_ARMV4_5_CACHE_H +#include "helper/types.h" + struct command_invocation; struct armv4_5_cachesize { diff --git a/src/target/breakpoints.h b/src/target/breakpoints.h index 20faf4e6c2..8c247f7a99 100644 --- a/src/target/breakpoints.h +++ b/src/target/breakpoints.h @@ -21,6 +21,8 @@ #include +#include "helper/types.h" + struct target; enum breakpoint_type { diff --git a/src/target/image.h b/src/target/image.h index c8d00d1d72..5b5d11f6b9 100644 --- a/src/target/image.h +++ b/src/target/image.h @@ -29,6 +29,7 @@ #define OPENOCD_TARGET_IMAGE_H #include +#include #ifdef HAVE_ELF_H #include diff --git a/src/target/nds32_edm.h b/src/target/nds32_edm.h index 1dec190f12..2b5067a345 100644 --- a/src/target/nds32_edm.h +++ b/src/target/nds32_edm.h @@ -19,6 +19,8 @@ #ifndef OPENOCD_TARGET_NDS32_EDM_H #define OPENOCD_TARGET_NDS32_EDM_H +#include "helper/types.h" + /** * @file * This is the interface to the Embedded Debug Module for Andes cores. diff --git a/src/target/register.h b/src/target/register.h index 5f1c25fb40..a7705f76e0 100644 --- a/src/target/register.h +++ b/src/target/register.h @@ -22,6 +22,9 @@ #ifndef OPENOCD_TARGET_REGISTER_H #define OPENOCD_TARGET_REGISTER_H +#include "helper/replacements.h" +#include "helper/types.h" + struct target; enum reg_type { diff --git a/src/target/semihosting_common.h b/src/target/semihosting_common.h index 8fb5e0c3a4..b83464ed5a 100644 --- a/src/target/semihosting_common.h +++ b/src/target/semihosting_common.h @@ -25,6 +25,7 @@ #include #include #include +#include "helper/replacements.h" /* * According to: diff --git a/src/target/target.h b/src/target/target.h index b9ae2f78e1..046bd99ae4 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -32,6 +32,8 @@ #define OPENOCD_TARGET_TARGET_H #include +#include "helper/replacements.h" +#include "helper/system.h" #include struct reg; diff --git a/src/target/trace.h b/src/target/trace.h index 2966bbd94c..45308c0d8e 100644 --- a/src/target/trace.h +++ b/src/target/trace.h @@ -19,6 +19,8 @@ #ifndef OPENOCD_TARGET_TRACE_H #define OPENOCD_TARGET_TRACE_H +#include "helper/types.h" + struct target; struct command_context; diff --git a/src/transport/transport.c b/src/transport/transport.c index cb000ab114..ba1f9e9f7b 100644 --- a/src/transport/transport.c +++ b/src/transport/transport.c @@ -42,6 +42,7 @@ */ #include +#include #include extern struct command_context *global_cmd_ctx; diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index eaa5a3aae1..2a7b56dbf4 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -39,6 +39,7 @@ #endif #include "xsvf.h" +#include "helper/system.h" #include #include -- 2.30.2