diff --git a/demos/bombs/game.h b/demos/bombs/game.h
index 0f062c6027..0463ddfd25 100644
--- a/demos/bombs/game.h
+++ b/demos/bombs/game.h
@@ -27,17 +27,17 @@ public:
     {
         m_width = m_height = 0;
         m_field = NULL;
-    };
+    }
 
     ~BombsGame();
 
-    int GetWidth() const { return m_width; };
-    int GetHeight() const { return m_height; };
+    int GetWidth() const { return m_width; }
+    int GetHeight() const { return m_height; }
 
     int Get(int x, int y) const
     {
         return m_field[x+y*m_width];
-    };
+    }
 
     int IsFocussed(int x, int y) const
     {
@@ -47,42 +47,42 @@ public:
     int IsHidden(int x, int y) const
     {
         return Get(x,y) & BG_HIDDEN;
-    };
+    }
 
     int IsMarked(int x, int y) const
     {
         return Get(x,y) & BG_MARKED;
-    };
+    }
 
     int IsBomb(int x, int y) const
     {
         return Get(x,y) & BG_BOMB;
-    };
+    }
 
     int IsExploded(int x, int y) const
     {
         return Get(x,y) & BG_EXPLODED;
-    };
+    }
 
     int IsSelected(int x, int y) const
     {
         return Get(x,y) & BG_SELECTED;
-    };
+    }
 
     int GetNumBombs() const
     {
         return m_numBombCells;
-    };
+    }
 
     int GetNumRemainingCells() const
     {
         return m_numRemainingCells;
-    };
+    }
 
     int GetNumMarkedCells() const
     {
         return m_numMarkedCells;
-    };
+    }
 
 
     bool Init(int width, int height, bool easyCorner = false);
diff --git a/demos/forty/card.h b/demos/forty/card.h
index bb64d279dc..65c8f854ba 100644
--- a/demos/forty/card.h
+++ b/demos/forty/card.h
@@ -43,7 +43,7 @@ class Card {
 
 public:
     Card(int value, WayUp way_up = facedown);
-    virtual ~Card(){};
+    virtual ~Card(){}
 
     void Draw(wxDC& pDC, int x, int y);
     static void DrawNullCard(wxDC& pDC, int x, int y); // Draw card place-holder
@@ -55,9 +55,9 @@ public:
     Suit GetSuit() const { return m_suit; }
     SuitColour GetColour() const { return m_colour; }
     static void SetScale(double scale);
-    static int GetHeight() { return m_height; };
-    static int GetWidth() { return m_width; };
-    static double GetScale() { return m_scale; };
+    static int GetHeight() { return m_height; }
+    static int GetWidth() { return m_width; }
+    static double GetScale() { return m_scale; }
 
 private:
     Suit m_suit;
diff --git a/demos/forty/forty.h b/demos/forty/forty.h
index 815514d0a5..6753b19417 100644
--- a/demos/forty/forty.h
+++ b/demos/forty/forty.h
@@ -38,7 +38,7 @@ class FortyFrame: public wxFrame
 {
 public:
     FortyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, const wxSize& size, bool largecards);
-    virtual ~FortyFrame(){};
+    virtual ~FortyFrame(){}
 
     void OnCloseWindow(wxCloseEvent& event);
 
diff --git a/demos/forty/pile.h b/demos/forty/pile.h
index 21f35ba08b..3aeb517bc7 100644
--- a/demos/forty/pile.h
+++ b/demos/forty/pile.h
@@ -41,7 +41,7 @@ const int NumCards = 2 * PackSize;
 class Pile {
 public:
     Pile(int x, int y, int dx = 0, int dy = 0);
-    virtual ~Pile(){};
+    virtual ~Pile(){}
 
     // General functions
     virtual void ResetPile() { m_topCard = -1; }
@@ -68,7 +68,7 @@ public:
     virtual bool AcceptCard(Card*) { return false; }
     virtual void AddCard(Card* card); // Add card to top of pile
     virtual void AddCard(wxDC& pDC, Card* card); // Add card + redraw it
-        void SetPos(int x,int y) {m_x = x;m_y = y;};
+        void SetPos(int x,int y) {m_x = x;m_y = y;}
 
 protected:
     int   m_x, m_y; // Position of the pile on the screen
diff --git a/demos/forty/playerdg.h b/demos/forty/playerdg.h
index 59836ae141..1be65322e5 100644
--- a/demos/forty/playerdg.h
+++ b/demos/forty/playerdg.h
@@ -16,7 +16,7 @@ class PlayerSelectionDialog : public wxDialog
 {
 public:
     PlayerSelectionDialog(wxWindow* parent, ScoreFile* file);
-    virtual ~PlayerSelectionDialog(){};
+    virtual ~PlayerSelectionDialog(){}
 
     const wxString& GetPlayersName();
     void ButtonCallback(wxCommandEvent& event);
diff --git a/demos/forty/scoredg.h b/demos/forty/scoredg.h
index 1b1c7d2ba3..06a3b69ef4 100644
--- a/demos/forty/scoredg.h
+++ b/demos/forty/scoredg.h
@@ -16,7 +16,7 @@ class ScoreDialog : public wxDialog
 {
 public:
     ScoreDialog(wxWindow* parent, ScoreFile* file);
-    virtual ~ScoreDialog(){};
+    virtual ~ScoreDialog(){}
 
     void Display();
 
diff --git a/demos/life/game.cpp b/demos/life/game.cpp
index 62440bd53b..b509a259f5 100644
--- a/demos/life/game.cpp
+++ b/demos/life/game.cpp
@@ -925,7 +925,7 @@ class LifeModule: public wxModule
     wxDECLARE_DYNAMIC_CLASS(LifeModule);
 
 public:
-    LifeModule() {};
+    LifeModule() {}
     bool OnInit() wxOVERRIDE;
     void OnExit() wxOVERRIDE;
 };
diff --git a/demos/life/game.h b/demos/life/game.h
index 6fbf1fedd6..35e28a74e0 100644
--- a/demos/life/game.h
+++ b/demos/life/game.h
@@ -29,7 +29,7 @@ public:
         m_description = description;
         m_rules       = rules;
         m_shape       = shape;
-    };
+    }
 
     // A more convenient ctor for the built-in samples
     LifePattern(wxString      name,
@@ -58,7 +58,7 @@ public:
 
             m_shape.Add( tmp );
         }
-    };
+    }
 
     wxString      m_name;
     wxString      m_description;
