diff --git a/beos/fetch_rsrc.cpp b/beos/fetch_rsrc.cpp
index f696f18db..b771f7b2d 100644
--- a/beos/fetch_rsrc.cpp
+++ b/beos/fetch_rsrc.cpp
@@ -199,7 +199,7 @@ 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;
-			LOG("fetch_rsrc: type:%4.4s\n", &type);
+			LOG("fetch_rsrc: type:%4.4s\n", (char *)&type);
 		}
 	}
 
diff --git a/beos/font.h b/beos/font.h
index 75f0c3ac6..63909efcf 100644
--- a/beos/font.h
+++ b/beos/font.h
@@ -16,16 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
+ * \file
  * Beos font layout handling interface.
  */
 
 #ifndef NS_BEOS_FONT_H
 #define NS_BEOS_FONT_H
 
-#include <stdbool.h>
-
-#include "desktop/plotters.h"
+#include "desktop/plot_style.h"
 
 bool nsfont_paint(const plot_font_style_t *fstyle,
 		const char *string, size_t length,
diff --git a/beos/scaffolding.h b/beos/scaffolding.h
index 5d5907357..3fdca57f6 100644
--- a/beos/scaffolding.h
+++ b/beos/scaffolding.h
@@ -25,11 +25,8 @@
 #include <NetPositive.h>
 
 extern "C" {
-#include "desktop/plotters.h"
-
 struct hlcache_handle;
 struct nsurl;
-
 }
 
 typedef struct beos_scaffolding nsbeos_scaffolding;
diff --git a/beos/window.cpp b/beos/window.cpp
index 89fb7819c..62624f077 100644
--- a/beos/window.cpp
+++ b/beos/window.cpp
@@ -21,27 +21,28 @@
 #define __STDBOOL_H__	1
 #include <stdlib.h>
 #include <assert.h>
+
 extern "C" {
+#include "utils/nsoption.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
 #include "content/content.h"
 #include "content/urldb.h"
 #include "desktop/browser.h"
 #include "desktop/mouse.h"
-#include "utils/nsoption.h"
 #include "desktop/textinput.h"
-#include "utils/log.h"
-#include "utils/utf8.h"
-#include "utils/utils.h"
-#include "desktop/mouse.h"
+#include "desktop/plotters.h"
 #include "desktop/gui_window.h"
 #include "desktop/gui_clipboard.h"
 }
+
 #include "beos/about.h"
 #include "beos/window.h"
 #include "beos/font.h"
 #include "beos/gui.h"
 #include "beos/scaffolding.h"
 #include "beos/plotters.h"
-//#include "beos/schedule.h"
 
 #include <AppDefs.h>
 #include <BeBuild.h>
@@ -1092,7 +1093,10 @@ static 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;
-	LOG("x_max = %f y_max = %f x_prop = %f y_prop = %f\n", x_max, y_max, x_prop, y_prop);
+
+	LOG("x_max = %d y_max = %d 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);