4 files changed, 9 insertions, 9 deletions
diff --git a/javascript/js.c b/javascript/jsapi.c
index 833e01785..6f5b510ef 100644
--- a/javascript/js.c
+++ b/javascript/jsapi.c
@@ -19,7 +19,7 @@
 #include "mozjs/jsapi.h"
 
 #include "content/content.h"
-#include "javascript/global.h"
+#include "javascript/jsapi.h"
 #include "javascript/js.h"
 
 #include "utils/log.h"
@@ -50,7 +50,7 @@ void js_finalise(void)
 /* The error reporter callback. */
 static void js_reportError(JSContext *cx, const char *message, JSErrorReport *report)
 {
-	LOG(("%s:%u:%s\n",
+	LOG(("%s:%u:%s",
             report->filename ? report->filename : "<no filename>",
             (unsigned int) report->lineno,
 	     message));
@@ -131,7 +131,7 @@ jsobject *js_newcompartment(jscontext *ctx, struct content* c)
 
 	JS_SetContextPrivate(cx, c); /* private pointer to content */
 
-	js_new_globalfunc(cx, global);
+	jsapi_new_globalfunc(cx, global);
 
 	/* Populate the global object with the standard globals, like
 	   Object and Array. */
diff --git a/javascript/global.h b/javascript/jsapi.h
index 329c82c8d..ce2051148 100644
--- a/javascript/global.h
+++ b/javascript/jsapi.h
@@ -17,12 +17,12 @@
  */
 
 /** \file
- * spidermonkey engine global functions.
+ * spidermonkey jsapi bindings.
  */
 
-#ifndef _NETSURF_JAVASCRIPT_GLOBAL_H_
-#define _NETSURF_JAVASCRIPT_GLOBAL_H_
+#ifndef _NETSURF_JAVASCRIPT_JSAPI_H_
+#define _NETSURF_JAVASCRIPT_JSAPI_H_
 
-bool js_new_globalfunc(JSContext *cx, JSObject *global);
+bool jsapi_new_globalfunc(JSContext *cx, JSObject *global);
 
 #endif
diff --git a/javascript/global.c b/javascript/jsapi/global.c
index c2033d4fc..b86400428 100644
--- a/javascript/global.c
+++ b/javascript/jsapi/global.c
@@ -19,7 +19,7 @@
 #include "mozjs/jsapi.h"
 
 #include "content/content.h"
-#include "javascript/global.h"
+#include "javascript/jsapi.h"
 #include "utils/log.h"
 
 static JSBool jsalert(JSContext *cx, uintN argc, jsval *vp)
@@ -54,7 +54,7 @@ static JSFunctionSpec global_functions[] =
 	JS_FS_END
 };
 
-bool js_new_globalfunc(JSContext *cx, JSObject *global)
+bool jsapi_new_globalfunc(JSContext *cx, JSObject *global)
 {
 	return JS_DefineFunctions(cx, global, global_functions);
 }
diff --git a/javascript/nojs.c b/javascript/none.c
index ec0ccc0f8..ec0ccc0f8 100644
--- a/javascript/nojs.c
+++ b/javascript/none.c