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 <tim@sifive.com>
Reviewed-on: http://openocd.zylin.com/6171
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>

diff --git a/configure.ac b/configure.ac
index 979bb161b3ee2833a51643fe0af07ee7a0377da7..58be790394819f67fc7999708601f9a8b356562c 100644 (file)
--- 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 <helper/system.h>
-#include <helper/types.h>
-#include <helper/replacements.h>
-])
 
 AC_LANG([C])
 AC_PROG_CC

diff --git a/src/flash/common.h b/src/flash/common.h
index 4244f1360647c684aae958ee17c45213c53127b8..69f60d9a34ac7159d809f904a35c1d354379ae5b 100644 (file)
--- a/src/flash/common.h
+++ b/src/flash/common.h
@@ -19,6 +19,7 @@
 #define OPENOCD_FLASH_COMMON_H
 
 #include <helper/log.h>
+#include <helper/replacements.h>
 
 /**
  * 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 57aebc597aacf50f1832f9ddc070fde58dbf7399..cf968cb8c2a35bee97ec03bac2615acfec66e414 100644 (file)
--- 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 <target/algorithm.h>
 #include <target/armv7m.h>
 #include <target/cortex_m.h>

diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c
index 44d139f58dd90fdf4d3ed4e2584fc90d36d81eee..3d35702ac96ed0829b9d11b6e51f030f15c48a80 100644 (file)
--- 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 cdcac9eafa4de7c988d814b66b964db06c820149..00d3c027073cf68eb6c6aa122d58380ceb04ca01 100644 (file)
--- 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 <helper/replacements.h>
 #include <helper/types.h>
 
 #define BIT(nr)                     (1UL << (nr))

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 114ad2c6c90e6f47ee591d61becdbd92a15304d8..8f4f118334f639297c41dbd088e8df4418e435af 100644 (file)
--- 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 <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #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 9dd57e72a1440a36aab50d6b74621e35b3ca789d..b6f1f4e2c0735037b7fb61b54a6de42c2354b36c 100644 (file)
--- 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 02592e28d0ed9e4df168d706dad1861b14a44d01..16c1046575bfeb9f2d7acee0d3eff78eabbe0af6 100644 (file)
--- 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 7440b70f62c1c43fe05adcd48f68fbe4e21996b8..f5a80623f36a2a1e1e24ef65d08c829b1b022a34 100644 (file)
--- 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 <stdarg.h>

diff --git a/src/helper/options.c b/src/helper/options.c
index 477d7b303db6fd253b979f4867347fb6f5095cb4..f996749ea88bace77de5e2b830edd3857cb9a6ea 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -31,6 +31,7 @@
 
 #include <limits.h>
 #include <stdlib.h>
+#include <string.h>
 #if IS_DARWIN
 #include <libproc.h>
 #endif

diff --git a/src/helper/replacements.c b/src/helper/replacements.c
index b4bb94f06e43398e99771ea3ec05a4bf786d30e8..f4ecb8dfcc5a719c48495e5ff1ad8ee8cfe30570 100644 (file)
--- a/src/helper/replacements.c
+++ b/src/helper/replacements.c
@@ -62,6 +62,7 @@ void *fill_malloc(size_t size)
 
 #ifdef _WIN32
 #include <io.h>
+#include <winsock2.h>
 #endif
 
 /* replacements for gettimeofday */

diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index a0c59a79e8f5f182331edd6b54c10473a0fbfe56..5aecf41822e833328386347cc810e563a6bcfa9e 100644 (file)
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -26,6 +26,7 @@
 #define OPENOCD_HELPER_REPLACEMENTS_H
 
 #include <stdint.h>
+#include <helper/system.h>
 
 /* MIN,MAX macros */
 #ifndef MIN

diff --git a/src/helper/system.h b/src/helper/system.h
index 1aaca3b33e767b4e8a234f23fb87af67cc57e0b7..0d8be648cb927c976d2d719041f6ce9924c8b2ef 100644 (file)
--- 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 <winsock2.h>
+#include <ws2tcpip.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+/* --- platform specific headers --- */
+
 /* standard C library header files */
 #include <stdio.h>
 #include <stdlib.h>
