diff --git a/Makefile b/Makefile
index 5d6cea2..c659203 100644
--- a/Makefile
+++ b/Makefile
@@ -30,10 +30,10 @@
 # Building libmonda requires a PIC-enabled OCaml toolchain (configure
 # with -fPIC).
 
-#GDB_ROOT=$(PREFIX)/libexec/gdb-ocaml.7.11/src
-#OCAML_ROOT=$(PREFIX)
-GDB_ROOT=/mnt/local/sda1/mshinwell/mshinwell-gdb
-OCAML_ROOT=/mnt/local/sda1/mshinwell/mshinwell-ocaml2-install
+GDB_ROOT=$(PREFIX)/libexec/gdb-ocaml.7.11/src
+OCAML_ROOT=$(PREFIX)
+#GDB_ROOT=/mnt/local/sda1/mshinwell/mshinwell-gdb
+#OCAML_ROOT=/mnt/local/sda1/mshinwell/mshinwell-ocaml2-install
 
 OCAMLOPT=$(OCAML_ROOT)/bin/ocamlopt -verbose -I +compiler-libs -I ./src \
   -g -fPIC -I ./gdb_backend
diff --git a/gdb_backend/from_gdb.c b/gdb_backend/from_gdb.c
index 3d8fb29..75c0894 100644
--- a/gdb_backend/from_gdb.c
+++ b/gdb_backend/from_gdb.c
@@ -42,6 +42,8 @@
 #include "stack.h"
 #include "symtab.h"
 #include "valprint.h"
+#include "value.h"
+#include "c-lang.h"
 
 #include <assert.h>
 #include <string.h>
@@ -124,7 +126,7 @@ monda_val_print (struct type* type, const gdb_byte* valaddr,
       fflush(stderr);
       */
       c_val_print(type, valaddr, embedded_offset, address, stream, recurse,
-                  val, options, depth);
+                  val, options/*, depth*/);
     }
     else
 #endif
@@ -157,7 +159,7 @@ monda_val_print (struct type* type, const gdb_byte* valaddr,
         fflush(stderr);
         */
         c_val_print(type, valaddr, embedded_offset, address, stream, recurse,
-          val, options, depth);
+          val, options/*, depth*/);
       }
     }
   }
diff --git a/gdb_backend/to_gdb.c b/gdb_backend/to_gdb.c
index 3b33ada..749c1d1 100644
--- a/gdb_backend/to_gdb.c
+++ b/gdb_backend/to_gdb.c
@@ -35,6 +35,8 @@
 #include "defs.h"
 #include "symtab.h"
 #include "value.h"
+#include "stack.h"
+#include "target/target.h"
 
 /* Remember: No gdb exceptions may escape from the functions called from OCaml
    in this file.  (See from_gdb.c for an explanation.)