target: don't implicitly include "algorithm.h"

Most files in the tree seem to have ended up including this,
and *quite* needlessly ... only code implementing or using
downloadable algorithms actually needs these declarations.

So take it out of the header files which included it, and put
it in files which use it ... reduce needless interdependencies.

Also: "algorithm.h" doesn't need to include "types.h" again;
it already comes from a different header.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

16 files changed, 18 insertions, 5 deletions

diff --git a/src/flash/aduc702x.c b/src/flash/aduc702x.c
index c2a18848..643705ca 100644
--- a/src/flash/aduc702x.c
+++ b/src/flash/aduc702x.c
@@ -27,6 +27,7 @@
 #include "armv4_5.h"
 #include "binarybuffer.h"
 #include "time_support.h"
+#include "algorithm.h"
 
 
 static int aduc702x_build_sector_list(struct flash_bank *bank);
diff --git a/src/flash/arm_nandio.c b/src/flash/arm_nandio.c
index 63eb0413..81697fa5 100644
--- a/src/flash/arm_nandio.c
+++ b/src/flash/arm_nandio.c
@@ -26,6 +26,7 @@
 
 #include "arm_nandio.h"
 #include "armv4_5.h"
+#include "algorithm.h"
 
 
 /*
@@ -43,8 +44,8 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
 {
 	struct target		*target = nand->target;
 	struct armv4_5_algorithm	algo;
-	struct arm	*armv4_5 = target->arch_info;
-	struct reg_param		reg_params[3];
+	struct arm		*armv4_5 = target->arch_info;
+	struct reg_param	reg_params[3];
 	uint32_t		target_buf;
 	uint32_t		exit = 0;
 	int			retval;
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 17f5c32b..c0ad50dd 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -27,6 +27,7 @@
 #include "non_cfi.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 #define CFI_MAX_BUS_WIDTH	4
diff --git a/src/flash/ecos.c b/src/flash/ecos.c
index 0525fbe3..c12ed9d2 100644
--- a/src/flash/ecos.c
+++ b/src/flash/ecos.c
@@ -24,6 +24,7 @@
 #include "flash.h"
 #include "embeddedice.h"
 #include "image.h"
+#include "algorithm.h"
 
 
 #if 0
diff --git a/src/flash/lpc2000.c b/src/flash/lpc2000.c
index df1f0824..09bb13f2 100644
--- a/src/flash/lpc2000.c
+++ b/src/flash/lpc2000.c
@@ -29,6 +29,7 @@
 #include "armv4_5.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 /* flash programming support for NXP LPC17xx and LPC2xxx devices
diff --git a/src/flash/lpc2900.c b/src/flash/lpc2900.c
index 556a1512..35f15070 100644
--- a/src/flash/lpc2900.c
+++ b/src/flash/lpc2900.c
@@ -27,6 +27,7 @@
 #include "flash.h"
 #include "binarybuffer.h"
 #include "armv4_5.h"
+#include "algorithm.h"
 
 
 /* 1024 bytes */
diff --git a/src/flash/stellaris.c b/src/flash/stellaris.c
index 56762d16..7b946754 100644
--- a/src/flash/stellaris.c
+++ b/src/flash/stellaris.c
@@ -31,6 +31,7 @@
 #include "stellaris.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 #define DID0_VER(did0) ((did0 >> 28)&0x07)
diff --git a/src/flash/stm32x.c b/src/flash/stm32x.c
index 7ac06a68..70727158 100644
--- a/src/flash/stm32x.c
+++ b/src/flash/stm32x.c
@@ -27,6 +27,7 @@
 #include "stm32x.h"
 #include "armv7m.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 static int stm32x_mass_erase(struct flash_bank *bank);
diff --git a/src/flash/str7x.c b/src/flash/str7x.c
index 71709bb0..19ee160e 100644
--- a/src/flash/str7x.c
+++ b/src/flash/str7x.c
@@ -27,6 +27,7 @@
 #include "str7x.h"
 #include "armv4_5.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 struct str7x_mem_layout mem_layout_str7bank0[] = {
diff --git a/src/flash/str9x.c b/src/flash/str9x.c
index 1506cb59..870871cc 100644
--- a/src/flash/str9x.c
+++ b/src/flash/str9x.c
@@ -29,6 +29,7 @@
 
 #include "str9x.h"
 #include "arm966e.h"
+#include "algorithm.h"
 
 
 static uint32_t bank1start = 0x00080000;
diff --git a/src/target/algorithm.h b/src/target/algorithm.h
index 80f081db..abb8ecfc 100644
--- a/src/target/algorithm.h
+++ b/src/target/algorithm.h
@@ -20,8 +20,6 @@
 #ifndef ALGORITHM_H
 #define ALGORITHM_H
 
-#include "types.h"
-
 enum param_direction
 {
 	PARAM_IN,
diff --git a/src/target/arm11.c b/src/target/arm11.c
index f4e2c0d5..cdeb4200 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -33,6 +33,7 @@
 #include "arm_simulator.h"
 #include "time_support.h"
 #include "target_type.h"
+#include "algorithm.h"
 
 
 #if 0
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index b07111eb..76c79c3a 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -36,6 +36,7 @@
 #include "arm7_9_common.h"
 #include "time_support.h"
 #include "arm_simulator.h"
+#include "algorithm.h"
 
 
 /**
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 47b32add..e6e0bd7e 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -31,6 +31,7 @@
 #include "breakpoints.h"
 #include "arm_disassembler.h"
 #include "binarybuffer.h"
+#include "algorithm.h"
 
 
 char* armv4_5_core_reg_list[] =
diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 6c6a9ec6..3f9e7f55 100644
--- a/src/target/armv7m.c
+++ b/src/target/armv7m.c
@@ -36,6 +36,7 @@
 
 #include "breakpoints.h"
 #include "armv7m.h"
+#include "algorithm.h"
 
 #define ARRAY_SIZE(x)	((int)(sizeof(x)/sizeof((x)[0])))
 
diff --git a/src/target/target.h b/src/target/target.h
index 06105ee6..75bc4f02 100644
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -28,7 +28,6 @@
 
 #include <stddef.h>
 
-#include "algorithm.h"
 #include "command.h"
 
 struct reg;
@@ -36,6 +35,8 @@ struct trace;
 struct command_context;
 struct breakpoint;
 struct watchpoint;
+struct mem_param;
+struct reg_param;
 
 
 /**