TCF Agent: fixed inconsistent #include directives

4 files changed, 10 insertions, 9 deletions

diff --git a/agent/machine/a64/tcf/stack-crawl-a64.c b/agent/machine/a64/tcf/stack-crawl-a64.c
index 68227e8e..cefd1a5b 100644
--- a/agent/machine/a64/tcf/stack-crawl-a64.c
+++ b/agent/machine/a64/tcf/stack-crawl-a64.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014, 2017 Xilinx, Inc. and others.
+ * Copyright (c) 2014-2018 Xilinx, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v1.0 which accompany this distribution.
@@ -22,12 +22,9 @@
 #if ENABLE_DebugContext
 
 #include <assert.h>
-#include <tcf/framework/errors.h>
-#include <tcf/framework/cpudefs.h>
 #include <tcf/framework/context.h>
 #include <tcf/framework/myalloc.h>
 #include <tcf/framework/trace.h>
-#include <tcf/services/stacktrace.h>
 #include <machine/a64/tcf/stack-crawl-a64.h>
 
 #define MAX_INST 200
diff --git a/agent/machine/a64/tcf/stack-crawl-a64.h b/agent/machine/a64/tcf/stack-crawl-a64.h
index dfdf2c74..e09e45b2 100644
--- a/agent/machine/a64/tcf/stack-crawl-a64.h
+++ b/agent/machine/a64/tcf/stack-crawl-a64.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2014 Xilinx, Inc. and others.
+ * Copyright (c) 2014-2018 Xilinx, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v1.0 which accompany this distribution.
@@ -20,6 +20,9 @@
 #ifndef D_stack_crawl_a64
 #define D_stack_crawl_a64
 
+#include <tcf/config.h>
+#include <tcf/framework/cpudefs.h>
+
 extern int crawl_stack_frame_a64(StackFrame * frame, StackFrame * down);
 
 #endif /* D_stack_crawl_a64 */
diff --git a/agent/machine/arm/tcf/stack-crawl-arm.c b/agent/machine/arm/tcf/stack-crawl-arm.c
index 5eb11fc8..036490aa 100644
--- a/agent/machine/arm/tcf/stack-crawl-arm.c
+++ b/agent/machine/arm/tcf/stack-crawl-arm.c
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2017 Xilinx, Inc. and others.
+ * Copyright (c) 2013-2018 Xilinx, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v1.0 which accompany this distribution.
@@ -39,8 +39,6 @@
 #if ENABLE_DebugContext
 
 #include <assert.h>
-#include <tcf/framework/errors.h>
-#include <tcf/framework/cpudefs.h>
 #include <tcf/framework/context.h>
 #include <tcf/framework/myalloc.h>
 #include <tcf/framework/trace.h>
diff --git a/agent/machine/arm/tcf/stack-crawl-arm.h b/agent/machine/arm/tcf/stack-crawl-arm.h
index c6cb7490..32983fb5 100644
--- a/agent/machine/arm/tcf/stack-crawl-arm.h
+++ b/agent/machine/arm/tcf/stack-crawl-arm.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013, 2015 Xilinx, Inc. and others.
+ * Copyright (c) 2013-2018 Xilinx, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v1.0 which accompany this distribution.
@@ -20,6 +20,9 @@
 #ifndef D_stack_crawl_arm
 #define D_stack_crawl_arm
 
+#include <tcf/config.h>
+#include <tcf/framework/cpudefs.h>
+
 /* ARMv7-A, ARMv7-R, AArch32 */
 extern int crawl_stack_frame_arm(StackFrame * frame, StackFrame * down);