Skip to main content
summaryrefslogtreecommitdiffstats
path: root/agent/tcf
diff options
context:
space:
mode:
authorEugene Tarassov2011-11-10 20:36:40 -0500
committerEugene Tarassov2011-11-10 20:36:40 -0500
commit846c7264e3daaebb87dc9ab959bbfd2472abfd0e (patch)
tree6e96e22e7acccb509f6c03cbe264f900a72b2eb8 /agent/tcf
parenta107edc216f94c5ec059fdf74541908bc7e979bb (diff)
downloadorg.eclipse.tcf.agent-846c7264e3daaebb87dc9ab959bbfd2472abfd0e.tar.gz
org.eclipse.tcf.agent-846c7264e3daaebb87dc9ab959bbfd2472abfd0e.tar.xz
org.eclipse.tcf.agent-846c7264e3daaebb87dc9ab959bbfd2472abfd0e.zip
#include directives changed to include "tcf" as the first directory name in header file path.
Diffstat (limited to 'agent/tcf')
-rw-r--r--agent/tcf/config.h2
-rw-r--r--agent/tcf/framework/asyncreq.c18
-rw-r--r--agent/tcf/framework/asyncreq.h4
-rw-r--r--agent/tcf/framework/base64.c8
-rw-r--r--agent/tcf/framework/base64.h2
-rw-r--r--agent/tcf/framework/cache.c14
-rw-r--r--agent/tcf/framework/cache.h2
-rw-r--r--agent/tcf/framework/channel.c24
-rw-r--r--agent/tcf/framework/channel.h6
-rw-r--r--agent/tcf/framework/channel_pipe.c32
-rw-r--r--agent/tcf/framework/channel_pipe.h2
-rw-r--r--agent/tcf/framework/channel_tcp.c36
-rw-r--r--agent/tcf/framework/channel_tcp.h2
-rw-r--r--agent/tcf/framework/context.c6
-rw-r--r--agent/tcf/framework/context.h8
-rw-r--r--agent/tcf/framework/cpudefs.c16
-rw-r--r--agent/tcf/framework/cpudefs.h2
-rw-r--r--agent/tcf/framework/errors.c18
-rw-r--r--agent/tcf/framework/events.c12
-rw-r--r--agent/tcf/framework/exceptions.c10
-rw-r--r--agent/tcf/framework/exceptions.h2
-rw-r--r--agent/tcf/framework/inputbuf.c10
-rw-r--r--agent/tcf/framework/inputbuf.h4
-rw-r--r--agent/tcf/framework/ip_ifc.c14
-rw-r--r--agent/tcf/framework/json.c10
-rw-r--r--agent/tcf/framework/json.h4
-rw-r--r--agent/tcf/framework/mdep-threads.h2
-rw-r--r--agent/tcf/framework/mdep.c12
-rw-r--r--agent/tcf/framework/mdep.h2
-rw-r--r--agent/tcf/framework/myalloc.c6
-rw-r--r--agent/tcf/framework/outputbuf.c10
-rw-r--r--agent/tcf/framework/outputbuf.h4
-rw-r--r--agent/tcf/framework/peer.c14
-rw-r--r--agent/tcf/framework/plugins.c8
-rw-r--r--agent/tcf/framework/plugins.h2
-rw-r--r--agent/tcf/framework/protocol.c16
-rw-r--r--agent/tcf/framework/protocol.h2
-rw-r--r--agent/tcf/framework/proxy.c14
-rw-r--r--agent/tcf/framework/proxy.h2
-rw-r--r--agent/tcf/framework/signames.c4
-rw-r--r--agent/tcf/framework/streams.c6
-rw-r--r--agent/tcf/framework/streams.h2
-rw-r--r--agent/tcf/framework/trace.c6
-rw-r--r--agent/tcf/framework/trace.h2
-rw-r--r--agent/tcf/framework/waitpid.c14
-rw-r--r--agent/tcf/framework/waitpid.h2
-rw-r--r--agent/tcf/machine/elf-mdep.h2
-rw-r--r--agent/tcf/machine/x86_64/cpudefs-mdep.h2
-rw-r--r--agent/tcf/main/cmdline.c22
-rw-r--r--agent/tcf/main/cmdline.h2
-rw-r--r--agent/tcf/main/main.c24
-rw-r--r--agent/tcf/main/main_client.c20
-rw-r--r--agent/tcf/main/main_log.c20
-rw-r--r--agent/tcf/main/main_lua.c20
-rw-r--r--agent/tcf/main/main_reg.c16
-rw-r--r--agent/tcf/main/main_va.c24
-rw-r--r--agent/tcf/main/server.c8
-rw-r--r--agent/tcf/main/server.h4
-rw-r--r--agent/tcf/main/services.c46
-rw-r--r--agent/tcf/main/services.h4
-rw-r--r--agent/tcf/main/test.c16
-rw-r--r--agent/tcf/main/test.h8
-rw-r--r--agent/tcf/services/breakpoints.c38
-rw-r--r--agent/tcf/services/breakpoints.h4
-rw-r--r--agent/tcf/services/diagnostics.c24
-rw-r--r--agent/tcf/services/diagnostics.h4
-rw-r--r--agent/tcf/services/discovery.c24
-rw-r--r--agent/tcf/services/discovery.h8
-rw-r--r--agent/tcf/services/discovery_udp.c24
-rw-r--r--agent/tcf/services/dwarfcache.c16
-rw-r--r--agent/tcf/services/dwarfcache.h8
-rw-r--r--agent/tcf/services/dwarfexpr.c22
-rw-r--r--agent/tcf/services/dwarfexpr.h4
-rw-r--r--agent/tcf/services/dwarfframe.c14
-rw-r--r--agent/tcf/services/dwarfframe.h6
-rw-r--r--agent/tcf/services/dwarfio.c12
-rw-r--r--agent/tcf/services/dwarfio.h4
-rw-r--r--agent/tcf/services/dwarfreloc.c8
-rw-r--r--agent/tcf/services/dwarfreloc.h4
-rw-r--r--agent/tcf/services/expressions.c24
-rw-r--r--agent/tcf/services/expressions.h8
-rw-r--r--agent/tcf/services/filesystem.c22
-rw-r--r--agent/tcf/services/filesystem.h2
-rw-r--r--agent/tcf/services/linenumbers.c18
-rw-r--r--agent/tcf/services/linenumbers.h4
-rw-r--r--agent/tcf/services/linenumbers_elf.c30
-rw-r--r--agent/tcf/services/linenumbers_proxy.c16
-rw-r--r--agent/tcf/services/linenumbers_win32.c16
-rw-r--r--agent/tcf/services/memorymap.c14
-rw-r--r--agent/tcf/services/memorymap.h6
-rw-r--r--agent/tcf/services/memoryservice.c20
-rw-r--r--agent/tcf/services/pathmap.c14
-rw-r--r--agent/tcf/services/pathmap.h6
-rw-r--r--agent/tcf/services/processes.c24
-rw-r--r--agent/tcf/services/processes.h2
-rw-r--r--agent/tcf/services/registers.c18
-rw-r--r--agent/tcf/services/registers.h6
-rw-r--r--agent/tcf/services/runctrl.c36
-rw-r--r--agent/tcf/services/runctrl.h8
-rw-r--r--agent/tcf/services/stacktrace.c22
-rw-r--r--agent/tcf/services/stacktrace.h4
-rw-r--r--agent/tcf/services/streamsservice.c18
-rw-r--r--agent/tcf/services/streamsservice.h2
-rw-r--r--agent/tcf/services/symbols.c16
-rw-r--r--agent/tcf/services/symbols.h4
-rw-r--r--agent/tcf/services/symbols_elf.c28
-rw-r--r--agent/tcf/services/symbols_proxy.c22
-rw-r--r--agent/tcf/services/symbols_win32.c24
-rw-r--r--agent/tcf/services/sysmon.c16
-rw-r--r--agent/tcf/services/sysmon.h2
-rw-r--r--agent/tcf/services/tcf_elf.c18
-rw-r--r--agent/tcf/services/tcf_elf.h4
-rw-r--r--agent/tcf/services/terminals.c26
-rw-r--r--agent/tcf/services/terminals.h4
-rw-r--r--agent/tcf/services/vm.c14
-rw-r--r--agent/tcf/services/vm.h4
-rw-r--r--agent/tcf/system/Darwin/context-darwin.c22
-rw-r--r--agent/tcf/system/FreeBSD/context-freebsd.c22
-rw-r--r--agent/tcf/system/FreeBSD/regset.h2
-rw-r--r--agent/tcf/system/GNU/Linux/context-linux.c30
-rw-r--r--agent/tcf/system/VxWorks/context-vxworks.c24
-rw-r--r--agent/tcf/system/VxWorks/context-vxworks.h4
-rw-r--r--agent/tcf/system/Windows/context-win32.c30
-rw-r--r--agent/tcf/system/Windows/context-win32.h4
-rw-r--r--agent/tcf/system/Windows/pthreads-win32.c8
-rw-r--r--agent/tcf/system/Windows/windbgcache.c12
-rw-r--r--agent/tcf/system/Windows/windbgcache.h2
127 files changed, 771 insertions, 771 deletions
diff --git a/agent/tcf/config.h b/agent/tcf/config.h
index f4b4a8c0..c8da0eaa 100644
--- a/agent/tcf/config.h
+++ b/agent/tcf/config.h
@@ -21,7 +21,7 @@
#ifndef D_config
#define D_config
-#include <framework/mdep.h>
+#include <tcf/framework/mdep.h>
#if defined(WIN32)
# define TARGET_WINDOWS 1
diff --git a/agent/tcf/framework/asyncreq.c b/agent/tcf/framework/asyncreq.c
index 45283d9d..b5718e72 100644
--- a/agent/tcf/framework/asyncreq.c
+++ b/agent/tcf/framework/asyncreq.c
@@ -18,7 +18,7 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#include <assert.h>
#include <stddef.h>
#if defined(WIN32)
@@ -26,14 +26,14 @@
#else
# include <sys/wait.h>
#endif
-#include <framework/mdep-threads.h>
-#include <framework/mdep-inet.h>
-#include <framework/myalloc.h>
-#include <framework/trace.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/link.h>
-#include <framework/asyncreq.h>
+#include <tcf/framework/mdep-threads.h>
+#include <tcf/framework/mdep-inet.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/link.h>
+#include <tcf/framework/asyncreq.h>
#define MAX_WORKER_THREADS 32
diff --git a/agent/tcf/framework/asyncreq.h b/agent/tcf/framework/asyncreq.h
index 70706dd4..888baf9c 100644
--- a/agent/tcf/framework/asyncreq.h
+++ b/agent/tcf/framework/asyncreq.h
@@ -27,8 +27,8 @@
# include <select.h>
#endif
#include <time.h>
-#include <framework/link.h>
-#include <framework/events.h>
+#include <tcf/framework/link.h>
+#include <tcf/framework/events.h>
enum {
AsyncReqRead, /* File read */
diff --git a/agent/tcf/framework/base64.c b/agent/tcf/framework/base64.c
index 11fb9fb1..96359caa 100644
--- a/agent/tcf/framework/base64.c
+++ b/agent/tcf/framework/base64.c
@@ -20,11 +20,11 @@
* Also TCF version of the encoding does not allow characters outside of the BASE64 alphabet.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <assert.h>
-#include <framework/base64.h>
-#include <framework/exceptions.h>
-#include <framework/errors.h>
+#include <tcf/framework/base64.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/errors.h>
static const char int2char[] = {
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
diff --git a/agent/tcf/framework/base64.h b/agent/tcf/framework/base64.h
index c6c6e951..4eed26dd 100644
--- a/agent/tcf/framework/base64.h
+++ b/agent/tcf/framework/base64.h
@@ -23,7 +23,7 @@
#ifndef D_base64
#define D_base64
-#include <framework/streams.h>
+#include <tcf/framework/streams.h>
/*
* Write BASE64 encoded array of bytes to output stream.
diff --git a/agent/tcf/framework/cache.c b/agent/tcf/framework/cache.c
index c2b7ebe0..44a9e085 100644
--- a/agent/tcf/framework/cache.c
+++ b/agent/tcf/framework/cache.c
@@ -17,15 +17,15 @@
* Abstract asynchronous data cache support.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <assert.h>
#include <string.h>
-#include <framework/errors.h>
-#include <framework/exceptions.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/cache.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/cache.h>
typedef struct WaitingCacheClient {
CacheClient * client;
diff --git a/agent/tcf/framework/cache.h b/agent/tcf/framework/cache.h
index 5d1e58fe..60248fdc 100644
--- a/agent/tcf/framework/cache.h
+++ b/agent/tcf/framework/cache.h
@@ -99,7 +99,7 @@
#ifndef D_cache
#define D_cache
-#include <framework/channel.h>
+#include <tcf/framework/channel.h>
typedef void CacheClient(void *);
diff --git a/agent/tcf/framework/channel.c b/agent/tcf/framework/channel.c
index 669083c9..e1bea2d5 100644
--- a/agent/tcf/framework/channel.c
+++ b/agent/tcf/framework/channel.c
@@ -25,23 +25,23 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
#include <ctype.h>
#include <string.h>
-#include <framework/tcf.h>
-#include <framework/channel.h>
-#include <framework/channel_tcp.h>
-#include <framework/channel_pipe.h>
-#include <framework/protocol.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <framework/trace.h>
-#include <framework/link.h>
-#include <framework/json.h>
+#include <tcf/framework/tcf.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/channel_tcp.h>
+#include <tcf/framework/channel_pipe.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/link.h>
+#include <tcf/framework/json.h>
#define BCAST_MAGIC 0x1463e328
diff --git a/agent/tcf/framework/channel.h b/agent/tcf/framework/channel.h
index bcb23948..a7d57969 100644
--- a/agent/tcf/framework/channel.h
+++ b/agent/tcf/framework/channel.h
@@ -20,9 +20,9 @@
#ifndef D_channel
#define D_channel
-#include <framework/streams.h>
-#include <framework/link.h>
-#include <framework/peer.h>
+#include <tcf/framework/streams.h>
+#include <tcf/framework/link.h>
+#include <tcf/framework/peer.h>
struct Protocol;
typedef struct TCFBroadcastGroup TCFBroadcastGroup;
diff --git a/agent/tcf/framework/channel_pipe.c b/agent/tcf/framework/channel_pipe.c
index 1a74d9e1..2c8aa21c 100644
--- a/agent/tcf/framework/channel_pipe.c
+++ b/agent/tcf/framework/channel_pipe.c
@@ -17,26 +17,26 @@
* Implements input and output stream over named pipe transport.
*/
-#include <config.h>
+#include <tcf/config.h>
#if defined(WIN32)
#include <fcntl.h>
#include <errno.h>
#include <assert.h>
-#include <framework/channel.h>
-#include <framework/channel_pipe.h>
-#include <framework/myalloc.h>
-#include <framework/protocol.h>
-#include <framework/errors.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <framework/trace.h>
-#include <framework/json.h>
-#include <framework/peer.h>
-#include <framework/asyncreq.h>
-#include <framework/inputbuf.h>
-#include <framework/outputbuf.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/channel_pipe.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/peer.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/inputbuf.h>
+#include <tcf/framework/outputbuf.h>
#define BUF_SIZE (128 * MEM_USAGE_FACTOR)
#define CHANNEL_MAGIC 0x52376532
@@ -757,8 +757,8 @@ ChannelServer * channel_pipe_server(PeerServer * ps) {
#else
/* Pipes are not supported */
-#include <framework/errors.h>
-#include <framework/channel_pipe.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/channel_pipe.h>
void channel_pipe_connect(PeerServer * server, ChannelConnectCallBack callback, void * callback_args) {
callback(callback_args, ERR_UNSUPPORTED, NULL);
diff --git a/agent/tcf/framework/channel_pipe.h b/agent/tcf/framework/channel_pipe.h
index 27ed7275..f4c1937f 100644
--- a/agent/tcf/framework/channel_pipe.h
+++ b/agent/tcf/framework/channel_pipe.h
@@ -20,7 +20,7 @@
#ifndef D_channel_pipe
#define D_channel_pipe
-#include <framework/channel.h>
+#include <tcf/framework/channel.h>
/*
* Start named pipe channel listener.
diff --git a/agent/tcf/framework/channel_tcp.c b/agent/tcf/framework/channel_tcp.c
index 2d69de66..8bf05cda 100644
--- a/agent/tcf/framework/channel_tcp.c
+++ b/agent/tcf/framework/channel_tcp.c
@@ -23,7 +23,7 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#include <fcntl.h>
#include <stddef.h>
#include <errno.h>
@@ -47,23 +47,23 @@
#else
typedef void SSL;
#endif
-#include <framework/mdep-inet.h>
-#include <framework/tcf.h>
-#include <framework/channel.h>
-#include <framework/channel_tcp.h>
-#include <framework/myalloc.h>
-#include <framework/protocol.h>
-#include <framework/errors.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <framework/trace.h>
-#include <framework/json.h>
-#include <framework/peer.h>
-#include <framework/ip_ifc.h>
-#include <framework/asyncreq.h>
-#include <framework/inputbuf.h>
-#include <framework/outputbuf.h>
-#include <services/discovery.h>
+#include <tcf/framework/mdep-inet.h>
+#include <tcf/framework/tcf.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/channel_tcp.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/peer.h>
+#include <tcf/framework/ip_ifc.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/inputbuf.h>
+#include <tcf/framework/outputbuf.h>
+#include <tcf/services/discovery.h>
#ifndef MSG_MORE
#define MSG_MORE 0
diff --git a/agent/tcf/framework/channel_tcp.h b/agent/tcf/framework/channel_tcp.h
index 4f31f734..9a8402de 100644
--- a/agent/tcf/framework/channel_tcp.h
+++ b/agent/tcf/framework/channel_tcp.h
@@ -20,7 +20,7 @@
#ifndef D_channel_tcp
#define D_channel_tcp
-#include <framework/channel.h>
+#include <tcf/framework/channel.h>
/*
* Start TCP (Internet) channel listener.
diff --git a/agent/tcf/framework/context.c b/agent/tcf/framework/context.c
index 97221667..285d7683 100644
--- a/agent/tcf/framework/context.c
+++ b/agent/tcf/framework/context.c
@@ -17,11 +17,11 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <assert.h>
-#include <framework/context.h>
-#include <framework/myalloc.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/myalloc.h>
typedef struct Listener {
ContextEventListener * func;
diff --git a/agent/tcf/framework/context.h b/agent/tcf/framework/context.h
index ef7341a3..20c07ce9 100644
--- a/agent/tcf/framework/context.h
+++ b/agent/tcf/framework/context.h
@@ -20,10 +20,10 @@
#ifndef D_context
#define D_context
-#include <config.h>
-#include <framework/cpudefs.h>
-#include <framework/errors.h>
-#include <framework/link.h>
+#include <tcf/config.h>
+#include <tcf/framework/cpudefs.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/link.h>
extern LINK context_root;
diff --git a/agent/tcf/framework/cpudefs.c b/agent/tcf/framework/cpudefs.c
index fbdfa28a..5d9c5f5d 100644
--- a/agent/tcf/framework/cpudefs.c
+++ b/agent/tcf/framework/cpudefs.c
@@ -17,20 +17,20 @@
* This module contains definitions of target CPU registers and stack frames.
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_DebugContext
#include <stddef.h>
#include <stdio.h>
#include <assert.h>
-#include <framework/cpudefs.h>
-#include <framework/errors.h>
-#include <framework/context.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <services/symbols.h>
-#include <machine/cpudefs-ext.h>
+#include <tcf/framework/cpudefs.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/symbols.h>
+#include <tcf/machine/cpudefs-ext.h>
int read_reg_value(StackFrame * frame, RegisterDefinition * reg_def, uint64_t * value) {
uint8_t buf[8];
diff --git a/agent/tcf/framework/cpudefs.h b/agent/tcf/framework/cpudefs.h
index 17a9a89f..af02f71b 100644
--- a/agent/tcf/framework/cpudefs.h
+++ b/agent/tcf/framework/cpudefs.h
@@ -20,7 +20,7 @@
#ifndef D_cpudefs
#define D_cpudefs
-#include <config.h>
+#include <tcf/config.h>
typedef struct Context Context;
diff --git a/agent/tcf/framework/errors.c b/agent/tcf/framework/errors.c
index c9bc2887..b802785d 100644
--- a/agent/tcf/framework/errors.c
+++ b/agent/tcf/framework/errors.c
@@ -17,21 +17,21 @@
* This module defines agent error codes in addition to system codes defined in errno.h
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <assert.h>
#include <time.h>
-#include <framework/mdep-inet.h>
-#include <framework/errors.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <framework/streams.h>
-#include <framework/myalloc.h>
-#include <framework/json.h>
-#include <framework/trace.h>
+#include <tcf/framework/mdep-inet.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/streams.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/trace.h>
#define ERR_MESSAGE_MIN (STD_ERR_BASE + 100)
#if MEM_USAGE_FACTOR <= 2
diff --git a/agent/tcf/framework/events.c b/agent/tcf/framework/events.c
index 6de012de..b9190cca 100644
--- a/agent/tcf/framework/events.c
+++ b/agent/tcf/framework/events.c
@@ -26,15 +26,15 @@
* while allows for high level of concurrency.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <time.h>
#include <assert.h>
#include <string.h>
-#include <framework/mdep-threads.h>
-#include <framework/myalloc.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/events.h>
+#include <tcf/framework/mdep-threads.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/events.h>
typedef struct event_node event_node;
diff --git a/agent/tcf/framework/exceptions.c b/agent/tcf/framework/exceptions.c
index 2ed2991b..5a9bb0a9 100644
--- a/agent/tcf/framework/exceptions.c
+++ b/agent/tcf/framework/exceptions.c
@@ -31,15 +31,15 @@
* Only main thread is allowed to use exceptions.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <assert.h>
-#include <framework/exceptions.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/trace.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
static Trap * chain = NULL;
diff --git a/agent/tcf/framework/exceptions.h b/agent/tcf/framework/exceptions.h
index 4a4b53dd..f56822cb 100644
--- a/agent/tcf/framework/exceptions.h
+++ b/agent/tcf/framework/exceptions.h
@@ -35,7 +35,7 @@
#define D_exceptions
#include <setjmp.h>
-#include <framework/errors.h>
+#include <tcf/framework/errors.h>
typedef struct Trap Trap;
diff --git a/agent/tcf/framework/inputbuf.c b/agent/tcf/framework/inputbuf.c
index bf05c1d9..c74e1762 100644
--- a/agent/tcf/framework/inputbuf.c
+++ b/agent/tcf/framework/inputbuf.c
@@ -18,14 +18,14 @@
* Implements input buffer used by unbuffered channel transports.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
-#include <framework/exceptions.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/inputbuf.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/inputbuf.h>
static void ibuf_new_message(InputBuf * ibuf) {
ibuf->message_count++;
diff --git a/agent/tcf/framework/inputbuf.h b/agent/tcf/framework/inputbuf.h
index 16c37880..93bb55fa 100644
--- a/agent/tcf/framework/inputbuf.h
+++ b/agent/tcf/framework/inputbuf.h
@@ -21,8 +21,8 @@
#ifndef D_input_buf
#define D_input_buf
-#include <config.h>
-#include <framework/streams.h>
+#include <tcf/config.h>
+#include <tcf/framework/streams.h>
typedef struct InputBuf InputBuf;
diff --git a/agent/tcf/framework/ip_ifc.c b/agent/tcf/framework/ip_ifc.c
index 31e6ec18..9f984fda 100644
--- a/agent/tcf/framework/ip_ifc.c
+++ b/agent/tcf/framework/ip_ifc.c
@@ -17,17 +17,17 @@
* Implements IP interface list.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
#include <string.h>
-#include <framework/mdep-inet.h>
-#include <framework/ip_ifc.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
+#include <tcf/framework/mdep-inet.h>
+#include <tcf/framework/ip_ifc.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
#define MAX(x,y) ((x) > (y) ? (x) : (y))
diff --git a/agent/tcf/framework/json.c b/agent/tcf/framework/json.c
index 73e9f111..6c024c58 100644
--- a/agent/tcf/framework/json.c
+++ b/agent/tcf/framework/json.c
@@ -27,7 +27,7 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#ifdef ENABLE_STREAM_MACROS
#undef ENABLE_STREAM_MACROS
#endif
@@ -36,10 +36,10 @@
#include <stdio.h>
#include <assert.h>
#include <string.h>
-#include <framework/json.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/base64.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/base64.h>
#define ENCODING_BINARY 0
#define ENCODING_BASE64 1
diff --git a/agent/tcf/framework/json.h b/agent/tcf/framework/json.h
index 5a414c15..1082ce61 100644
--- a/agent/tcf/framework/json.h
+++ b/agent/tcf/framework/json.h
@@ -25,9 +25,9 @@
#ifndef D_json
#define D_json
-#include <config.h>
+#include <tcf/config.h>
#include <stdlib.h>
-#include <framework/streams.h>
+#include <tcf/framework/streams.h>
extern int json_read_string(InputStream * inp, char * str, size_t size);
extern int json_read_boolean(InputStream * inp);
diff --git a/agent/tcf/framework/mdep-threads.h b/agent/tcf/framework/mdep-threads.h
index ed6db5a5..1fe0a388 100644
--- a/agent/tcf/framework/mdep-threads.h
+++ b/agent/tcf/framework/mdep-threads.h
@@ -26,7 +26,7 @@
#ifdef DISABLE_PTHREADS_WIN32
# include <pthread.h>
#else
-# include <system/Windows/pthreads-win32.h>
+# include <tcf/system/Windows/pthreads-win32.h>
#endif
#elif defined(_WRS_KERNEL)
diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c
index a284c7b5..e657c7c9 100644
--- a/agent/tcf/framework/mdep.c
+++ b/agent/tcf/framework/mdep.c
@@ -20,17 +20,17 @@
* agent code portable between Linux, Windows, VxWorks and potentially other OSes.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
#include <signal.h>
#include <fcntl.h>
-#include <framework/mdep-threads.h>
-#include <framework/mdep-inet.h>
-#include <framework/errors.h>
-#include <framework/myalloc.h>
+#include <tcf/framework/mdep-threads.h>
+#include <tcf/framework/mdep-inet.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/myalloc.h>
pthread_attr_t pthread_create_attr;
int utf8_locale = 0;
@@ -720,7 +720,7 @@ int loc_clock_gettime(int clock_id, struct timespec * now) {
* Some of the dynamic IP interface scanning routines are unreliable, so
* include a workaround to manually set the desired interface from outside.
*/
-#include <framework/ip_ifc.h>
+#include <tcf/framework/ip_ifc.h>
static ip_ifc_info* gSelectedIPInterface;
diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h
index 401b105b..b37de2a1 100644
--- a/agent/tcf/framework/mdep.h
+++ b/agent/tcf/framework/mdep.h
@@ -281,7 +281,7 @@ extern int getegid(void);
#include <e32def.h>
#include <unistd.h>
-#include <framework/link.h>
+#include <tcf/framework/link.h>
#define MAX_PATH _POSIX_PATH_MAX
#define FILE_PATH_SIZE _POSIX_PATH_MAX
diff --git a/agent/tcf/framework/myalloc.c b/agent/tcf/framework/myalloc.c
index 5f0f0dba..d8733a33 100644
--- a/agent/tcf/framework/myalloc.c
+++ b/agent/tcf/framework/myalloc.c
@@ -17,10 +17,10 @@
* Local memory heap manager.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <string.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
void * loc_alloc(size_t size) {
void * p;
diff --git a/agent/tcf/framework/outputbuf.c b/agent/tcf/framework/outputbuf.c
index 4d2f53a9..6764cf7b 100644
--- a/agent/tcf/framework/outputbuf.c
+++ b/agent/tcf/framework/outputbuf.c
@@ -17,13 +17,13 @@
* Utility module that implements an abstarct output queue.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <assert.h>
#include <string.h>
-#include <framework/outputbuf.h>
-#include <framework/myalloc.h>
-#include <framework/trace.h>
-#include <framework/errors.h>
+#include <tcf/framework/outputbuf.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/errors.h>
#define link2buf(A) ((OutputBuffer *)((char *)(A) - offsetof(OutputBuffer, link)))
diff --git a/agent/tcf/framework/outputbuf.h b/agent/tcf/framework/outputbuf.h
index 45f2bbf9..1b1576b6 100644
--- a/agent/tcf/framework/outputbuf.h
+++ b/agent/tcf/framework/outputbuf.h
@@ -20,8 +20,8 @@
#ifndef D_outputbuf
#define D_outputbuf
-#include <config.h>
-#include <framework/link.h>
+#include <tcf/config.h>
+#include <tcf/framework/link.h>
typedef struct OutputQueue OutputQueue;
typedef struct OutputBuffer OutputBuffer;
diff --git a/agent/tcf/framework/peer.c b/agent/tcf/framework/peer.c
index f3ca90eb..e69e3766 100644
--- a/agent/tcf/framework/peer.c
+++ b/agent/tcf/framework/peer.c
@@ -17,17 +17,17 @@
* Implements peer server management.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
#include <string.h>
-#include <framework/tcf.h>
-#include <framework/peer.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
+#include <tcf/framework/tcf.h>
+#include <tcf/framework/peer.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
typedef struct PeersListener {
peer_server_listener fnp;
diff --git a/agent/tcf/framework/plugins.c b/agent/tcf/framework/plugins.c
index 2a1289ae..c820d6a1 100644
--- a/agent/tcf/framework/plugins.c
+++ b/agent/tcf/framework/plugins.c
@@ -25,7 +25,7 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_Plugins
@@ -36,9 +36,9 @@
#include <dlfcn.h>
#include <errno.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/plugins.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/plugins.h>
#define _QUOTEME(x) #x
#define QUOTE(x) _QUOTEME(x)
diff --git a/agent/tcf/framework/plugins.h b/agent/tcf/framework/plugins.h
index 00d964e8..e22ffc1b 100644
--- a/agent/tcf/framework/plugins.h
+++ b/agent/tcf/framework/plugins.h
@@ -24,7 +24,7 @@
#ifndef D_plugins
#define D_plugins
-#include <framework/protocol.h>
+#include <tcf/framework/protocol.h>
extern const char *plugins_path;
diff --git a/agent/tcf/framework/protocol.c b/agent/tcf/framework/protocol.c
index ee25c00d..c30c2242 100644
--- a/agent/tcf/framework/protocol.c
+++ b/agent/tcf/framework/protocol.c
@@ -21,18 +21,18 @@
* protocol is used and what services do.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdlib.h>
#include <string.h>
#include <assert.h>
#include <assert.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
-#include <framework/events.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <framework/json.h>
-#include <framework/myalloc.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/myalloc.h>
static const char * LOCATOR = "Locator";
diff --git a/agent/tcf/framework/protocol.h b/agent/tcf/framework/protocol.h
index 098e6525..c7d886fd 100644
--- a/agent/tcf/framework/protocol.h
+++ b/agent/tcf/framework/protocol.h
@@ -24,7 +24,7 @@
#ifndef D_protocol
#define D_protocol
-#include <framework/channel.h>
+#include <tcf/framework/channel.h>
/* Time in seconds to keep remote peer data */
#define PEER_DATA_RETENTION_PERIOD 60
diff --git a/agent/tcf/framework/proxy.c b/agent/tcf/framework/proxy.c
index d87502da..ec296385 100644
--- a/agent/tcf/framework/proxy.c
+++ b/agent/tcf/framework/proxy.c
@@ -18,15 +18,15 @@
* This service intended to be used when a client has no direct access to a target.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <assert.h>
#include <string.h>
-#include <framework/proxy.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
-#include <framework/errors.h>
-#include <framework/exceptions.h>
-#include <framework/myalloc.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/myalloc.h>
typedef struct Proxy {
Channel * c;
diff --git a/agent/tcf/framework/proxy.h b/agent/tcf/framework/proxy.h
index e52da3e5..e584de94 100644
--- a/agent/tcf/framework/proxy.h
+++ b/agent/tcf/framework/proxy.h
@@ -21,7 +21,7 @@
#ifndef D_proxy
#define D_proxy
-#include <framework/channel.h>
+#include <tcf/framework/channel.h>
/*
* Register channel redirection callback.
diff --git a/agent/tcf/framework/signames.c b/agent/tcf/framework/signames.c
index c1e7392f..8cab1c8e 100644
--- a/agent/tcf/framework/signames.c
+++ b/agent/tcf/framework/signames.c
@@ -17,10 +17,10 @@
* This module provides POSIX signal names and descriptions.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <signal.h>
-#include <framework/signames.h>
+#include <tcf/framework/signames.h>
#if defined(WIN32)
diff --git a/agent/tcf/framework/streams.c b/agent/tcf/framework/streams.c
index fda2ddd8..1bfe1d41 100644
--- a/agent/tcf/framework/streams.c
+++ b/agent/tcf/framework/streams.c
@@ -17,11 +17,11 @@
* Abstract byte stream. Bytes in the stream can be divided into groups - messages.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stddef.h>
#include <string.h>
-#include <framework/myalloc.h>
-#include <framework/streams.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/streams.h>
int (read_stream)(InputStream * inp) {
return (inp->cur < inp->end) ? *inp->cur++ : inp->read(inp);
diff --git a/agent/tcf/framework/streams.h b/agent/tcf/framework/streams.h
index fb4a787b..f8a63b3a 100644
--- a/agent/tcf/framework/streams.h
+++ b/agent/tcf/framework/streams.h
@@ -22,7 +22,7 @@
#ifndef D_streams
#define D_streams
-#include <config.h>
+#include <tcf/config.h>
/*
* MARKER_EOM - end of message
diff --git a/agent/tcf/framework/trace.c b/agent/tcf/framework/trace.c
index 33bc6e7b..636f6076 100644
--- a/agent/tcf/framework/trace.c
+++ b/agent/tcf/framework/trace.c
@@ -13,8 +13,8 @@
* Wind River Systems - initial API and implementation
*******************************************************************************/
-#include <config.h>
-#include <framework/trace.h>
+#include <tcf/config.h>
+#include <tcf/framework/trace.h>
int log_mode = LOG_EVENTS | LOG_CHILD | LOG_WAITPID | LOG_CONTEXT | LOG_PROTOCOL;
@@ -25,7 +25,7 @@ int log_mode = LOG_EVENTS | LOG_CHILD | LOG_WAITPID | LOG_CONTEXT | LOG_PROTOCOL
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <framework/mdep-threads.h>
+#include <tcf/framework/mdep-threads.h>
#if defined(WIN32)
#elif defined(_WRS_KERNEL)
diff --git a/agent/tcf/framework/trace.h b/agent/tcf/framework/trace.h
index c3599d68..7a368bc3 100644
--- a/agent/tcf/framework/trace.h
+++ b/agent/tcf/framework/trace.h
@@ -20,7 +20,7 @@
#ifndef D_trace
#define D_trace
-#include <config.h>
+#include <tcf/config.h>
#include <stdio.h>
#define LOG_ALWAYS 0x0
diff --git a/agent/tcf/framework/waitpid.c b/agent/tcf/framework/waitpid.c
index 1d0f9304..e8e07e40 100644
--- a/agent/tcf/framework/waitpid.c
+++ b/agent/tcf/framework/waitpid.c
@@ -17,18 +17,18 @@
* This module provides notifications of process/thread exited or stopped.
*/
-#include <config.h>
+#include <tcf/config.h>
#if (ENABLE_DebugContext && !ENABLE_ContextProxy) || SERVICE_Processes || SERVICE_Terminals
#include <assert.h>
#include <errno.h>
-#include <framework/errors.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/asyncreq.h>
-#include <framework/waitpid.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/waitpid.h>
typedef struct WaitPIDListenerInfo {
WaitPIDListener * listener;
diff --git a/agent/tcf/framework/waitpid.h b/agent/tcf/framework/waitpid.h
index 6bb2ff4e..ff59ad9e 100644
--- a/agent/tcf/framework/waitpid.h
+++ b/agent/tcf/framework/waitpid.h
@@ -20,7 +20,7 @@
#ifndef D_waitpid
#define D_waitpid
-#include <config.h>
+#include <tcf/config.h>
#if (ENABLE_DebugContext && !ENABLE_ContextProxy) || SERVICE_Processes || SERVICE_Terminals
diff --git a/agent/tcf/machine/elf-mdep.h b/agent/tcf/machine/elf-mdep.h
index 775de5b3..3f7d9f51 100644
--- a/agent/tcf/machine/elf-mdep.h
+++ b/agent/tcf/machine/elf-mdep.h
@@ -15,7 +15,7 @@
#define elf_relocate elf_relocate_i386
-#include <machine/i386/elf-mdep.h>
+#include <tcf/machine/i386/elf-mdep.h>
#undef elf_relocate
static ElfRelocateFunc elf_relocate_funcs[] = {
diff --git a/agent/tcf/machine/x86_64/cpudefs-mdep.h b/agent/tcf/machine/x86_64/cpudefs-mdep.h
index a2e4c06e..caee888b 100644
--- a/agent/tcf/machine/x86_64/cpudefs-mdep.h
+++ b/agent/tcf/machine/x86_64/cpudefs-mdep.h
@@ -23,7 +23,7 @@
# define eip pc
# undef BREAK_INST
# endif
-# include <system/VxWorks/context-vxworks.h>
+# include <tcf/system/VxWorks/context-vxworks.h>
#endif
#if defined(__i386__) || defined(__x86_64__)
diff --git a/agent/tcf/main/cmdline.c b/agent/tcf/main/cmdline.c
index b63045ec..78922ee9 100644
--- a/agent/tcf/main/cmdline.c
+++ b/agent/tcf/main/cmdline.c
@@ -18,7 +18,7 @@
* Command line interpreter.
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_Cmdline
@@ -27,16 +27,16 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include <framework/mdep-threads.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/myalloc.h>
-#include <framework/peer.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
-#include <framework/channel.h>
-#include <framework/plugins.h>
-#include <main/cmdline.h>
+#include <tcf/framework/mdep-threads.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/peer.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/plugins.h>
+#include <tcf/main/cmdline.h>
struct CmdDesc {
char * cmd;
diff --git a/agent/tcf/main/cmdline.h b/agent/tcf/main/cmdline.h
index f4e9bdcd..53cf0bb1 100644
--- a/agent/tcf/main/cmdline.h
+++ b/agent/tcf/main/cmdline.h
@@ -22,7 +22,7 @@
#if ENABLE_Cmdline
-#include <framework/protocol.h>
+#include <tcf/framework/protocol.h>
extern void cmdline_suspend(void);
extern void cmdline_resume(void);
diff --git a/agent/tcf/main/main.c b/agent/tcf/main/main.c
index 3327ece4..dbf9d625 100644
--- a/agent/tcf/main/main.c
+++ b/agent/tcf/main/main.c
@@ -17,24 +17,24 @@
* Agent main module.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
#include <signal.h>
-#include <framework/asyncreq.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/channel_tcp.h>
-#include <framework/plugins.h>
-#include <services/discovery.h>
-#include <main/test.h>
-#include <main/cmdline.h>
-#include <main/services.h>
-#include <main/server.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/channel_tcp.h>
+#include <tcf/framework/plugins.h>
+#include <tcf/services/discovery.h>
+#include <tcf/main/test.h>
+#include <tcf/main/cmdline.h>
+#include <tcf/main/services.h>
+#include <tcf/main/server.h>
static const char * progname;
diff --git a/agent/tcf/main/main_client.c b/agent/tcf/main/main_client.c
index 6668779e..19683db0 100644
--- a/agent/tcf/main/main_client.c
+++ b/agent/tcf/main/main_client.c
@@ -17,21 +17,21 @@
* Agent main module.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include <framework/asyncreq.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/channel.h>
-#include <framework/protocol.h>
-#include <framework/proxy.h>
-#include <framework/plugins.h>
-#include <services/discovery.h>
-#include <main/cmdline.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/framework/plugins.h>
+#include <tcf/services/discovery.h>
+#include <tcf/main/cmdline.h>
static const char * progname;
static Protocol * proto;
diff --git a/agent/tcf/main/main_log.c b/agent/tcf/main/main_log.c
index 99959e39..bae860fe 100644
--- a/agent/tcf/main/main_log.c
+++ b/agent/tcf/main/main_log.c
@@ -22,21 +22,21 @@
* It can be used as diagnostic and debugging tool.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include <framework/asyncreq.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/channel.h>
-#include <framework/protocol.h>
-#include <framework/proxy.h>
-#include <framework/errors.h>
-#include <services/discovery.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/framework/errors.h>
+#include <tcf/services/discovery.h>
static const char * progname;
static const char * dest_url = "TCP::1534";
diff --git a/agent/tcf/main/main_lua.c b/agent/tcf/main/main_lua.c
index 758232dc..87050493 100644
--- a/agent/tcf/main/main_lua.c
+++ b/agent/tcf/main/main_lua.c
@@ -17,7 +17,7 @@
* Agent main module.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdio.h>
#include <stdlib.h>
@@ -38,15 +38,15 @@ extern "C" {
}
#endif
-#include <framework/asyncreq.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/channel.h>
-#include <framework/protocol.h>
-#include <framework/proxy.h>
-#include <framework/myalloc.h>
-#include <framework/errors.h>
-#include <services/discovery.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/errors.h>
+#include <tcf/services/discovery.h>
static const char * progname;
static lua_State *luastate;
diff --git a/agent/tcf/main/main_reg.c b/agent/tcf/main/main_reg.c
index 78672977..9dedbd52 100644
--- a/agent/tcf/main/main_reg.c
+++ b/agent/tcf/main/main_reg.c
@@ -19,19 +19,19 @@
* All it does is running TCF UDP auto-discovery protocol.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include <framework/asyncreq.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/channel.h>
-#include <framework/protocol.h>
-#include <framework/proxy.h>
-#include <services/discovery.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/services/discovery.h>
static const char * progname;
diff --git a/agent/tcf/main/main_va.c b/agent/tcf/main/main_va.c
index 84387234..19f3cfa4 100644
--- a/agent/tcf/main/main_va.c
+++ b/agent/tcf/main/main_va.c
@@ -22,23 +22,23 @@
* The code is intended to be an example of service proxing implementation.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
-#include <framework/asyncreq.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/json.h>
-#include <framework/channel.h>
-#include <framework/protocol.h>
-#include <framework/proxy.h>
-#include <framework/errors.h>
-#include <framework/plugins.h>
-#include <services/discovery.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/plugins.h>
+#include <tcf/services/discovery.h>
static const char * progname;
static Protocol * proto;
diff --git a/agent/tcf/main/server.c b/agent/tcf/main/server.c
index 6810a419..d6765d10 100644
--- a/agent/tcf/main/server.c
+++ b/agent/tcf/main/server.c
@@ -17,11 +17,11 @@
* Server initialization code.
*/
-#include <config.h>
+#include <tcf/config.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <main/server.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/main/server.h>
static Protocol * proto;
static TCFBroadcastGroup * bcg;
diff --git a/agent/tcf/main/server.h b/agent/tcf/main/server.h
index 827b3936..0476c212 100644
--- a/agent/tcf/main/server.h
+++ b/agent/tcf/main/server.h
@@ -20,8 +20,8 @@
#ifndef D_server
#define D_server
-#include <config.h>
-#include <framework/protocol.h>
+#include <tcf/config.h>
+#include <tcf/framework/protocol.h>
/*
* Create and start TCF server listening on the port that is described by 'url'.
diff --git a/agent/tcf/main/services.c b/agent/tcf/main/services.c
index 09273bca..11e9e64d 100644
--- a/agent/tcf/main/services.c
+++ b/agent/tcf/main/services.c
@@ -17,31 +17,31 @@
* Services initialization code.
*/
-#include <config.h>
+#include <tcf/config.h>
-#include <framework/proxy.h>
-#include <framework/plugins.h>
-#include <services/discovery.h>
-#include <services/runctrl.h>
-#include <services/breakpoints.h>
-#include <services/memoryservice.h>
-#include <services/memorymap.h>
-#include <services/registers.h>
-#include <services/stacktrace.h>
-#include <services/symbols.h>
-#include <services/linenumbers.h>
-#include <services/processes.h>
-#include <services/filesystem.h>
-#include <services/sysmon.h>
-#include <services/diagnostics.h>
-#include <services/expressions.h>
-#include <services/streamsservice.h>
-#include <services/pathmap.h>
-#include <services/tcf_elf.h>
-#include <services/terminals.h>
-#include <main/services.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/framework/plugins.h>
+#include <tcf/services/discovery.h>
+#include <tcf/services/runctrl.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/services/memoryservice.h>
+#include <tcf/services/memorymap.h>
+#include <tcf/services/registers.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/symbols.h>
+#include <tcf/services/linenumbers.h>
+#include <tcf/services/processes.h>
+#include <tcf/services/filesystem.h>
+#include <tcf/services/sysmon.h>
+#include <tcf/services/diagnostics.h>
+#include <tcf/services/expressions.h>
+#include <tcf/services/streamsservice.h>
+#include <tcf/services/pathmap.h>
+#include <tcf/services/tcf_elf.h>
+#include <tcf/services/terminals.h>
+#include <tcf/main/services.h>
-#include <main/services-ext.h>
+#include <tcf/main/services-ext.h>
void ini_services(Protocol * proto, TCFBroadcastGroup * bcg) {
#if SERVICE_Locator
diff --git a/agent/tcf/main/services.h b/agent/tcf/main/services.h
index 39cdf1d5..e7669853 100644
--- a/agent/tcf/main/services.h
+++ b/agent/tcf/main/services.h
@@ -20,8 +20,8 @@
#ifndef D_services
#define D_services
-#include <config.h>
-#include <framework/protocol.h>
+#include <tcf/config.h>
+#include <tcf/framework/protocol.h>
extern void ini_services(Protocol * proto, TCFBroadcastGroup * bcg);
diff --git a/agent/tcf/main/test.c b/agent/tcf/main/test.c
index fa5dc976..5c39244e 100644
--- a/agent/tcf/main/test.c
+++ b/agent/tcf/main/test.c
@@ -17,7 +17,7 @@
* Agent self-testing service.
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_RCBP_TEST
@@ -26,14 +26,14 @@
#include <errno.h>
#include <signal.h>
#include <assert.h>
-#include <framework/mdep-threads.h>
-#include <framework/myalloc.h>
-#include <framework/trace.h>
-#include <framework/errors.h>
-#include <services/diagnostics.h>
-#include <main/test.h>
+#include <tcf/framework/mdep-threads.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/errors.h>
+#include <tcf/services/diagnostics.h>
+#include <tcf/main/test.h>
#if defined(WIN32)
-# include <system/Windows/context-win32.h>
+# include <tcf/system/Windows/context-win32.h>
#endif
#ifdef __cplusplus
diff --git a/agent/tcf/main/test.h b/agent/tcf/main/test.h
index 871131cc..25af613a 100644
--- a/agent/tcf/main/test.h
+++ b/agent/tcf/main/test.h
@@ -20,12 +20,12 @@
#ifndef D_test
#define D_test
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_RCBP_TEST
-#include <framework/context.h>
-#include <services/symbols.h>
+#include <tcf/framework/context.h>
+#include <tcf/services/symbols.h>
extern void test_proc(void);
extern int run_test_process(ContextAttachCallBack * done, void * data);
@@ -33,7 +33,7 @@ extern int find_test_symbol(Context * ctx, char * name, void ** addr, int * sym_
#else /* ENABLE_RCBP_TEST */
-#include <framework/errors.h>
+#include <tcf/framework/errors.h>
#define find_test_symbol(ctx, name, addr, sym_class) (errno = ERR_SYM_NOT_FOUND, -1)
diff --git a/agent/tcf/services/breakpoints.c b/agent/tcf/services/breakpoints.c
index 28cde4fd..11ffce43 100644
--- a/agent/tcf/services/breakpoints.c
+++ b/agent/tcf/services/breakpoints.c
@@ -20,31 +20,31 @@
* when a program's execution should be interrupted.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Breakpoints
#include <stdlib.h>
#include <string.h>
#include <assert.h>
-#include <framework/channel.h>
-#include <framework/protocol.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/context.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/cache.h>
-#include <framework/json.h>
-#include <framework/link.h>
-#include <services/symbols.h>
-#include <services/runctrl.h>
-#include <services/breakpoints.h>
-#include <services/expressions.h>
-#include <services/linenumbers.h>
-#include <services/stacktrace.h>
-#include <services/memorymap.h>
-#include <services/pathmap.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/link.h>
+#include <tcf/services/symbols.h>
+#include <tcf/services/runctrl.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/services/expressions.h>
+#include <tcf/services/linenumbers.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/memorymap.h>
+#include <tcf/services/pathmap.h>
typedef struct BreakpointRef BreakpointRef;
typedef struct InstructionRef InstructionRef;
diff --git a/agent/tcf/services/breakpoints.h b/agent/tcf/services/breakpoints.h
index 4635d2dc..9fedc3c0 100644
--- a/agent/tcf/services/breakpoints.h
+++ b/agent/tcf/services/breakpoints.h
@@ -23,8 +23,8 @@
#ifndef D_breakpoints
#define D_breakpoints
-#include <framework/context.h>
-#include <framework/protocol.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/protocol.h>
typedef struct BreakpointInfo BreakpointInfo;
typedef struct BreakpointAttribute BreakpointAttribute;
diff --git a/agent/tcf/services/diagnostics.c b/agent/tcf/services/diagnostics.c
index 5ad3d41e..76d7816d 100644
--- a/agent/tcf/services/diagnostics.c
+++ b/agent/tcf/services/diagnostics.c
@@ -18,28 +18,28 @@
* This service is used for framework and agents testing.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <signal.h>
#include <assert.h>
#include <stdio.h>
#include <string.h>
-#include <framework/protocol.h>
-#include <framework/json.h>
-#include <framework/exceptions.h>
-#include <framework/context.h>
-#include <framework/myalloc.h>
-#include <framework/cache.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/cache.h>
#if ENABLE_Symbols
-# include <services/symbols.h>
+# include <tcf/services/symbols.h>
#endif
#if SERVICE_Streams
-# include <services/streamsservice.h>
+# include <tcf/services/streamsservice.h>
#endif
#if ENABLE_RCBP_TEST
-# include <main/test.h>
-# include <services/runctrl.h>
+# include <tcf/main/test.h>
+# include <tcf/services/runctrl.h>
#endif
-#include <services/diagnostics.h>
+#include <tcf/services/diagnostics.h>
static const char * DIAGNOSTICS = "Diagnostics";
diff --git a/agent/tcf/services/diagnostics.h b/agent/tcf/services/diagnostics.h
index 0624b74b..324fb995 100644
--- a/agent/tcf/services/diagnostics.h
+++ b/agent/tcf/services/diagnostics.h
@@ -21,8 +21,8 @@
#ifndef D_diagnostics
#define D_diagnostics
-#include <framework/protocol.h>
-#include <framework/context.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/context.h>
extern int is_test_process(Context * ctx);
diff --git a/agent/tcf/services/discovery.c b/agent/tcf/services/discovery.c
index 432eea6e..35dcd6ec 100644
--- a/agent/tcf/services/discovery.c
+++ b/agent/tcf/services/discovery.c
@@ -17,23 +17,23 @@
* Implements auto-discovery and Locator service.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <stddef.h>
#include <errno.h>
#include <assert.h>
#include <string.h>
-#include <framework/protocol.h>
-#include <framework/channel.h>
-#include <framework/proxy.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <framework/exceptions.h>
-#include <framework/json.h>
-#include <framework/peer.h>
-#include <services/discovery.h>
-#include <services/discovery_udp.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/proxy.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/peer.h>
+#include <tcf/services/discovery.h>
+#include <tcf/services/discovery_udp.h>
#if SERVICE_Locator
diff --git a/agent/tcf/services/discovery.h b/agent/tcf/services/discovery.h
index 9788d1dd..5a79e61d 100644
--- a/agent/tcf/services/discovery.h
+++ b/agent/tcf/services/discovery.h
@@ -20,10 +20,10 @@
#ifndef D_discovery
#define D_discovery
-#include <config.h>
-#include <framework/protocol.h>
-#include <framework/channel.h>
-#include <framework/link.h>
+#include <tcf/config.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/link.h>
#define DISCOVERY_TCF_PORT 1534
diff --git a/agent/tcf/services/discovery_udp.c b/agent/tcf/services/discovery_udp.c
index 8cc86eb9..df26dbc0 100644
--- a/agent/tcf/services/discovery_udp.c
+++ b/agent/tcf/services/discovery_udp.c
@@ -35,7 +35,7 @@
* and uses unicast packets to sent info to agents from the list.
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_Discovery
@@ -43,17 +43,17 @@
#include <errno.h>
#include <assert.h>
#include <string.h>
-#include <framework/mdep-inet.h>
-#include <framework/tcf.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/peer.h>
-#include <framework/ip_ifc.h>
-#include <framework/asyncreq.h>
-#include <services/discovery.h>
-#include <services/discovery_udp.h>
+#include <tcf/framework/mdep-inet.h>
+#include <tcf/framework/tcf.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/peer.h>
+#include <tcf/framework/ip_ifc.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/services/discovery.h>
+#include <tcf/services/discovery_udp.h>
#define MAX_IFC 10
#define MAX_RECV_ERRORS 8
diff --git a/agent/tcf/services/dwarfcache.c b/agent/tcf/services/dwarfcache.c
index 0da30798..836a7bbd 100644
--- a/agent/tcf/services/dwarfcache.c
+++ b/agent/tcf/services/dwarfcache.c
@@ -19,18 +19,18 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF && ENABLE_DebugContext
#include <assert.h>
-#include <framework/exceptions.h>
-#include <framework/myalloc.h>
-#include <services/dwarf.h>
-#include <services/dwarfio.h>
-#include <services/dwarfcache.h>
-#include <services/dwarfexpr.h>
-#include <services/stacktrace.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/services/dwarf.h>
+#include <tcf/services/dwarfio.h>
+#include <tcf/services/dwarfcache.h>
+#include <tcf/services/dwarfexpr.h>
+#include <tcf/services/stacktrace.h>
#define OBJ_HASH(Cache,ID) (((U4_T)(ID) + ((U4_T)(ID) >> 8)) % Cache->mObjectHashSize)
diff --git a/agent/tcf/services/dwarfcache.h b/agent/tcf/services/dwarfcache.h
index 93bec126..b7649bae 100644
--- a/agent/tcf/services/dwarfcache.h
+++ b/agent/tcf/services/dwarfcache.h
@@ -24,13 +24,13 @@
#ifndef D_dwarfcache
#define D_dwarfcache
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF && ENABLE_DebugContext
-#include <services/tcf_elf.h>
-#include <services/dwarfio.h>
-#include <framework/errors.h>
+#include <tcf/services/tcf_elf.h>
+#include <tcf/services/dwarfio.h>
+#include <tcf/framework/errors.h>
typedef struct FileInfo FileInfo;
typedef struct ObjectInfo ObjectInfo;
diff --git a/agent/tcf/services/dwarfexpr.c b/agent/tcf/services/dwarfexpr.c
index 48dee578..1ebce6c8 100644
--- a/agent/tcf/services/dwarfexpr.c
+++ b/agent/tcf/services/dwarfexpr.c
@@ -17,22 +17,22 @@
* This module implements DWARF expressions evaluation.
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF && ENABLE_DebugContext
#include <assert.h>
#include <stdio.h>
-#include <framework/events.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <services/dwarf.h>
-#include <services/dwarfio.h>
-#include <services/dwarfexpr.h>
-#include <services/stacktrace.h>
-#include <services/vm.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/services/dwarf.h>
+#include <tcf/services/dwarfio.h>
+#include <tcf/services/dwarfexpr.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/vm.h>
typedef struct ValuePieces {
U4_T mCnt;
diff --git a/agent/tcf/services/dwarfexpr.h b/agent/tcf/services/dwarfexpr.h
index c38f3a00..7fde2b62 100644
--- a/agent/tcf/services/dwarfexpr.h
+++ b/agent/tcf/services/dwarfexpr.h
@@ -21,11 +21,11 @@
#ifndef D_dwarfexpr
#define D_dwarfexpr
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF && ENABLE_DebugContext
-#include <services/dwarfcache.h>
+#include <tcf/services/dwarfcache.h>
extern void dwarf_evaluate_expression(U8_T base, PropertyValue * value);
diff --git a/agent/tcf/services/dwarfframe.c b/agent/tcf/services/dwarfframe.c
index 843393df..e47310ec 100644
--- a/agent/tcf/services/dwarfframe.c
+++ b/agent/tcf/services/dwarfframe.c
@@ -19,18 +19,18 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF && ENABLE_DebugContext
#include <assert.h>
#include <stdio.h>
-#include <framework/exceptions.h>
-#include <framework/myalloc.h>
-#include <framework/trace.h>
-#include <services/dwarf.h>
-#include <services/dwarfio.h>
-#include <services/dwarfframe.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/services/dwarf.h>
+#include <tcf/services/dwarfio.h>
+#include <tcf/services/dwarfframe.h>
#define EH_PE_omit 0xff
diff --git a/agent/tcf/services/dwarfframe.h b/agent/tcf/services/dwarfframe.h
index c4107f2a..48a0c2f7 100644
--- a/agent/tcf/services/dwarfframe.h
+++ b/agent/tcf/services/dwarfframe.h
@@ -22,12 +22,12 @@
#ifndef D_dwarfframe
#define D_dwarfframe
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF && ENABLE_DebugContext
-#include <framework/context.h>
-#include <services/dwarfcache.h>
+#include <tcf/framework/context.h>
+#include <tcf/services/dwarfcache.h>
/*
* Lookup stack tracing information in ELF file, in .debug_frame and .eh_frame sections.
diff --git a/agent/tcf/services/dwarfio.c b/agent/tcf/services/dwarfio.c
index 6c5a35c4..a545fe87 100644
--- a/agent/tcf/services/dwarfio.c
+++ b/agent/tcf/services/dwarfio.c
@@ -19,17 +19,17 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF
#include <assert.h>
#include <string.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <services/dwarfio.h>
-#include <services/dwarfreloc.h>
-#include <services/dwarf.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/dwarfio.h>
+#include <tcf/services/dwarfreloc.h>
+#include <tcf/services/dwarf.h>
#define ABBREV_TABLE_SIZE (4 * MEM_USAGE_FACTOR - 1)
diff --git a/agent/tcf/services/dwarfio.h b/agent/tcf/services/dwarfio.h
index 8e617a1d..f609ccac 100644
--- a/agent/tcf/services/dwarfio.h
+++ b/agent/tcf/services/dwarfio.h
@@ -21,11 +21,11 @@
#ifndef D_dwarfio
#define D_dwarfio
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF
-#include <services/tcf_elf.h>
+#include <tcf/services/tcf_elf.h>
typedef struct DIO_UnitDescriptor {
ELF_Section * mSection;
diff --git a/agent/tcf/services/dwarfreloc.c b/agent/tcf/services/dwarfreloc.c
index 23377831..00d4d5cf 100644
--- a/agent/tcf/services/dwarfreloc.c
+++ b/agent/tcf/services/dwarfreloc.c
@@ -19,13 +19,13 @@
* Functions in this module use exceptions to report errors, see exceptions.h
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF
#include <assert.h>
-#include <framework/exceptions.h>
-#include <services/dwarfreloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/dwarfreloc.h>
static ELF_Section * section = NULL;
static ELF_Section * relocs = NULL;
@@ -46,7 +46,7 @@ typedef struct ElfRelocateFunc {
void (*func)(void);
} ElfRelocateFunc;
-#include <machine/elf-mdep.h>
+#include <tcf/machine/elf-mdep.h>
static void relocate(void * r) {
ElfRelocateFunc * func;
diff --git a/agent/tcf/services/dwarfreloc.h b/agent/tcf/services/dwarfreloc.h
index af8f3e2c..ad5667c0 100644
--- a/agent/tcf/services/dwarfreloc.h
+++ b/agent/tcf/services/dwarfreloc.h
@@ -22,11 +22,11 @@
#ifndef D_dwarfreloc
#define D_dwarfreloc
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF
-#include <services/tcf_elf.h>
+#include <tcf/services/tcf_elf.h>
extern void drl_relocate(ELF_Section * s, U8_T offset, void * buf, size_t size, ELF_Section ** dst);
diff --git a/agent/tcf/services/expressions.c b/agent/tcf/services/expressions.c
index c58757bd..55b5eacc 100644
--- a/agent/tcf/services/expressions.c
+++ b/agent/tcf/services/expressions.c
@@ -23,7 +23,7 @@
* where X is symbol ID as returned by symbols service.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Expressions
@@ -32,17 +32,17 @@
#include <stdio.h>
#include <assert.h>
#include <string.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/json.h>
-#include <framework/cache.h>
-#include <framework/context.h>
-#include <services/symbols.h>
-#include <services/stacktrace.h>
-#include <services/expressions.h>
-#include <services/memoryservice.h>
-#include <services/registers.h>
-#include <main/test.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/context.h>
+#include <tcf/services/symbols.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/expressions.h>
+#include <tcf/services/memoryservice.h>
+#include <tcf/services/registers.h>
+#include <tcf/main/test.h>
#define STR_POOL_SIZE (64 * MEM_USAGE_FACTOR)
diff --git a/agent/tcf/services/expressions.h b/agent/tcf/services/expressions.h
index 41b7ba16..34c2ce99 100644
--- a/agent/tcf/services/expressions.h
+++ b/agent/tcf/services/expressions.h
@@ -20,10 +20,10 @@
#ifndef D_expressions
#define D_expressions
-#include <config.h>
-#include <framework/protocol.h>
-#include <framework/context.h>
-#include <services/symbols.h>
+#include <tcf/config.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/context.h>
+#include <tcf/services/symbols.h>
#if SERVICE_Expressions
diff --git a/agent/tcf/services/filesystem.c b/agent/tcf/services/filesystem.c
index 174a8bbc..b403faf4 100644
--- a/agent/tcf/services/filesystem.c
+++ b/agent/tcf/services/filesystem.c
@@ -21,7 +21,7 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_FileSystem
@@ -45,16 +45,16 @@
#if defined(_WRS_KERNEL)
# include <ioLib.h>
#endif
-#include <framework/myalloc.h>
-#include <framework/asyncreq.h>
-#include <framework/streams.h>
-#include <framework/channel.h>
-#include <framework/link.h>
-#include <framework/trace.h>
-#include <framework/json.h>
-#include <framework/exceptions.h>
-#include <framework/protocol.h>
-#include <services/filesystem.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/streams.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/link.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/services/filesystem.h>
#define BUF_SIZE (128 * MEM_USAGE_FACTOR)
diff --git a/agent/tcf/services/filesystem.h b/agent/tcf/services/filesystem.h
index 98a846ce..325a1f7b 100644
--- a/agent/tcf/services/filesystem.h
+++ b/agent/tcf/services/filesystem.h
@@ -20,7 +20,7 @@
#ifndef D_filesystem
#define D_filesystem
-#include <framework/protocol.h>
+#include <tcf/framework/protocol.h>
/*
* Initialize file system service.
*/
diff --git a/agent/tcf/services/linenumbers.c b/agent/tcf/services/linenumbers.c
index 7ed0d8e1..6b735bb5 100644
--- a/agent/tcf/services/linenumbers.c
+++ b/agent/tcf/services/linenumbers.c
@@ -20,21 +20,21 @@
* machine instruction addresses in the executable object.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_LineNumbers
#include <errno.h>
#include <assert.h>
#include <stdio.h>
-#include <framework/context.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/cache.h>
-#include <framework/json.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
-#include <services/linenumbers.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
+#include <tcf/services/linenumbers.h>
#define MAX_AREA_CNT 256
diff --git a/agent/tcf/services/linenumbers.h b/agent/tcf/services/linenumbers.h
index 3e43c970..89f25245 100644
--- a/agent/tcf/services/linenumbers.h
+++ b/agent/tcf/services/linenumbers.h
@@ -22,8 +22,8 @@
#ifndef D_linenumbers
#define D_linenumbers
-#include <framework/protocol.h>
-#include <framework/context.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/context.h>
typedef struct CodeArea {
char * directory;
diff --git a/agent/tcf/services/linenumbers_elf.c b/agent/tcf/services/linenumbers_elf.c
index 96e305aa..9cdf9f61 100644
--- a/agent/tcf/services/linenumbers_elf.c
+++ b/agent/tcf/services/linenumbers_elf.c
@@ -20,27 +20,27 @@
* machine instruction addresses in the executable object.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_LineNumbers && !ENABLE_LineNumbersProxy && ENABLE_ELF
#include <errno.h>
#include <assert.h>
#include <stdio.h>
-#include <framework/context.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/cache.h>
-#include <framework/trace.h>
-#include <framework/json.h>
-#include <framework/protocol.h>
-#include <services/linenumbers.h>
-#include <services/tcf_elf.h>
-#include <services/dwarfio.h>
-#include <services/dwarf.h>
-#include <services/dwarfcache.h>
-#include <services/stacktrace.h>
-#include <services/pathmap.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/services/linenumbers.h>
+#include <tcf/services/tcf_elf.h>
+#include <tcf/services/dwarfio.h>
+#include <tcf/services/dwarf.h>
+#include <tcf/services/dwarfcache.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/pathmap.h>
static int is_absolute_path(char * fnm) {
if (fnm[0] == '/') return 1;
diff --git a/agent/tcf/services/linenumbers_proxy.c b/agent/tcf/services/linenumbers_proxy.c
index 3f920727..bc1b6a08 100644
--- a/agent/tcf/services/linenumbers_proxy.c
+++ b/agent/tcf/services/linenumbers_proxy.c
@@ -20,19 +20,19 @@
* machine instruction addresses in the executable object.
*/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_LineNumbersProxy
#include <assert.h>
#include <stdio.h>
-#include <framework/context.h>
-#include <framework/cache.h>
-#include <framework/json.h>
-#include <framework/events.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <services/linenumbers.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/linenumbers.h>
#define HASH_SIZE (16 * MEM_USAGE_FACTOR - 1)
diff --git a/agent/tcf/services/linenumbers_win32.c b/agent/tcf/services/linenumbers_win32.c
index 60b58747..efdbf578 100644
--- a/agent/tcf/services/linenumbers_win32.c
+++ b/agent/tcf/services/linenumbers_win32.c
@@ -19,20 +19,20 @@
* machine instruction addresses in the executable object.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_LineNumbers && !ENABLE_LineNumbersProxy && defined(WIN32) && !ENABLE_ELF
#include <errno.h>
#include <assert.h>
#include <stdio.h>
-#include <framework/json.h>
-#include <framework/protocol.h>
-#include <framework/context.h>
-#include <framework/exceptions.h>
-#include <services/linenumbers.h>
-#include <system/Windows/windbgcache.h>
-#include <system/Windows/context-win32.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/linenumbers.h>
+#include <tcf/system/Windows/windbgcache.h>
+#include <tcf/system/Windows/context-win32.h>
int line_to_address(Context * ctx, char * file, int line, int column,
LineNumbersCallBack * callback, void * user_args) {
diff --git a/agent/tcf/services/memorymap.c b/agent/tcf/services/memorymap.c
index f96a07a8..b39633fc 100644
--- a/agent/tcf/services/memorymap.c
+++ b/agent/tcf/services/memorymap.c
@@ -17,19 +17,19 @@
* This module holds execution context memory maps.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_MemoryMap
#include <assert.h>
#include <errno.h>
#include <stdio.h>
-#include <framework/myalloc.h>
-#include <framework/trace.h>
-#include <framework/json.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <services/memorymap.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/memorymap.h>
typedef struct Listener {
MemoryMapEventListener * listener;
diff --git a/agent/tcf/services/memorymap.h b/agent/tcf/services/memorymap.h
index 34d74b61..e7001bbe 100644
--- a/agent/tcf/services/memorymap.h
+++ b/agent/tcf/services/memorymap.h
@@ -19,9 +19,9 @@
#ifndef D_memorymap
#define D_memorymap
-#include <config.h>
-#include <framework/context.h>
-#include <framework/protocol.h>
+#include <tcf/config.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/protocol.h>
#if SERVICE_MemoryMap
diff --git a/agent/tcf/services/memoryservice.c b/agent/tcf/services/memoryservice.c
index b1847d16..dbe2ef93 100644
--- a/agent/tcf/services/memoryservice.c
+++ b/agent/tcf/services/memoryservice.c
@@ -17,20 +17,20 @@
* TCF Memory - memory access service.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Memory
#include <assert.h>
-#include <framework/protocol.h>
-#include <framework/context.h>
-#include <framework/json.h>
-#include <framework/exceptions.h>
-#include <framework/myalloc.h>
-#include <framework/channel.h>
-#include <framework/trace.h>
-#include <services/memoryservice.h>
-#include <services/runctrl.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/trace.h>
+#include <tcf/services/memoryservice.h>
+#include <tcf/services/runctrl.h>
static const char * MEMORY = "Memory";
diff --git a/agent/tcf/services/pathmap.c b/agent/tcf/services/pathmap.c
index 51f6e8b0..7e9127fa 100644
--- a/agent/tcf/services/pathmap.c
+++ b/agent/tcf/services/pathmap.c
@@ -18,11 +18,11 @@
* The service manages file path mapping rules.
*/
-#include <config.h>
+#include <tcf/config.h>
#include <assert.h>
-#include <framework/mdep-inet.h>
-#include <framework/myalloc.h>
-#include <services/pathmap.h>
+#include <tcf/framework/mdep-inet.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/services/pathmap.h>
char * canonic_path_map_file_name(const char * fnm) {
static char * buf = NULL;
@@ -68,9 +68,9 @@ char * canonic_path_map_file_name(const char * fnm) {
#include <stdio.h>
#include <sys/stat.h>
-#include <framework/json.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
typedef struct Listener Listener;
typedef struct PathMap PathMap;
diff --git a/agent/tcf/services/pathmap.h b/agent/tcf/services/pathmap.h
index 3e78b0b2..6a5550b5 100644
--- a/agent/tcf/services/pathmap.h
+++ b/agent/tcf/services/pathmap.h
@@ -21,9 +21,9 @@
#ifndef D_pathmap
#define D_pathmap
-#include <config.h>
-#include <framework/context.h>
-#include <framework/protocol.h>
+#include <tcf/config.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/protocol.h>
/*
* Convert a file name to canonic form that is suitable for file name comparisons.
diff --git a/agent/tcf/services/processes.c b/agent/tcf/services/processes.c
index 78a2a565..094c779d 100644
--- a/agent/tcf/services/processes.c
+++ b/agent/tcf/services/processes.c
@@ -27,7 +27,7 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Processes || SERVICE_Terminals
@@ -38,17 +38,17 @@
#include <fcntl.h>
#include <signal.h>
#include <assert.h>
-#include <framework/myalloc.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
-#include <framework/context.h>
-#include <framework/json.h>
-#include <framework/asyncreq.h>
-#include <framework/exceptions.h>
-#include <framework/waitpid.h>
-#include <framework/signames.h>
-#include <services/streamsservice.h>
-#include <services/processes.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/waitpid.h>
+#include <tcf/framework/signames.h>
+#include <tcf/services/streamsservice.h>
+#include <tcf/services/processes.h>
#if SERVICE_Processes
static const char * PROCESSES[2] = { "Processes", "ProcessesV1" };
diff --git a/agent/tcf/services/processes.h b/agent/tcf/services/processes.h
index 14db05c7..2c8318e2 100644
--- a/agent/tcf/services/processes.h
+++ b/agent/tcf/services/processes.h
@@ -24,7 +24,7 @@
#ifndef D_processes
#define D_processes
-#include <framework/protocol.h>
+#include <tcf/framework/protocol.h>
typedef struct ChildProcess ChildProcess;
diff --git a/agent/tcf/services/registers.c b/agent/tcf/services/registers.c
index 1bb049d8..c86dce46 100644
--- a/agent/tcf/services/registers.c
+++ b/agent/tcf/services/registers.c
@@ -17,7 +17,7 @@
* TCF Registers - CPU registers access service.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Registers
@@ -25,14 +25,14 @@
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
-#include <framework/myalloc.h>
-#include <framework/protocol.h>
-#include <framework/context.h>
-#include <framework/json.h>
-#include <framework/cache.h>
-#include <framework/exceptions.h>
-#include <services/stacktrace.h>
-#include <services/registers.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/registers.h>
static const char * REGISTERS = "Registers";
diff --git a/agent/tcf/services/registers.h b/agent/tcf/services/registers.h
index 85a8ff79..9433fe0a 100644
--- a/agent/tcf/services/registers.h
+++ b/agent/tcf/services/registers.h
@@ -20,12 +20,12 @@
#ifndef D_registers
#define D_registers
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Registers
-#include <framework/protocol.h>
-#include <framework/cpudefs.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/cpudefs.h>
/*
* Notify clients about register value change.
diff --git a/agent/tcf/services/runctrl.c b/agent/tcf/services/runctrl.c
index f7812317..95c03ee2 100644
--- a/agent/tcf/services/runctrl.c
+++ b/agent/tcf/services/runctrl.c
@@ -17,7 +17,7 @@
* Target service implementation: run control (TCF name RunControl)
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_RunControl
@@ -26,22 +26,22 @@
#include <signal.h>
#include <errno.h>
#include <assert.h>
-#include <framework/protocol.h>
-#include <framework/channel.h>
-#include <framework/json.h>
-#include <framework/context.h>
-#include <framework/myalloc.h>
-#include <framework/trace.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <framework/signames.h>
-#include <framework/cache.h>
-#include <services/runctrl.h>
-#include <services/breakpoints.h>
-#include <services/linenumbers.h>
-#include <services/stacktrace.h>
-#include <services/symbols.h>
-#include <main/cmdline.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/signames.h>
+#include <tcf/framework/cache.h>
+#include <tcf/services/runctrl.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/services/linenumbers.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/symbols.h>
+#include <tcf/main/cmdline.h>
#define EN_STEP_OVER (SERVICE_Breakpoints && SERVICE_StackTrace && ENABLE_Symbols)
#define EN_STEP_LINE (SERVICE_LineNumbers)
@@ -1739,7 +1739,7 @@ void ini_run_ctrl_service(Protocol * proto, TCFBroadcastGroup * bcg) {
#else
-#include <services/runctrl.h>
+#include <tcf/services/runctrl.h>
#include <assert.h>
void post_safe_event(Context * ctx, EventCallBack * done, void * arg) {
diff --git a/agent/tcf/services/runctrl.h b/agent/tcf/services/runctrl.h
index dcaf186a..755b6f2e 100644
--- a/agent/tcf/services/runctrl.h
+++ b/agent/tcf/services/runctrl.h
@@ -46,10 +46,10 @@
#ifndef D_runctrl
#define D_runctrl
-#include <config.h>
-#include <framework/events.h>
-#include <framework/context.h>
-#include <framework/protocol.h>
+#include <tcf/config.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/protocol.h>
/*
* Lock run control: don't resume any thread while run control is locked.
diff --git a/agent/tcf/services/stacktrace.c b/agent/tcf/services/stacktrace.c
index 927621fa..13e3f9d5 100644
--- a/agent/tcf/services/stacktrace.c
+++ b/agent/tcf/services/stacktrace.c
@@ -17,7 +17,7 @@
* Target service implementation: stack trace (TCF name StackTrace)
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_StackTrace
@@ -26,16 +26,16 @@
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include <framework/myalloc.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
-#include <framework/context.h>
-#include <framework/json.h>
-#include <framework/cache.h>
-#include <framework/exceptions.h>
-#include <services/registers.h>
-#include <services/stacktrace.h>
-#include <services/symbols.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/registers.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/symbols.h>
#define MAX_FRAMES 1000
diff --git a/agent/tcf/services/stacktrace.h b/agent/tcf/services/stacktrace.h
index 52027266..872de827 100644
--- a/agent/tcf/services/stacktrace.h
+++ b/agent/tcf/services/stacktrace.h
@@ -20,8 +20,8 @@
#ifndef D_stacktrace
#define D_stacktrace
-#include <framework/protocol.h>
-#include <framework/context.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/context.h>
#if SERVICE_StackTrace || ENABLE_ContextProxy
diff --git a/agent/tcf/services/streamsservice.c b/agent/tcf/services/streamsservice.c
index 0414e5d3..14c01410 100644
--- a/agent/tcf/services/streamsservice.c
+++ b/agent/tcf/services/streamsservice.c
@@ -17,20 +17,20 @@
* TCF Streams - generic streams service.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Streams
#include <assert.h>
#include <string.h>
-#include <framework/channel.h>
-#include <framework/exceptions.h>
-#include <framework/json.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/events.h>
-#include <framework/myalloc.h>
-#include <services/streamsservice.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/services/streamsservice.h>
static const char * STREAMS = "Streams";
diff --git a/agent/tcf/services/streamsservice.h b/agent/tcf/services/streamsservice.h
index 925e9ff8..a24f906d 100644
--- a/agent/tcf/services/streamsservice.h
+++ b/agent/tcf/services/streamsservice.h
@@ -20,7 +20,7 @@
#ifndef D_streamsservice
#define D_streamsservice
-#include <framework/protocol.h>
+#include <tcf/framework/protocol.h>
typedef struct VirtualStream VirtualStream;
diff --git a/agent/tcf/services/symbols.c b/agent/tcf/services/symbols.c
index b0de94f5..2c3bd4e9 100644
--- a/agent/tcf/services/symbols.c
+++ b/agent/tcf/services/symbols.c
@@ -14,17 +14,17 @@
*******************************************************************************/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Symbols
-#include <framework/channel.h>
-#include <framework/json.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/cache.h>
-#include <services/stacktrace.h>
-#include <services/symbols.h>
+#include <tcf/framework/channel.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/cache.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/symbols.h>
static const char * SYMBOLS = "Symbols";
diff --git a/agent/tcf/services/symbols.h b/agent/tcf/services/symbols.h
index 1a8b7c2c..790c573c 100644
--- a/agent/tcf/services/symbols.h
+++ b/agent/tcf/services/symbols.h
@@ -20,8 +20,8 @@
#ifndef D_symbols
#define D_symbols
-#include <framework/context.h>
-#include <framework/protocol.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/protocol.h>
/*
* Symbol information can change at any time as result of target background activities.
diff --git a/agent/tcf/services/symbols_elf.c b/agent/tcf/services/symbols_elf.c
index 1e28d419..39864026 100644
--- a/agent/tcf/services/symbols_elf.c
+++ b/agent/tcf/services/symbols_elf.c
@@ -17,7 +17,7 @@
* Symbols service - ELF version.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Symbols && !ENABLE_SymbolsProxy && ENABLE_ELF
@@ -30,19 +30,19 @@
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
-#include <framework/errors.h>
-#include <framework/myalloc.h>
-#include <framework/events.h>
-#include <framework/exceptions.h>
-#include <services/tcf_elf.h>
-#include <services/dwarf.h>
-#include <services/dwarfcache.h>
-#include <services/dwarfexpr.h>
-#include <services/dwarfframe.h>
-#include <services/stacktrace.h>
-#include <services/symbols.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/tcf_elf.h>
+#include <tcf/services/dwarf.h>
+#include <tcf/services/dwarfcache.h>
+#include <tcf/services/dwarfexpr.h>
+#include <tcf/services/dwarfframe.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/symbols.h>
#if ENABLE_RCBP_TEST
-# include <main/test.h>
+# include <tcf/main/test.h>
#endif
struct Symbol {
@@ -66,7 +66,7 @@ struct Symbol {
#define is_cardinal_type_pseudo_symbol(s) (s->sym_class == SYM_CLASS_TYPE && s->obj == NULL && s->base == NULL)
-#include <services/symbols_alloc.h>
+#include <tcf/services/symbols_alloc.h>
static Context * sym_ctx;
static int sym_frame;
diff --git a/agent/tcf/services/symbols_proxy.c b/agent/tcf/services/symbols_proxy.c
index d145de92..9a60f9d2 100644
--- a/agent/tcf/services/symbols_proxy.c
+++ b/agent/tcf/services/symbols_proxy.c
@@ -19,22 +19,22 @@
/* TODO: need to cleanup symbols cache from data that not used for long time */
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_SymbolsProxy
#include <assert.h>
#include <stdio.h>
-#include <framework/context.h>
-#include <framework/cache.h>
-#include <framework/json.h>
-#include <framework/events.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <services/stacktrace.h>
-#include <services/symbols.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/cache.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/symbols.h>
#if ENABLE_RCBP_TEST
-# include <main/test.h>
+# include <tcf/main/test.h>
#endif
#define HASH_SIZE (4 * MEM_USAGE_FACTOR - 1)
@@ -166,7 +166,7 @@ struct Symbol {
SymInfoCache * cache;
};
-#include <services/symbols_alloc.h>
+#include <tcf/services/symbols_alloc.h>
static LINK root;
diff --git a/agent/tcf/services/symbols_win32.c b/agent/tcf/services/symbols_win32.c
index e6e702f5..9f879e94 100644
--- a/agent/tcf/services/symbols_win32.c
+++ b/agent/tcf/services/symbols_win32.c
@@ -17,7 +17,7 @@
* Symbols service - Windows version
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Symbols && !ENABLE_SymbolsProxy && defined(WIN32) && !ENABLE_ELF
@@ -26,17 +26,17 @@
#include <stdlib.h>
#include <stdio.h>
#include <wchar.h>
-#include <framework/errors.h>
-#include <framework/events.h>
-#include <framework/myalloc.h>
-#include <framework/trace.h>
-#include <services/symbols.h>
-#include <services/stacktrace.h>
-#include <services/memorymap.h>
-#include <system/Windows/windbgcache.h>
-#include <system/Windows/context-win32.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/trace.h>
+#include <tcf/services/symbols.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/memorymap.h>
+#include <tcf/system/Windows/windbgcache.h>
+#include <tcf/system/Windows/context-win32.h>
#if ENABLE_RCBP_TEST
-# include <main/test.h>
+# include <tcf/main/test.h>
#endif
#ifndef MAX_SYM_NAME
@@ -98,7 +98,7 @@ struct Symbol {
ContextAddress address;
};
-#include <services/symbols_alloc.h>
+#include <tcf/services/symbols_alloc.h>
typedef struct SymbolCacheEntry {
struct SymbolCacheEntry * next;
diff --git a/agent/tcf/services/sysmon.c b/agent/tcf/services/sysmon.c
index 6bbb32b2..7a710072 100644
--- a/agent/tcf/services/sysmon.c
+++ b/agent/tcf/services/sysmon.c
@@ -13,7 +13,7 @@
* Wind River Systems - initial API and implementation
*******************************************************************************/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_SysMonitor
@@ -24,13 +24,13 @@
#include <assert.h>
#include <fcntl.h>
#include <sys/stat.h>
-#include <framework/protocol.h>
-#include <framework/exceptions.h>
-#include <framework/myalloc.h>
-#include <framework/json.h>
-#include <framework/context.h>
-#include <framework/errors.h>
-#include <services/sysmon.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/errors.h>
+#include <tcf/services/sysmon.h>
static const char SYS_MON[] = "SysMonitor";
diff --git a/agent/tcf/services/sysmon.h b/agent/tcf/services/sysmon.h
index 1578a6d4..c3efe280 100644
--- a/agent/tcf/services/sysmon.h
+++ b/agent/tcf/services/sysmon.h
@@ -20,7 +20,7 @@
#ifndef D_sysmon
#define D_sysmon
-#include <framework/protocol.h>
+#include <tcf/framework/protocol.h>
/*
* Initialize system monitor service.
diff --git a/agent/tcf/services/tcf_elf.c b/agent/tcf/services/tcf_elf.c
index 97f40bce..aff0d08e 100644
--- a/agent/tcf/services/tcf_elf.c
+++ b/agent/tcf/services/tcf_elf.c
@@ -21,7 +21,7 @@
# define _GNU_SOURCE
#endif
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF
@@ -32,14 +32,14 @@
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <framework/events.h>
-#include <framework/trace.h>
-#include <services/tcf_elf.h>
-#include <services/memorymap.h>
-#include <services/dwarfcache.h>
-#include <services/pathmap.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/trace.h>
+#include <tcf/services/tcf_elf.h>
+#include <tcf/services/memorymap.h>
+#include <tcf/services/dwarfcache.h>
+#include <tcf/services/pathmap.h>
#if defined(_WRS_KERNEL)
#elif defined(WIN32)
diff --git a/agent/tcf/services/tcf_elf.h b/agent/tcf/services/tcf_elf.h
index 912a0307..3a4217a8 100644
--- a/agent/tcf/services/tcf_elf.h
+++ b/agent/tcf/services/tcf_elf.h
@@ -19,14 +19,14 @@
#ifndef D_elf
#define D_elf
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_ELF
#if !defined(WIN32) && !defined(__APPLE__)
# include <elf.h>
#endif
-#include <framework/context.h>
+#include <tcf/framework/context.h>
#if defined(WIN32) || defined(__APPLE__)
diff --git a/agent/tcf/services/terminals.c b/agent/tcf/services/terminals.c
index fb9932ef..f61c3dad 100644
--- a/agent/tcf/services/terminals.c
+++ b/agent/tcf/services/terminals.c
@@ -18,7 +18,7 @@
* TCF Terminals service implementation.
*/
-#include <config.h>
+#include <tcf/config.h>
#if SERVICE_Terminals
@@ -29,18 +29,18 @@
#include <fcntl.h>
#include <signal.h>
#include <assert.h>
-#include <framework/myalloc.h>
-#include <framework/protocol.h>
-#include <framework/trace.h>
-#include <framework/context.h>
-#include <framework/json.h>
-#include <framework/asyncreq.h>
-#include <framework/exceptions.h>
-#include <framework/waitpid.h>
-#include <framework/signames.h>
-#include <services/streamsservice.h>
-#include <services/processes.h>
-#include <services/terminals.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/protocol.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/json.h>
+#include <tcf/framework/asyncreq.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/framework/waitpid.h>
+#include <tcf/framework/signames.h>
+#include <tcf/services/streamsservice.h>
+#include <tcf/services/processes.h>
+#include <tcf/services/terminals.h>
#ifndef TERMINALS_NO_LOGIN
#define TERMINALS_NO_LOGIN 1
diff --git a/agent/tcf/services/terminals.h b/agent/tcf/services/terminals.h
index 5108179d..b9ac618e 100644
--- a/agent/tcf/services/terminals.h
+++ b/agent/tcf/services/terminals.h
@@ -21,8 +21,8 @@
#ifndef TERMINALS_H_
#define TERMINALS_H_
-#include <config.h>
-#include <framework/protocol.h>
+#include <tcf/config.h>
+#include <tcf/framework/protocol.h>
extern void ini_terminals_service(Protocol * proto);
diff --git a/agent/tcf/services/vm.c b/agent/tcf/services/vm.c
index 026f81b3..056ef891 100644
--- a/agent/tcf/services/vm.c
+++ b/agent/tcf/services/vm.c
@@ -13,17 +13,17 @@
* Wind River Systems - initial API and implementation
*******************************************************************************/
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_DebugContext
#include <errno.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/exceptions.h>
-#include <services/stacktrace.h>
-#include <services/dwarf.h>
-#include <services/vm.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/exceptions.h>
+#include <tcf/services/stacktrace.h>
+#include <tcf/services/dwarf.h>
+#include <tcf/services/vm.h>
#define check_e_stack(n) { if (state->stk_pos < n) inv_dwarf("Invalid DWARF expression stack"); }
diff --git a/agent/tcf/services/vm.h b/agent/tcf/services/vm.h
index 90b6bb17..3e3e0d57 100644
--- a/agent/tcf/services/vm.h
+++ b/agent/tcf/services/vm.h
@@ -17,11 +17,11 @@
#ifndef D_vm
#define D_vm
-#include <config.h>
+#include <tcf/config.h>
#if ENABLE_DebugContext
-#include <framework/context.h>
+#include <tcf/framework/context.h>
typedef struct VMState {
/* Evaluation context */
diff --git a/agent/tcf/system/Darwin/context-darwin.c b/agent/tcf/system/Darwin/context-darwin.c
index 1ed32719..6344a0de 100644
--- a/agent/tcf/system/Darwin/context-darwin.c
+++ b/agent/tcf/system/Darwin/context-darwin.c
@@ -17,7 +17,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include <config.h>
+#include <tcf/config.h>
#if defined(__APPLE__)
@@ -31,15 +31,15 @@
#include <sys/syscall.h>
#include <sys/ptrace.h>
#include <mach/thread_status.h>
-#include <framework/context.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/waitpid.h>
-#include <framework/signames.h>
-#include <services/breakpoints.h>
-#include <system/Darwin/regset.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/waitpid.h>
+#include <tcf/framework/signames.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/system/Darwin/regset.h>
#define WORD_SIZE 4
@@ -65,7 +65,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionDarwin *)((char *)(ctx) + context_extension_offset))
-#include <system/pid-hash.h>
+#include <tcf/system/pid-hash.h>
static LINK pending_list;
diff --git a/agent/tcf/system/FreeBSD/context-freebsd.c b/agent/tcf/system/FreeBSD/context-freebsd.c
index d01f108b..416ab408 100644
--- a/agent/tcf/system/FreeBSD/context-freebsd.c
+++ b/agent/tcf/system/FreeBSD/context-freebsd.c
@@ -17,7 +17,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include <config.h>
+#include <tcf/config.h>
#if defined(__FreeBSD__)
@@ -29,15 +29,15 @@
#include <signal.h>
#include <sched.h>
#include <sys/ptrace.h>
-#include <framework/context.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/waitpid.h>
-#include <framework/signames.h>
-#include <services/breakpoints.h>
-#include <system/FreeBSD/regset.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/waitpid.h>
+#include <tcf/framework/signames.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/system/FreeBSD/regset.h>
#define PTRACE_TRACEME PT_TRACE_ME
#define PTRACE_ATTACH PT_ATTACH
@@ -72,7 +72,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionBSD *)((char *)(ctx) + context_extension_offset))
-#include <system/pid-hash.h>
+#include <tcf/system/pid-hash.h>
static LINK pending_list;
diff --git a/agent/tcf/system/FreeBSD/regset.h b/agent/tcf/system/FreeBSD/regset.h
index add029bd..5ff046c1 100644
--- a/agent/tcf/system/FreeBSD/regset.h
+++ b/agent/tcf/system/FreeBSD/regset.h
@@ -19,6 +19,6 @@
*/
#if defined(__FreeBSD__)
-# include <machine/reg.h>
+# include <tcf/machine/reg.h>
typedef struct reg REG_SET;
#endif
diff --git a/agent/tcf/system/GNU/Linux/context-linux.c b/agent/tcf/system/GNU/Linux/context-linux.c
index 569d9ec6..0318e48e 100644
--- a/agent/tcf/system/GNU/Linux/context-linux.c
+++ b/agent/tcf/system/GNU/Linux/context-linux.c
@@ -17,7 +17,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include <config.h>
+#include <tcf/config.h>
#if defined(__linux__)
@@ -32,19 +32,19 @@
#include <asm/unistd.h>
#include <sys/ptrace.h>
#include <linux/kdev_t.h>
-#include <framework/context.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/waitpid.h>
-#include <framework/signames.h>
-#include <services/breakpoints.h>
-#include <services/expressions.h>
-#include <services/memorymap.h>
-#include <services/runctrl.h>
-#include <services/tcf_elf.h>
-#include <system/GNU/Linux/regset.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/waitpid.h>
+#include <tcf/framework/signames.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/services/expressions.h>
+#include <tcf/services/memorymap.h>
+#include <tcf/services/runctrl.h>
+#include <tcf/services/tcf_elf.h>
+#include <tcf/system/GNU/Linux/regset.h>
#if !defined(PTRACE_SETOPTIONS)
#define PTRACE_SETOPTIONS 0x4200
@@ -105,7 +105,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionLinux *)((char *)(ctx) + context_extension_offset))
-#include <system/pid-hash.h>
+#include <tcf/system/pid-hash.h>
static LINK pending_list;
static LINK detach_list;
diff --git a/agent/tcf/system/VxWorks/context-vxworks.c b/agent/tcf/system/VxWorks/context-vxworks.c
index 203af68c..18fb927d 100644
--- a/agent/tcf/system/VxWorks/context-vxworks.c
+++ b/agent/tcf/system/VxWorks/context-vxworks.c
@@ -17,7 +17,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include <config.h>
+#include <tcf/config.h>
#if defined(_WRS_KERNEL)
@@ -27,16 +27,16 @@
#include <assert.h>
#include <errno.h>
#include <signal.h>
-#include <framework/mdep-threads.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/waitpid.h>
-#include <framework/signames.h>
-#include <services/breakpoints.h>
-#include <services/memorymap.h>
-#include <system/VxWorks/context-vxworks.h>
+#include <tcf/framework/mdep-threads.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/waitpid.h>
+#include <tcf/framework/signames.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/services/memorymap.h>
+#include <tcf/system/VxWorks/context-vxworks.h>
/* TODO: VxWorks RTP support */
@@ -61,7 +61,7 @@ static size_t context_extension_offset = 0;
#define EXT(ctx) ((ContextExtensionVxWorks *)((char *)(ctx) + context_extension_offset))
-#include <system/pid-hash.h>
+#include <tcf/system/pid-hash.h>
#define EVENT_HOOK_BREAKPOINT 2
#define EVENT_HOOK_STEP_DONE 3
diff --git a/agent/tcf/system/VxWorks/context-vxworks.h b/agent/tcf/system/VxWorks/context-vxworks.h
index 12074f6b..0fd81105 100644
--- a/agent/tcf/system/VxWorks/context-vxworks.h
+++ b/agent/tcf/system/VxWorks/context-vxworks.h
@@ -20,8 +20,8 @@
#ifndef D_context_vxworks
#define D_context_vxworks
-#include <config.h>
-#include <framework/context.h>
+#include <tcf/config.h>
+#include <tcf/framework/context.h>
extern int get_context_task_id(Context * ctx);
diff --git a/agent/tcf/system/Windows/context-win32.c b/agent/tcf/system/Windows/context-win32.c
index 9da05678..e85cbb11 100644
--- a/agent/tcf/system/Windows/context-win32.c
+++ b/agent/tcf/system/Windows/context-win32.c
@@ -17,7 +17,7 @@
* This module handles process/thread OS contexts and their state machine.
*/
-#include <config.h>
+#include <tcf/config.h>
#if defined(WIN32)
@@ -27,19 +27,19 @@
#include <assert.h>
#include <errno.h>
#include <signal.h>
-#include <framework/context.h>
-#include <framework/events.h>
-#include <framework/errors.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <framework/waitpid.h>
-#include <framework/signames.h>
-#include <services/breakpoints.h>
-#include <services/memorymap.h>
-#include <services/runctrl.h>
-#include <system/Windows/context-win32.h>
-#include <system/Windows/regset.h>
-#include <system/Windows/windbgcache.h>
+#include <tcf/framework/context.h>
+#include <tcf/framework/events.h>
+#include <tcf/framework/errors.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/waitpid.h>
+#include <tcf/framework/signames.h>
+#include <tcf/services/breakpoints.h>
+#include <tcf/services/memorymap.h>
+#include <tcf/services/runctrl.h>
+#include <tcf/system/Windows/context-win32.h>
+#include <tcf/system/Windows/regset.h>
+#include <tcf/system/Windows/windbgcache.h>
#if !defined(USE_HW_BPS)
# define USE_HW_BPS 1
@@ -123,7 +123,7 @@ static unsigned exception_handler_cnt = 0;
static MemoryErrorInfo mem_err_info;
-#include <system/pid-hash.h>
+#include <tcf/system/pid-hash.h>
#define EXCEPTION_DEBUGGER_IO 0x406D1388
diff --git a/agent/tcf/system/Windows/context-win32.h b/agent/tcf/system/Windows/context-win32.h
index b6a457fa..8c49751e 100644
--- a/agent/tcf/system/Windows/context-win32.h
+++ b/agent/tcf/system/Windows/context-win32.h
@@ -20,8 +20,8 @@
#ifndef D_context_win32
#define D_context_win32
-#include <config.h>
-#include <framework/context.h>
+#include <tcf/config.h>
+#include <tcf/framework/context.h>
extern HANDLE get_context_handle(Context * ctx);
extern HANDLE get_context_file_handle(Context * ctx);
diff --git a/agent/tcf/system/Windows/pthreads-win32.c b/agent/tcf/system/Windows/pthreads-win32.c
index 82c9204b..3f019c93 100644
--- a/agent/tcf/system/Windows/pthreads-win32.c
+++ b/agent/tcf/system/Windows/pthreads-win32.c
@@ -13,14 +13,14 @@
* Wind River Systems - initial API and implementation
*******************************************************************************/
-#include <config.h>
+#include <tcf/config.h>
#if defined(WIN32) && !defined(DISABLE_PTHREADS_WIN32)
#include <assert.h>
-#include <framework/myalloc.h>
-#include <framework/errors.h>
-#include <system/Windows/pthreads-win32.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/framework/errors.h>
+#include <tcf/system/Windows/pthreads-win32.h>
/*********************************************************************
Support of pthreads on Windows is implemented according to
diff --git a/agent/tcf/system/Windows/windbgcache.c b/agent/tcf/system/Windows/windbgcache.c
index 0d2d0ce5..e6f094f2 100644
--- a/agent/tcf/system/Windows/windbgcache.c
+++ b/agent/tcf/system/Windows/windbgcache.c
@@ -18,7 +18,7 @@
* Current implementation delegates all its job to DBGHELP.DLL.
*/
-#include <config.h>
+#include <tcf/config.h>
#if defined(WIN32) && !ENABLE_ELF
# define ENABLE_PE_Symbols ((SERVICE_LineNumbers && !ENABLE_LineNumbersProxy) || (SERVICE_Symbols && !ENABLE_SymbolsProxy))
@@ -33,11 +33,11 @@
#include <assert.h>
#include <stdio.h>
#include <wchar.h>
-#include <system/Windows/windbgcache.h>
-#include <system/Windows/context-win32.h>
-#include <framework/trace.h>
-#include <framework/myalloc.h>
-#include <services/memorymap.h>
+#include <tcf/system/Windows/windbgcache.h>
+#include <tcf/system/Windows/context-win32.h>
+#include <tcf/framework/trace.h>
+#include <tcf/framework/myalloc.h>
+#include <tcf/services/memorymap.h>
static HINSTANCE dbghelp_dll = NULL;
diff --git a/agent/tcf/system/Windows/windbgcache.h b/agent/tcf/system/Windows/windbgcache.h
index ecca5497..670cad7d 100644
--- a/agent/tcf/system/Windows/windbgcache.h
+++ b/agent/tcf/system/Windows/windbgcache.h
@@ -20,7 +20,7 @@
#ifndef D_windbgcache
#define D_windbgcache
-#include <config.h>
+#include <tcf/config.h>
#if defined(WIN32)

Back to the top