Index: interface.cpp
===================================================================
--- interface.cpp	(revision 9914)
+++ interface.cpp	(working copy)
@@ -606,7 +606,7 @@
     p_intf->p_sys->i_first_hotkey_event = wxID_HIGHEST + 7000;
     p_intf->p_sys->i_hotkeys = i_hotkeys;
 
-    wxAcceleratorEntry p_entries[i_hotkeys];
+    wxAcceleratorEntry *p_entries =  new wxAcceleratorEntry[i_hotkeys];
 
     /* Setup the hotkeys as accelerators */
     for( int i = 0; i < i_hotkeys; i++ )
@@ -633,6 +633,7 @@
         SetAcceleratorTable( accel );
         msg_Dbg( p_intf, "accelerator table loaded" );
     }
+	delete p_entries;
 }
 
 /*****************************************************************************
Index: video.cpp
===================================================================
--- video.cpp	(revision 9914)
+++ video.cpp	(working copy)
@@ -48,34 +48,6 @@
     SetStayOnTop_Event,
 };
 
-class VideoWindow: public wxWindow
-{
-public:
-    /* Constructor */
-    VideoWindow( intf_thread_t *_p_intf, wxWindow *p_parent );
-    virtual ~VideoWindow();
-
-    void *GetWindow( vout_thread_t *p_vout, int *, int *,
-                     unsigned int *, unsigned int * );
-    void ReleaseWindow( void * );
-    int  ControlWindow( void *, int, va_list );
-
-private:
-    intf_thread_t *p_intf;
-    vout_thread_t *p_vout;
-    wxWindow *p_parent;
-    vlc_mutex_t lock;
-    vlc_bool_t b_shown;
-
-    wxWindow *p_child_window;
-
-    void UpdateSize( wxSizeEvent & );
-    void UpdateHide( wxSizeEvent & );
-    void OnControlEvent( wxCommandEvent & );
-
-    DECLARE_EVENT_TABLE();
-};
-
 DEFINE_LOCAL_EVENT_TYPE( wxEVT_VLC_VIDEO );
 
 BEGIN_EVENT_TABLE(VideoWindow, wxWindow)
@@ -90,7 +62,7 @@
  *****************************************************************************/
 wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent )
 {
-    return new VideoWindow::VideoWindow( p_intf, p_parent );
+    return new class VideoWindow( p_intf, p_parent );
 }
 
 /*****************************************************************************
Index: wxwindows.h
===================================================================
--- wxwindows.h	(revision 9914)
+++ wxwindows.h	(working copy)
@@ -148,10 +148,37 @@
  * Prototypes
  *****************************************************************************/
 wxArrayString SeparateEntries( wxString );
-wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
 wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent );
 wxWindow *CreateDialogsProvider( intf_thread_t *p_intf, wxWindow *p_parent );
 
+class VideoWindow: public wxWindow
+{
+public:
+    /* Constructor */
+    VideoWindow( intf_thread_t *_p_intf, wxWindow *p_parent );
+    virtual ~VideoWindow();
+
+    void *GetWindow( vout_thread_t *p_vout, int *, int *,
+                     unsigned int *, unsigned int * );
+    void ReleaseWindow( void * );
+    int  ControlWindow( void *, int, va_list );
+
+private:
+    intf_thread_t *p_intf;
+    vout_thread_t *p_vout;
+    wxWindow *p_parent;
+    vlc_mutex_t lock;
+    vlc_bool_t b_shown;
+
+    wxWindow *p_child_window;
+
+    void UpdateSize( wxSizeEvent & );
+    void UpdateHide( wxSizeEvent & );
+    void OnControlEvent( wxCommandEvent & );
+
+    DECLARE_EVENT_TABLE();
+};
+
 namespace wxvlc
 {
 class Interface;
Index: bookmarks.cpp
===================================================================
--- bookmarks.cpp	(revision 9914)
+++ bookmarks.cpp	(working copy)
@@ -296,7 +296,7 @@
  *****************************************************************************/
 wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent )
 {
-    return new BookmarksDialog::BookmarksDialog( p_intf, p_parent );
+	return new class BookmarksDialog( p_intf, p_parent );
 }
 
 void BookmarksDialog::Update()
@@ -545,8 +545,7 @@
 static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
                             vlc_value_t oval, vlc_value_t nval, void *param )
 {
-    BookmarksDialog::BookmarksDialog *p_dialog =
-        (BookmarksDialog::BookmarksDialog *)param;
+    class BookmarksDialog *p_dialog = (class BookmarksDialog *)param;
 
     wxCommandEvent bookmarks_event( wxEVT_BOOKMARKS, 0 );
     p_dialog->AddPendingEvent( bookmarks_event );