@@ -34,15 +43,6 @@
 #include <sys/time.h>
 #endif
 
-/* +++ platform specific headers +++ */
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-/* --- platform specific headers --- */
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff --git a/src/helper/time_support.h b/src/helper/time_support.h
index a9f2dffad0d577a0df3dbb81a9153c8108f6494f..3c7d4255b9c0dd4437f39b33b6aa7d432e9401d1 100644 (file)
--- a/src/helper/time_support.h
+++ b/src/helper/time_support.h
@@ -26,6 +26,7 @@
 #define OPENOCD_HELPER_TIME_SUPPORT_H
 
 #include <time.h>
+#include "types.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/src/jtag/aice/aice_pipe.c b/src/jtag/aice/aice_pipe.c
index c0e532c9dbfb422413c3ebcfb8c1cb920fff93ad..5a8cbab78cb73553ed3fb9610388bae5a3f18bea 100644 (file)
--- a/src/jtag/aice/aice_pipe.c
+++ b/src/jtag/aice/aice_pipe.c
@@ -19,6 +19,8 @@
 #include "config.h"
 #endif
 
+#include <helper/system.h>
+
 #ifdef _WIN32
 #include <windows.h>
 #else

diff --git a/src/jtag/aice/aice_transport.c b/src/jtag/aice/aice_transport.c
index e3d431b2ec54c585cf78f3b8dfb64dbf0917c083..c02a42f3b8a84f65fa390d21fcf7ec85e8824cbd 100644 (file)
--- a/src/jtag/aice/aice_transport.c
+++ b/src/jtag/aice/aice_transport.c
@@ -27,6 +27,7 @@
 #include <target/target.h>
 #include <jtag/aice/aice_interface.h>
 #include <jtag/aice/aice_transport.h>
+#include <string.h>
 
 /* */
 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 0c219805f6246dcccbbddff28c99d4015c74b3f8..6c452a3276d76c5ef8afc96be77af46b979db834 100644 (file)
--- a/src/jtag/aice/aice_usb.c
+++ b/src/jtag/aice/aice_usb.c
@@ -19,6 +19,7 @@
 #include "config.h"
 #endif
 
+#include <helper/system.h>
 #include <jtag/drivers/libusb_helper.h>
 #include <helper/log.h>
 #include <helper/time_support.h>

diff --git a/src/jtag/core.c b/src/jtag/core.c
index 6604c5ae84f94ede3020d7fe9afe8d83a44288a5..37924aad03e27f917018006a05845073d720ac0a 100644 (file)
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -35,6 +35,7 @@
 #include "interface.h"
 #include <transport/transport.h>
 #include <helper/jep106.h>
+#include "helper/system.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index d7afbe24df45a5b7ee73f1488a4ec42dc06e8f3a..62d863191c39be284e50b5a5001855c5384c11b9 100644 (file)
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -22,6 +22,7 @@
 
 #include <jtag/interface.h>
 #include <jtag/commands.h>
+#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 fb5c86aecccc7706d36dc8f20c0e7f435eba5cec..26e576b8edfd0c21fa568f5e653a8811326238cc 100644 (file)
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -36,6 +36,7 @@
 #endif
 
 #include <transport/transport.h>
+#include "helper/replacements.h"
 #include <jtag/swd.h>
 #include <jtag/interface.h>
 #include <jtag/commands.h>

diff --git a/src/jtag/drivers/cmsis_dap_usb_bulk.c b/src/jtag/drivers/cmsis_dap_usb_bulk.c
index f535119f30d8c2cec259e0262878dcc40bf3ad38..a588b1bd8ddbc95f59e588aa46b322c3dcd9ad7a 100644 (file)
--- 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 <helper/system.h>
 #include <libusb.h>
 #include <helper/log.h>
+#include <helper/replacements.h>
 
 #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 e83ad1feb1193296fda056fc4344026bd9679fa4..38069f8400fc0414f7162285619caf8cda695927 100644 (file)