@@ -90,9 +90,9 @@ public:
     ~Life();
 
     // accessors
-    inline wxUint32 GetNumCells() const    { return m_numcells; };
-    inline wxString GetRules() const       { return m_rules; };
-    inline wxString GetDescription() const { return m_description; };
+    inline wxUint32 GetNumCells() const    { return m_numcells; }
+    inline wxString GetRules() const       { return m_rules; }
+    inline wxString GetDescription() const { return m_description; }
     bool IsAlive(wxInt32 x, wxInt32 y);
     void SetCell(wxInt32 x, wxInt32 y, bool alive = true);
     void SetPattern(const LifePattern &pattern);
diff --git a/demos/life/life.h b/demos/life/life.h
index 1d4d2f1f0a..b2144f5170 100644
--- a/demos/life/life.h
+++ b/demos/life/life.h
@@ -31,7 +31,7 @@ public:
     virtual ~LifeCanvas();
 
     // view management
-    int  GetCellSize() const { return m_cellsize; };
+    int  GetCellSize() const { return m_cellsize; }
     void SetCellSize(int cellsize);
     void Recenter(wxInt32 i, wxInt32 j);
 
@@ -54,10 +54,10 @@ private:
     void OnEraseBackground(wxEraseEvent& event);
 
     // conversion between cell and screen coordinates
-    inline wxInt32 XToCell(wxCoord x) const { return (x / m_cellsize) + m_viewportX; };
-    inline wxInt32 YToCell(wxCoord y) const { return (y / m_cellsize) + m_viewportY; };
-    inline wxCoord CellToX(wxInt32 i) const { return (i - m_viewportX) * m_cellsize; };
-    inline wxCoord CellToY(wxInt32 j) const { return (j - m_viewportY) * m_cellsize; };
+    inline wxInt32 XToCell(wxCoord x) const { return (x / m_cellsize) + m_viewportX; }
+    inline wxInt32 YToCell(wxCoord y) const { return (y / m_cellsize) + m_viewportY; }
+    inline wxCoord CellToX(wxInt32 i) const { return (i - m_viewportX) * m_cellsize; }
+    inline wxCoord CellToY(wxInt32 j) const { return (j - m_viewportY) * m_cellsize; }
 
     // what is the user doing?
     enum MouseStatus
diff --git a/demos/life/reader.h b/demos/life/reader.h
index 4480af5ed1..4ae6e33a76 100644
--- a/demos/life/reader.h
+++ b/demos/life/reader.h
@@ -22,14 +22,14 @@ class LifeReader
 public:
     LifeReader(wxInputStream& is);
 
-    inline bool          IsOk() const           { return m_ok; };
-    inline wxString      GetDescription() const { return m_description; };
-    inline wxString      GetRules() const       { return m_rules; };
-    inline wxArrayString GetShape() const       { return m_shape; };
+    inline bool          IsOk() const           { return m_ok; }
+    inline wxString      GetDescription() const { return m_description; }
+    inline wxString      GetRules() const       { return m_rules; }
+    inline wxArrayString GetShape() const       { return m_shape; }
     inline LifePattern   GetPattern() const
     {
         return LifePattern(wxEmptyString, m_description, m_rules, m_shape);
-    };
+    }
 
 private:
     bool             m_ok;
diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index aff77abd29..815dfcb75b 100644
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -409,7 +409,7 @@ class WXDLLIMPEXP_CORE wxDataViewCtrlAccessible: public wxWindowAccessible
 {
 public:
     wxDataViewCtrlAccessible(wxDataViewCtrl* win);
-    virtual ~wxDataViewCtrlAccessible() {};
+    virtual ~wxDataViewCtrlAccessible() {}
 
     virtual wxAccStatus HitTest(const wxPoint& pt, int* childId,
                                 wxAccessible** childObject) wxOVERRIDE;
diff --git a/samples/dragimag/dragimag.h b/samples/dragimag/dragimag.h
index c30bd3edba..ca4034a996 100644
--- a/samples/dragimag/dragimag.h
+++ b/samples/dragimag/dragimag.h
@@ -122,7 +122,7 @@ class DragShape: public wxObject
 {
 public:
     DragShape(const wxBitmap& bitmap);
-    ~DragShape(){};
+    ~DragShape(){}
 
 //// Operations
 
diff --git a/samples/ipc/baseclient.cpp b/samples/ipc/baseclient.cpp
index a3f139987e..c958ed91cb 100644
--- a/samples/ipc/baseclient.cpp
+++ b/samples/ipc/baseclient.cpp
@@ -78,7 +78,7 @@ public:
     bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
     void Disconnect();
     wxConnectionBase *OnMakeConnection() wxOVERRIDE;
-    bool IsConnected() { return m_connection != NULL; };
+    bool IsConnected() { return m_connection != NULL; }
 
     virtual void Notify() wxOVERRIDE;
 
diff --git a/samples/ipc/baseserver.cpp b/samples/ipc/baseserver.cpp
index 47a29085ce..8c58305f9f 100644
--- a/samples/ipc/baseserver.cpp
+++ b/samples/ipc/baseserver.cpp
@@ -113,7 +113,7 @@ public:
     MyServer();
     virtual ~MyServer();
     void Disconnect();
-    bool IsConnected() { return m_connection != NULL; };
+    bool IsConnected() { return m_connection != NULL; }
 
     virtual wxConnectionBase *OnAcceptConnection(const wxString& topic) wxOVERRIDE;
 
diff --git a/samples/ipc/client.h b/samples/ipc/client.h
index 8e44ffe546..7c1d58b207 100644
--- a/samples/ipc/client.h
+++ b/samples/ipc/client.h
@@ -31,7 +31,7 @@ class MyApp: public wxApp
 public:
     virtual bool OnInit() wxOVERRIDE;
     virtual int OnExit() wxOVERRIDE;
-    MyFrame *GetFrame() { return m_frame; };
+    MyFrame *GetFrame() { return m_frame; }
 
 protected:
     MyFrame        *m_frame;
@@ -96,8 +96,8 @@ public:
     bool Connect(const wxString& sHost, const wxString& sService, const wxString& sTopic);
     void Disconnect();
     wxConnectionBase *OnMakeConnection() wxOVERRIDE;
-    bool IsConnected() { return m_connection != NULL; };
-    MyConnection *GetConnection() { return m_connection; };
+    bool IsConnected() { return m_connection != NULL; }
+    MyConnection *GetConnection() { return m_connection; }
 
 protected:
     MyConnection     *m_connection;
diff --git a/samples/joytest/joytest.h b/samples/joytest/joytest.h
index 59d4afb5e2..76876e2e4d 100644
--- a/samples/joytest/joytest.h
+++ b/samples/joytest/joytest.h
@@ -44,7 +44,7 @@ public:
     MyCanvas *canvas;
     MyFrame(wxFrame *parent, const wxString& title,
         const wxPoint& pos, const wxSize& size, const long style);
-    ~MyFrame(){};
+    ~MyFrame(){}
     void OnActivate(wxActivateEvent& event);
     void OnQuit(wxCommandEvent& event);
 
diff --git a/samples/layout/layout.h b/samples/layout/layout.h
index 40627037d1..fdfd4a0c5f 100644
--- a/samples/layout/layout.h
+++ b/samples/layout/layout.h
@@ -12,7 +12,7 @@
 class MyApp: public wxApp
 {
 public:
-    MyApp(){};
+    MyApp(){}
     bool OnInit() wxOVERRIDE;
 };
 
diff --git a/samples/nativdlg/nativdlg.h b/samples/nativdlg/nativdlg.h
index 468b0ed2c9..732f881704 100644
--- a/samples/nativdlg/nativdlg.h
+++ b/samples/nativdlg/nativdlg.h
@@ -12,7 +12,7 @@
 class MyApp: public wxApp
 {
   public:
-    MyApp(void){};
+    MyApp(void){}
     bool OnInit(void) wxOVERRIDE;
 };
 
diff --git a/samples/opengl/pyramid/pyramid.h b/samples/opengl/pyramid/pyramid.h
index aacce137a9..fdffd31455 100644
--- a/samples/opengl/pyramid/pyramid.h
+++ b/samples/opengl/pyramid/pyramid.h
@@ -14,7 +14,7 @@
 class MyApp: public wxApp
 {
 public:
-    MyApp(){};
+    MyApp(){}
     bool OnInit() wxOVERRIDE;
 };
 
diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index d82a3f0032..c1ae01437c 100644
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -40,7 +40,7 @@ class OwnerDrawnFrame : public wxFrame
 public:
     // ctor & dtor
     OwnerDrawnFrame(wxFrame *frame, const wxString& title, int x, int y, int w, int h);
-    ~OwnerDrawnFrame(){};
+    ~OwnerDrawnFrame(){}
 
     // notifications
     void OnQuit             (wxCommandEvent& event);
diff --git a/samples/splitter/splitter.cpp b/samples/splitter/splitter.cpp
index 08fd17f7c0..a91357af61 100644
--- a/samples/splitter/splitter.cpp
+++ b/samples/splitter/splitter.cpp
@@ -151,7 +151,7 @@ class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow* parent, bool mirror);
-    virtual ~MyCanvas(){};
+    virtual ~MyCanvas(){}
 
     virtual void OnDraw(wxDC& dc) wxOVERRIDE;
 
diff --git a/samples/stc/edit.h b/samples/stc/edit.h
index 908990e757..703ebae395 100644
--- a/samples/stc/edit.h
+++ b/samples/stc/edit.h
@@ -112,7 +112,7 @@ public:
     wxString DeterminePrefs (const wxString &filename);
     bool InitializePrefs (const wxString &filename);
     bool UserSettings (const wxString &filename);
-    LanguageInfo const* GetLanguageInfo () {return m_language;};
+    LanguageInfo const* GetLanguageInfo () {return m_language;}
 
     //! load/save file
     bool LoadFile ();
@@ -120,8 +120,8 @@ public:
     bool SaveFile ();
     bool SaveFile (const wxString &filename);
     bool Modified ();
-    wxString GetFilename () {return m_filename;};
-    void SetFilename (const wxString &filename) {m_filename = filename;};
+    wxString GetFilename () {return m_filename;}
+    void SetFilename (const wxString &filename) {m_filename = filename;}
 
 private:
     // file
diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 60c0f18005..7b3a706938 100644
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -66,7 +66,7 @@ class MyApp : public wxApp
 {
 public:
     MyApp();
-    virtual ~MyApp(){};
+    virtual ~MyApp(){}
 
     virtual bool OnInit() wxOVERRIDE;
 
diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index c615a483bc..99182002d0 100644
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -67,7 +67,7 @@ public:
     MyTreeCtrl(wxWindow *parent, const wxWindowID id,
                const wxPoint& pos, const wxSize& size,
                long style);
-    virtual ~MyTreeCtrl(){};
+    virtual ~MyTreeCtrl(){}
 
     void OnBeginDrag(wxTreeEvent& event);
     void OnBeginRDrag(wxTreeEvent& event);
diff --git a/samples/xrc/custclas.h b/samples/xrc/custclas.h
index 0a72b87394..85f1913d21 100644
--- a/samples/xrc/custclas.h
+++ b/samples/xrc/custclas.h
@@ -60,7 +60,7 @@ public:
                        );
 
     // Destructor.
-    ~MyResizableListCtrl(){};
+    ~MyResizableListCtrl(){}
 
 protected:
 
diff --git a/samples/xrc/derivdlg.h b/samples/xrc/derivdlg.h
index 0707a1740b..4c7ef36b6b 100644
--- a/samples/xrc/derivdlg.h
+++ b/samples/xrc/derivdlg.h
@@ -36,7 +36,7 @@ public:
     PreferencesDialog( wxWindow* parent );
 
     // Destructor.
-    ~PreferencesDialog(){};
+    ~PreferencesDialog(){}
 
 private:
 
diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp
index b53aeb6d23..761477f833 100644
--- a/src/msw/joystick.cpp
+++ b/src/msw/joystick.cpp
@@ -67,7 +67,7 @@ public:
     {
         m_catchwin = win;
         m_polling = pollingFreq;
-    };
+    }
 
 
 private: