clean up imports a bit

diff --git a/src/common.h b/src/common.h
index 842d51d..75541ee 100644 (file)
--- a/src/common.h
+++ b/src/common.h
@@ -3,5 +3,7 @@
 
 #include "global.h"
 #include "mem/mem.h"
+#include "data/value.h"
+#include <string.h> // for memcpy/memset
 
 #endif

diff --git a/src/data/hashtable.c b/src/data/hashtable.c
index 23a8505..89244f6 100644 (file)
--- a/src/data/hashtable.c
+++ b/src/data/hashtable.c
@@ -1,7 +1,6 @@
 #include "data/hashtable.h"
 
 #include "data/string.h"
-#include "data/value.h"
 
 #define HASHES_PER_BLOCK 256
 #define INLINE_TABLE_LENGTH 64

diff --git a/src/data/string.c b/src/data/string.c
index c4b07d7..db710d7 100644 (file)
--- a/src/data/string.c
+++ b/src/data/string.c
@@ -1,9 +1,7 @@
 #include "data/string.h"
 
-#include "mem/mem.h"
 #include "gc/gcinfo.h"
 #include "gc/rc.h"
-#include <string.h>
 
 #define INLINE_BUFFER_SIZE 256
 #define STRINGS_PER_BLOCK 256

diff --git a/src/data/symbol.c b/src/data/symbol.c
index 666a954..f2b5bf2 100644 (file)
--- a/src/data/symbol.c
+++ b/src/data/symbol.c
@@ -2,8 +2,6 @@
 
 #include "data/string.h"
 #include "data/hashtable.h"
-#include <string.h>
-#include "mem/mem.h"
 
 #define NAME_BLOCK_SIZE 4096
 

diff --git a/src/parse/filereader.c b/src/parse/filereader.c
index 38a7196..b96dce7 100644 (file)
--- a/src/parse/filereader.c
+++ b/src/parse/filereader.c
@@ -1,7 +1,5 @@
 #include "filereader.h"
 
-#include "mem/mem.h"
-
 #define N_READBACK_LINES 3
 
 /* reads in files a line at a time and provides the file data one character

diff --git a/src/parse/lexer.c b/src/parse/lexer.c
index f679acd..569d1ca 100644 (file)
--- a/src/parse/lexer.c
+++ b/src/parse/lexer.c
@@ -1,8 +1,5 @@
 #include "lexer.h"
 
-#include <string.h>
-#include "mem/mem.h"
-
 /* OK so this is a module that takes in a series of tokens output by the scanner and modifies
  * the token stream before it gets passed to the parser. In particular, this replaces the
  * spaces and newlines sent from the scanner with various configurations of parentheses and