--- 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 <string.h>
 #include <hidapi.h>
 #include <helper/log.h>
 

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index 8c83d459d58216a5295e72fb4fdd78e74c79b913..e13977fb0d8e8f417cd29a2ffcff4e4a077723c1 100644 (file)
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -74,6 +74,7 @@
 #include <jtag/swd.h>
 #include <transport/transport.h>
 #include <helper/time_support.h>
+#include <helper/log.h>
 
 #if IS_CYGWIN == 1
 #include <windows.h>

diff --git a/src/jtag/drivers/jlink.c b/src/jtag/drivers/jlink.c
index 15d252cfbaad5b32fd3b327d93b2336333c64824..8c1a8116d70b54cb6a53e386b7c90e0990b47118 100644 (file)
--- a/src/jtag/drivers/jlink.c
+++ b/src/jtag/drivers/jlink.c
@@ -39,6 +39,7 @@
 #include <jtag/swd.h>
 #include <jtag/commands.h>
 #include <jtag/drivers/jtag_usb_common.h>
+#include <src/helper/replacements.h>
 #include <target/cortex_m.h>
 
 #include <libjaylink/libjaylink.h>

diff --git a/src/jtag/drivers/jtag_usb_common.c b/src/jtag/drivers/jtag_usb_common.c
index 309f8c462fbca818a4656e400d7a2027c234502a..fdd7137834fe09b3826dd8f9610fe6c4c0d6b27c 100644 (file)
--- a/src/jtag/drivers/jtag_usb_common.c
+++ b/src/jtag/drivers/jtag_usb_common.c
@@ -4,6 +4,7 @@
  */
 
 #include <helper/log.h>
+#include <string.h>
 
 #include "jtag_usb_common.h"
 

diff --git a/src/jtag/drivers/jtag_usb_common.h b/src/jtag/drivers/jtag_usb_common.h
index 8c03742e9224de133ed213d81c3685c702a67111..c4c28cc913303c73e53979194aa336012bbf9729 100644 (file)
--- 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 <helper/replacements.h>
+#include <helper/types.h>
+
 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 c5ffe83ba59ed4248bdd80fcbcfdd6f76d9cceb9..aeed6a56c78c1afe21144a299348315bf4f9406c 100644 (file)
--- a/src/jtag/drivers/jtag_vpi.c
+++ b/src/jtag/drivers/jtag_vpi.c
@@ -33,7 +33,7 @@
 #include <netinet/tcp.h>
 #endif
 
-#include <string.h>
+#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 7cda3b81650d70f539b661757e66041fa98687f0..9ba1e2502de746474cda4ef2aef27126c51a41b2 100644 (file)
--- 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 <libusb.h>
 

diff --git a/src/jtag/drivers/remote_bitbang.c b/src/jtag/drivers/remote_bitbang.c
index 114e018b71f191eb14423bdfb228783ce0dedebb..f7b88303ba570dd853c4be45fb5eca6dcfc7e7d4 100644 (file)
--- a/src/jtag/drivers/remote_bitbang.c
+++ b/src/jtag/drivers/remote_bitbang.c
@@ -24,6 +24,8 @@
 #include <sys/un.h>
 #include <netdb.h>
 #endif
+#include "helper/system.h"
+#include "helper/replacements.h"
 #include <jtag/interface.h>
 #include "bitbang.h"
 

diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c
index ad629ca68b8303649a94bcba5c314a1aba1825ca..a88731f4ab9b1bbb44326eb14b530c87490b8e95 100644 (file)
--- a/src/jtag/drivers/rlink.c
+++ b/src/jtag/drivers/rlink.c
@@ -29,6 +29,7 @@
 /* project specific includes */
 #include <jtag/interface.h>
 #include <jtag/commands.h>
+#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 74b62580c2e17b2fd6be6baab4b15d75a2a56e16..0c15a3223d0082d1885a95a95d0568f558e7747e 100644 (file)
--- 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 a088a83ee115c4b9d948a0eec602d2bd9c626413..60a2c319f548c3ec2abcb112a601ccb2114b999c 100644 (file)
--- a/src/jtag/drivers/stlink_usb.c
+++ b/src/jtag/drivers/stlink_usb.c
@@ -35,6 +35,7 @@
 /* project specific includes */
 #include <helper/binarybuffer.h>
 #include <helper/bits.h>
