1 files changed, 33 insertions, 21 deletions

diff --git a/beos/window.h b/beos/window.h
index 0aec92ff1..e00b37926 100644
--- a/beos/window.h
+++ b/beos/window.h
@@ -19,49 +19,61 @@
 #ifndef NETSURF_BEOS_WINDOW_H
 #define NETSURF_BEOS_WINDOW_H 1
 
-extern "C" {
-#include "content/content.h"
-#include "desktop/browser.h"
-}
-#include "beos/scaffolding.h"
-
 extern struct gui_window_table *beos_window_table;
+extern struct gui_clipboard_table *beos_clipboard_table;
+
+struct gui_window;
+struct browser_window;
+struct beos_scaffolding;
 
 class NSBrowserFrameView : public BView {
 public:
-		NSBrowserFrameView(BRect frame, struct gui_window *gui);
-virtual	~NSBrowserFrameView();
+	NSBrowserFrameView(BRect frame, struct gui_window *gui);
+	virtual	~NSBrowserFrameView();
 
-virtual void	MessageReceived(BMessage *message);
-virtual void	Draw(BRect updateRect);
+	virtual void MessageReceived(BMessage *message);
+	virtual void Draw(BRect updateRect);
 
-//virtual void	FrameMoved(BPoint new_location);
-virtual void	FrameResized(float new_width, float new_height);
+        //virtual void FrameMoved(BPoint new_location);
+	virtual void FrameResized(float new_width, float new_height);
 
-virtual void	KeyDown(const char *bytes, int32 numBytes);
-virtual void	MouseDown(BPoint where);
-virtual void	MouseUp(BPoint where);
-virtual void	MouseMoved(BPoint where, uint32 transit, const BMessage *msg);
+	virtual void KeyDown(const char *bytes, int32 numBytes);
+	virtual void MouseDown(BPoint where);
+	virtual void MouseUp(BPoint where);
+	virtual void MouseMoved(BPoint where, uint32 transit, const BMessage *msg);
 
 private:
 	struct gui_window *fGuiWindow;
 };
 
+/**
+ * Process beos messages into browser operations.
+ *
+ * \param message The beos message to process.
+ */
 void nsbeos_dispatch_event(BMessage *message);
 
-
+/**
+ * Cause all windows to be reflowed.
+ */
 void nsbeos_reflow_all_windows(void);
 
-nsbeos_scaffolding *nsbeos_get_scaffold(struct gui_window *g);
+/**
+ * Get containing scaffold of a beos gui window
+ *
+ * \param g gui window to find scaffold of.
+ * \return The containing scaffold.
+ */
+struct beos_scaffolding *nsbeos_get_scaffold(struct gui_window *g);
+
 struct browser_window *nsbeos_get_browser_for_gui(struct gui_window *g);
 
 float nsbeos_get_scale_for_gui(struct gui_window *g);
+
 int nsbeos_gui_window_update_targets(struct gui_window *g);
+
 void nsbeos_window_destroy_browser(struct gui_window *g);
 
 struct browser_window *nsbeos_get_browser_window(struct gui_window *g);
 
-void gui_get_clipboard(char **buffer, size_t *length);
-void gui_set_clipboard(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles);
-
 #endif /* NETSURF_BEOS_WINDOW_H */