From 0b6c73ae8398964268d2df6f87347d9c59b04858 Mon Sep 17 00:00:00 2001
From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Mon, 11 May 2009 04:25:09 +0000
Subject: [PATCH] Audit and eliminate redundant #include directives in
 src/{pld,svf,xsvf}.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1710 b42882b7-edfa-0310-969c-e2dbd0fdcd60
---
 src/pld/pld.c        | 13 -------------
 src/pld/virtex2.c    |  7 +------
 src/pld/virtex2.h    |  4 +---
 src/pld/xilinx_bit.c |  8 --------
 src/svf/svf.c        | 12 ------------
 src/xsvf/xsvf.c      | 13 +------------
 6 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/src/pld/pld.c b/src/pld/pld.c
index 39571400..48638b92 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -21,23 +21,10 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
 #include "pld.h"
-
-#include "jtag.h"
-#include "command.h"
 #include "log.h"
 #include "time_support.h"
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <sys/time.h>
-#include <time.h>
 
 /* pld drivers
  */
diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c
index ae03572f..d9c26760 100644
--- a/src/pld/virtex2.c
+++ b/src/pld/virtex2.c
@@ -22,14 +22,9 @@
 #endif
 
 #include "virtex2.h"
-
-#include "pld.h"
 #include "xilinx_bit.h"
-#include "command.h"
-#include "log.h"
-#include "jtag.h"
+#include "pld.h"
 
-#include <stdlib.h>
 
 int virtex2_register_commands(struct command_context_s *cmd_ctx);
 int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct pld_device_s *pld_device);
diff --git a/src/pld/virtex2.h b/src/pld/virtex2.h
index 7bc6c5eb..65ad74ab 100644
--- a/src/pld/virtex2.h
+++ b/src/pld/virtex2.h
@@ -20,9 +20,7 @@
 #ifndef VIRTEX2_H
 #define VIRTEX2_H
 
-#include "types.h"
-#include "pld.h"
-#include "xilinx_bit.h"
+#include "jtag.h"
 
 typedef struct virtex2_pld_device_s
 {
diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 35cf2f9f..ef3c1e65 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -22,19 +22,11 @@
 #endif
 
 #include "xilinx_bit.h"
-
 #include "pld.h"
 #include "log.h"
 
-#include <stdlib.h>
-#include <unistd.h>
 #include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
 
-#include <sys/time.h>
-#include <time.h>
 
 int read_section(FILE *input_file, int length_size, char section, u32 *buffer_length, u8 **buffer) 
 {
diff --git a/src/svf/svf.c b/src/svf/svf.c
index ea60671c..a68cfaec 100644
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -33,21 +33,9 @@
 #endif
 
 #include "svf.h"
-
 #include "jtag.h"
-#include "command.h"
-#include "log.h"
 #include "time_support.h"
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-
-#include <sys/time.h>
-#include <time.h>
 
 // SVF command
 typedef enum
diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index e9b0a008..b62de349 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -42,20 +42,9 @@
 #endif
 
 #include "xsvf.h"
-
 #include "jtag.h"
-#include "command.h"
-#include "log.h"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <assert.h>
 
-#include <sys/time.h>
-#include <time.h>
+#include <assert.h>
 
 
 /* XSVF commands, from appendix B of xapp503.pdf  */
-- 
2.39.5