+#include <helper/system.h>
 #include <jtag/interface.h>
 #include <jtag/hla/hla_layout.h>
 #include <jtag/hla/hla_transport.h>

diff --git a/src/jtag/drivers/ulink.c b/src/jtag/drivers/ulink.c
index 096e254faf8d86ea286fad5f34cf062eef23741b..fe95e7d18b9c03e3883e3a6a114683be633b12ed 100644 (file)
--- a/src/jtag/drivers/ulink.c
+++ b/src/jtag/drivers/ulink.c
@@ -21,6 +21,7 @@
 #endif
 
 #include <math.h>
+#include "helper/system.h"
 #include <jtag/interface.h>
 #include <jtag/commands.h>
 #include <target/image.h>

diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index 4dec89b113ba92d58a82cf0c8cc87553ded061f0..d55bf85cd9e2e7e28bd00b81a0bd7c28c308f247 100644 (file)
--- 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 <jtag/interface.h>
 #include <jtag/commands.h>
+#include "helper/system.h"
 #include <libusb_helper.h>
 #include <target/image.h>
 

diff --git a/src/jtag/drivers/usb_blaster/usb_blaster.c b/src/jtag/drivers/usb_blaster/usb_blaster.c
index 5002a5f5379f2cb34d47bec3dd69c1303672c3d7..c312468b41b954dcf1b2806c60f1b6e80a1cc932 100644 (file)
--- a/src/jtag/drivers/usb_blaster/usb_blaster.c
+++ b/src/jtag/drivers/usb_blaster/usb_blaster.c
@@ -77,6 +77,7 @@
 #include <jtag/interface.h>
 #include <jtag/commands.h>
 #include <helper/time_support.h>
+#include <helper/replacements.h>
 #include "ublast_access.h"
 
 /* system includes */

diff --git a/src/jtag/drivers/versaloon/versaloon.c b/src/jtag/drivers/versaloon/versaloon.c
index 194a3751c4f3c722b8912f81155fbcdecb1740f0..6fea888ab0f4cf3c9ed74c8ee65ecc735917aa5f 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 #include <libusb.h>
 
-#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 901402520fd9b4465ed1741c58e5334fd42ea684..4ca81d5e2a2d7436a5ac7e6340a1580e3b1eff35 100644 (file)
--- 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 <jtag/interface.h>

diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 86091e6a7103d7d22ec42aaf3f2abc9976c5410c..feb4614fa6fe5c6ff3cd06baf4cef70102c8f87c 100644 (file)
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -24,6 +24,7 @@
 
 #include <helper/binarybuffer.h>
 #include <helper/log.h>
+#include <helper/replacements.h>
 
 #ifndef DEBUG_JTAG_IOZ
 #define DEBUG_JTAG_IOZ 64

diff --git a/src/main.c b/src/main.c
index 83e60d8e0e252996094e9ccc61fb4f539abe954e..a437b6b4c94fcd01bd794fcbb249ca8558170553 100644 (file)
--- 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 9e8c07d80937326e91a7f28a966efe7258585d81..66f5d44bce59b9c24c2c79b89aed09c7f7e26929 100644 (file)
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -22,6 +22,7 @@
 
 #include "pld.h"
 #include <helper/log.h>
+#include <helper/replacements.h>
 #include <helper/time_support.h>
 
 

diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index f83d8942d38fb717f6e5e5367f00632d46f1df7a..a530ee776db52b3d34b12dc1833fd44bd34436cb 100644 (file)
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -25,7 +25,7 @@
 #include <helper/log.h>
 
 #include <sys/stat.h>
-
+#include <helper/system.h>
 
 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 1a35c3be225df9453ee2802349fe732a34bf59ca..625a9d35e96225fe9bf5166ea6ee6a7ac43f2085 100644 (file)
--- 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 e53f37d0b8ee05c341730be64ce6becf84eeed76..307266389ff8287b1265bf94c3c844d4f49cfade 100644 (file)
--- 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 <signal.h>
 

