diff --git a/beos/bitmap.cpp b/beos/bitmap.cpp
index 83dedf780..0dd8972d5 100644
--- a/beos/bitmap.cpp
+++ b/beos/bitmap.cpp
@@ -106,7 +106,7 @@ static inline void nsbeos_rgba_to_bgra(void *src, void *dst, int width, int heig
 
 void *bitmap_create(int width, int height, unsigned int state)
 {
-	CALLED();
+	//CALLED();
 	struct bitmap *bmp = (struct bitmap *)malloc(sizeof(struct bitmap));
 	if (bmp == NULL)
 		return NULL;
@@ -288,7 +288,7 @@ bool bitmap_save(void *vbitmap, const char *path, unsigned flags)
  * \param  vbitmap  a bitmap, as returned by bitmap_create()
  */
 void bitmap_modified(void *vbitmap) {
-	CALLED();
+	//CALLED();
 	struct bitmap *bitmap = (struct bitmap *)vbitmap;
 	// convert the shadow (ABGR) to into the primary bitmap
 	nsbeos_rgba_to_bgra(bitmap->shadow->Bits(), bitmap->primary->Bits(),
diff --git a/beos/fetch_rsrc.cpp b/beos/fetch_rsrc.cpp
index d841a1d3b..f7c99d7c4 100644
--- a/beos/fetch_rsrc.cpp
+++ b/beos/fetch_rsrc.cpp
@@ -198,11 +198,11 @@ static bool fetch_rsrc_process(struct fetch_rsrc_context *c)
 		uint8 c1, c2, c3, c4;
 		if (sscanf(params, "%c%c%c%c", &c1, &c2, &c3, &c4) > 3) {
 			type = c1 << 24 | c2 << 16 | c3 << 8 | c4;
-			printf("type:%4.4s\n", &type);
+			LOG(("fetch_rsrc: type:%4.4s\n", &type));
 		}
 	}
 
-	fprintf(stderr, "fetch_rsrc: 0x%08lx, %ld, '%s'\n", type, id, c->name);
+	LOG(("fetch_rsrc: 0x%08lx, %ld, '%s'\n", type, id, c->name));
 
 	bool found;
 	if (id)
@@ -334,7 +334,7 @@ static int find_app_resources()
 	char path[B_PATH_NAME_LENGTH];
 	if (nsbeos_find_app_path(path) < B_OK)
 		return B_ERROR;
-//fprintf(stderr, "loading resources from '%s'\n", path);
+	//fprintf(stderr, "loading resources from '%s'\n", path);
 
 	BFile file(path, B_READ_ONLY);
 	if (file.InitCheck() < 0)
diff --git a/beos/gui.cpp b/beos/gui.cpp
index dacdee909..bddd610a1 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -172,7 +172,7 @@ NSBrowserApplication::MessageReceived(BMessage *message)
 void
 NSBrowserApplication::ArgvReceived(int32 argc, char **argv)
 {
-	CALLED();
+	//CALLED();
 	NSBrowserWindow *win = nsbeos_find_last_window();
 	if (!win) {
 		return;
@@ -186,7 +186,7 @@ NSBrowserApplication::ArgvReceived(int32 argc, char **argv)
 void
 NSBrowserApplication::RefsReceived(BMessage *message)
 {
-	CALLED();
+	//CALLED();
 	DetachCurrentMessage();
 	NSBrowserWindow *win = nsbeos_find_last_window();
 	if (!win) {
@@ -325,7 +325,7 @@ image_id nsbeos_find_app_path(char *path)
 
 static char *find_resource(char *buf, const char *filename, const char *def)
 {
-	CALLED();
+	//CALLED();
 	const char *cdir = NULL;
 	status_t err;
 	BPath path;
@@ -388,7 +388,7 @@ static char *find_resource(char *buf, const char *filename, const char *def)
  */
 static void check_homedir(void)
 {
-	CALLED();
+	//CALLED();
 	status_t err;
 
 	BPath path;
@@ -423,14 +423,14 @@ nsurl *gui_get_resource_url(const char *path)
 		u << "beosdefault.css";
 	else
 		u << path;
-	fprintf(stderr, "%s(%s) -> '%s'\n", __FUNCTION__, path, u.String());
+	LOG(("(%s) -> '%s'\n", path, u.String()));
 	nsurl_create(u.String(), &url);
 	return url;
 }
 
 static void gui_init2(int argc, char** argv)
 {
-	CALLED();
+	//CALLED();
 	const char *addr = NETSURF_HOMEPAGE;
 
 	if (nsoption_charp(homepage_url) != NULL)
@@ -509,7 +509,7 @@ void gui_options_init_defaults(void)
 void gui_init(int argc, char** argv)
 {
 	char buf[PATH_MAX];
-	CALLED();
+	//CALLED();
 
 	if (pipe(sEventPipe) < 0)
 		return;
@@ -780,7 +780,7 @@ void gui_poll(bool active)
 
 void gui_quit(void)
 {
-	CALLED();
+	//CALLED();
 	urldb_save_cookies(nsoption_charp(cookie_jar));
 	urldb_save(nsoption_charp(url_file));
 	//options_save_tree(hotlist,nsoption_charp(hotlist_file),messages_get("TreeHotlist"));
diff --git a/beos/window.cpp b/beos/window.cpp
index 3e6b2f518..4bc9f2c51 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -1312,7 +1312,7 @@ void gui_window_update_box(struct gui_window *g, const struct rect *rect)
 
 bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
 {
-	CALLED();
+	//CALLED();
 	if (g->view == NULL)
 		return false;
 	if (!g->view->LockLooper())
@@ -1342,7 +1342,7 @@ bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
 
 void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
 {
-	CALLED();
+	//CALLED();
 	if (g->view == NULL)
 		return;
 	if (!g->view->LockLooper())
@@ -1384,7 +1384,7 @@ void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
 
 void gui_window_update_extent(struct gui_window *g)
 {
-	CALLED();
+	//CALLED();
 	if (!g->bw->current_content)
 		return;
 
@@ -1399,7 +1399,7 @@ void gui_window_update_extent(struct gui_window *g)
 	float y_prop = g->view->Bounds().Height() / y_max;
 	x_max -= g->view->Bounds().Width() + 1;
 	y_max -= g->view->Bounds().Height() + 1;
-printf("x_max = %f y_max = %f x_prop = %f y_prop = %f\n", x_max, y_max, x_prop, y_prop);
+	LOG(("x_max = %f y_max = %f x_prop = %f y_prop = %f\n", x_max, y_max, x_prop, y_prop));
 	if (g->view->ScrollBar(B_HORIZONTAL)) {
 		g->view->ScrollBar(B_HORIZONTAL)->SetRange(0, x_max);
 		g->view->ScrollBar(B_HORIZONTAL)->SetProportion(x_prop);