diff --git a/Tools/javascript/Makefile.in b/Tools/javascript/Makefile.in
index d1a5e1c98..f18cfa65d 100644
--- a/Tools/javascript/Makefile.in
+++ b/Tools/javascript/Makefile.in
@@ -47,7 +47,7 @@ JS_INTERPRETER_SRC = javascript.cxx js_shell.cxx $(JS_INTERPRETER_SRC_JSC) $(JS_
 JS_INTERPRETER_OBJS = $(JS_INTERPRETER_SRC:.cxx=.o)
 
 %.o: %.cxx
-	$(JSCXX) $(JS_INTERPRETER_DEFINES) -g $(JSINCLUDES) -o $@ -c $<
+	$(JSCXX) $(JS_INTERPRETER_DEFINES) $(CFLAGS) $(JSINCLUDES) -o $@ -c $<
 
 javascript: $(JS_INTERPRETER_OBJS)
 	$(JSCXX) $^ $(CFLAGS) -o javascript $(JSDYNAMICLINKING) $(LINKFLAGS)
diff --git a/Tools/javascript/js_shell.cxx b/Tools/javascript/js_shell.cxx
index 5890c922c..539b83d65 100644
--- a/Tools/javascript/js_shell.cxx
+++ b/Tools/javascript/js_shell.cxx
@@ -4,6 +4,7 @@
 #include <fstream>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #ifdef __GNUC__
 #ifdef __APPLE__
diff --git a/Tools/javascript/jsc_shell.cxx b/Tools/javascript/jsc_shell.cxx
index cf30d7bd7..292c4042b 100644
--- a/Tools/javascript/jsc_shell.cxx
+++ b/Tools/javascript/jsc_shell.cxx
@@ -64,9 +64,9 @@ bool JSCShell::InitializeEngine() {
   if(context == 0) return false;
   JSObjectRef globalObject = JSContextGetGlobalObject(context);
 
-
   // store this for later use
-  JSClassDefinition __shell_classdef__;
+  JSClassDefinition __shell_classdef__ = JSClassDefinition();
+
   JSClassRef __shell_class__ = JSClassCreate(&__shell_classdef__);
   JSObjectRef __shell__ = JSObjectMake(context, __shell_class__, 0);
   bool success = JSObjectSetPrivate(__shell__, (void*) (long) this);