diff --git a/src/bw.cc b/src/bw.cc
index fc088cf..d133716 100644
--- a/src/bw.cc
+++ b/src/bw.cc
@@ -21,6 +21,7 @@
 #include "capi.hh"
 #include "uicmd.hh"
 
+BrowserWindow::~BrowserWindow()= default;
 
 /*
  * Local Data
diff --git a/src/bw.hh b/src/bw.hh
index 6980ee4..d482877 100644
--- a/src/bw.hh
+++ b/src/bw.hh
@@ -24,7 +24,7 @@
 
 
 /** Contains the specific data for a single window */
-typedef struct {
+struct BrowserWindow {
    /** Pointer to the UI object this bw belongs to */
    void *ui;
 
@@ -72,11 +72,15 @@ typedef struct {
 
    /* Zoom factor */
    float zoom;
-} BrowserWindow;
+
+   ~BrowserWindow();
+};
 
 
 #ifdef __cplusplus
 extern "C" {
+#else
+#error Browser Window is C++ now.
 #endif /* __cplusplus */