Fix more compile errors
diff --git a/src/bc/num.c b/src/bc/num.c
index 8a3a4fe..74ecc71 100644
--- a/src/bc/num.c
+++ b/src/bc/num.c
@@ -74,8 +74,7 @@
static bool bc_num_strValid(const char* val, size_t base);
-static BcStatus bc_num_parseDecimal(BcNum *n, const char* val,
- size_t scale);
+static BcStatus bc_num_parseDecimal(BcNum *n, const char* val, size_t scale);
static BcStatus bc_num_parseLowBase(BcNum* n, const char* val,
size_t base, size_t scale);
static BcStatus bc_num_parseHighBase(BcNum* n, const char* val,
@@ -692,8 +691,7 @@
return true;
}
-static BcStatus bc_num_parseDecimal(BcNum* n, const char* val,
- size_t scale) {
+static BcStatus bc_num_parseDecimal(BcNum* n, const char* val, size_t scale) {
BcStatus status;
size_t len;
diff --git a/src/bc/parse.c b/src/bc/parse.c
index ef50923..88bb97e 100644
--- a/src/bc/parse.c
+++ b/src/bc/parse.c
@@ -52,10 +52,11 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
+#include <string.h>
-#include <bc/lex.h>
-#include <bc/parse.h>
-#include <bc/instructions.h>
+#include <lex.h>
+#include <parse.h>
+#include <instructions.h>
// This is an array that corresponds to token types. An entry is
// true if the token is valid in an expression, false otherwise.
diff --git a/src/bc/program.c b/src/bc/program.c
index f69c588..380516c 100644
--- a/src/bc/program.c
+++ b/src/bc/program.c
@@ -56,10 +56,10 @@
#include <arbprec/arbprec.h>
-#include <bc/io.h>
-#include <bc/program.h>
-#include <bc/parse.h>
-#include <bc/instructions.h>
+#include <io.h>
+#include <program.h>
+#include <parse.h>
+#include <instructions.h>
static const char* const bc_byte_fmt = "%02x";
diff --git a/src/bc/vector.c b/src/bc/vector.c
index 7f2d2db..98ee2a9 100644
--- a/src/bc/vector.c
+++ b/src/bc/vector.c
@@ -53,8 +53,8 @@
#include <stdlib.h>
#include <string.h>
-#include <bc/bc.h>
-#include <bc/vector.h>
+#include <bc.h>
+#include <vector.h>
static BcStatus bc_vec_expand(BcVec* vec);
diff --git a/src/bc/vm.c b/src/bc/vm.c
index 8324a90..ee8e248 100644
--- a/src/bc/vm.c
+++ b/src/bc/vm.c
@@ -57,9 +57,9 @@
#include <signal.h>
#include <unistd.h>
-#include <bc/bc.h>
-#include <bc/io.h>
-#include <bc/vm.h>
+#include <bc.h>
+#include <io.h>
+#include <vm.h>
static BcStatus bc_vm_execFile(BcVm* vm, int idx);
static BcStatus bc_vm_execStdin(BcVm* vm);
diff --git a/src/main.c b/src/main.c
index 2085cc4..7a48e1e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -56,7 +56,7 @@
#include <getopt.h>
-#include <bc/bc.h>
+#include <bc.h>
static const struct option bc_opts[] = {