diff --git a/src/server/server.h b/src/server/server.h
index ff2ada9cbe68ff53c3d36e291275152667c47f24..de18d2b4b66680ad0baca4d39f592b08f25aea6d 100644 (file)
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -30,6 +30,7 @@
 #endif
 
 #include <helper/log.h>
+#include <helper/replacements.h>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/src/svf/svf.c b/src/svf/svf.c
index 608703434aa8618184aa33065dea0ed120539049..f35c61314e7f092ecd320a574039f88cb7c6f53e 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -31,6 +31,7 @@
 
 #include <jtag/jtag.h>
 #include "svf.h"
+#include "helper/system.h"
 #include <helper/time_support.h>
 
 /* SVF command */

diff --git a/src/target/algorithm.h b/src/target/algorithm.h
index 8894241c04f207f7543601e6ed4155fdf97f15bc..0fc49d06940ca8ab94270ca4da6df19e21711b51 100644 (file)
--- 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 768938fd1ff2f1642a6a0bb6af79447213cc63c7..985a3a770d3e71fa254c294d9aa8aaf96f8d0399 100644 (file)
--- 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 20faf4e6c2690064b4bc1a5691981cf83a92bd00..8c247f7a9918199baf32ab0ad1e9cd9a0e533ac7 100644 (file)
--- a/src/target/breakpoints.h
+++ b/src/target/breakpoints.h
@@ -21,6 +21,8 @@
 
 #include <stdint.h>
 
+#include "helper/types.h"
+
 struct target;
 
 enum breakpoint_type {

diff --git a/src/target/image.h b/src/target/image.h
index c8d00d1d72ec44b1e8b5fe6e38fb821ddf09dd2d..5b5d11f6b94485220e9e131ad156df5d9b3bd375 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -29,6 +29,7 @@
 #define OPENOCD_TARGET_IMAGE_H
 
 #include <helper/fileio.h>
+#include <helper/replacements.h>
 
 #ifdef HAVE_ELF_H
 #include <elf.h>

diff --git a/src/target/nds32_edm.h b/src/target/nds32_edm.h
index 1dec190f1263c38228256010c62f0350a49ce236..2b5067a3455f7e482f6f69999da0d18006a55116 100644 (file)
--- 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 5f1c25fb40e9348427eb9847a07a2e7f5f0910ac..a7705f76e089bed004be1ce7c3a704d30b28a0c8 100644 (file)
--- 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 8fb5e0c3a4c84040b3f1dd03b086a3512be2fda2..b83464ed5a49a19915f49905c1204089fec18e9b 100644 (file)
--- a/src/target/semihosting_common.h
+++ b/src/target/semihosting_common.h
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <time.h>
+#include "helper/replacements.h"
 
 /*
  * According to:

diff --git a/src/target/target.h b/src/target/target.h
index b9ae2f78e1255f4ff4f71f59ef6dc4f61edd0448..046bd99ae438020db256ce8ac9b331ed4998e471 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -32,6 +32,8 @@
 #define OPENOCD_TARGET_TARGET_H
 
 #include <helper/list.h>
+#include "helper/replacements.h"
+#include "helper/system.h"
 #include <jim.h>
 
 struct reg;

diff --git a/src/target/trace.h b/src/target/trace.h
index 2966bbd94c34b5f51dde56269ca6f98d7cff932c..45308c0d8e41a95ea576447704cafe6fe66c4bdf 100644 (file)
--- 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 cb000ab11466931b0afa3fd510a72e391530cf11..ba1f9e9f7bee9d6fd7775df6cbeeabad22b67f5c 100644 (file)
--- a/src/transport/transport.c
+++ b/src/transport/transport.c
@@ -42,6 +42,7 @@
  */
 
 #include <helper/log.h>
+#include <helper/replacements.h>
 #include <transport/transport.h>
 
 extern struct command_context *global_cmd_ctx;

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index eaa5a3aae139dd485a1ba03cf989cf5af9c02d79..2a7b56dbf4d80e5e6951eb38ce94ba3395bf6a2c 100644 (file)
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -39,6 +39,7 @@
 #endif
 
 #include "xsvf.h"
+#include "helper/system.h"
 #include <jtag/jtag.h>
 #include <svf/svf.h>