diff --git a/include/wx/generic/private/grid.h b/include/wx/generic/private/grid.h
index 7b34c25afa..d58f0dc101 100644
--- a/include/wx/generic/private/grid.h
+++ b/include/wx/generic/private/grid.h
@@ -787,7 +787,7 @@ public:
         }
 
     virtual void SelectLine(wxGrid *grid, int line, wxMouseEvent &event) const override
-        { grid->m_selection->SelectRow(line, event); };
+        { grid->m_selection->SelectRow(line, event); }
     virtual void DeselectLine(wxGrid * grid, int line) const override
         { grid->DeselectRow(line); }
 
@@ -929,7 +929,7 @@ public:
         }
 
     virtual void SelectLine(wxGrid *grid, int line, wxMouseEvent &event) const override
-        { grid->m_selection->SelectCol(line, event); };
+        { grid->m_selection->SelectCol(line, event); }
     virtual void DeselectLine(wxGrid * grid, int line) const override
         { grid->DeselectCol(line); }
 
diff --git a/include/wx/msw/rt/utils.h b/include/wx/msw/rt/utils.h
index 14186a8d4e..f3c4d5b1a6 100644
--- a/include/wx/msw/rt/utils.h
+++ b/include/wx/msw/rt/utils.h
@@ -64,7 +64,7 @@ class WXDLLIMPEXP_CORE TempStringRef
 public:
     HSTRING Get() const { return m_hstring; }
 
-    operator HSTRING() const { return m_hstring; };
+    operator HSTRING() const { return m_hstring; }
 
     TempStringRef(const wxString& str);
 
diff --git a/src/common/textbuf.cpp b/src/common/textbuf.cpp
index 477f902e47..17f1bd8967 100644
--- a/src/common/textbuf.cpp
+++ b/src/common/textbuf.cpp
@@ -219,11 +219,11 @@ wxTextFileType wxTextBuffer::GuessType() const
 
     size_t n;
     for ( n = 0; n < nScan; n++ )     // the beginning
-        AnalyseLine(n);
+        AnalyseLine(n)
     for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ )
-        AnalyseLine(n);
+        AnalyseLine(n)
     for ( n = nCount - nScan; n < nCount; n++ )
-        AnalyseLine(n);
+        AnalyseLine(n)
 
     #undef   AnalyseLine
 
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 83123ca54f..fec78cd1f6 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -3063,7 +3063,7 @@ void wxGrid::InitRowHeights()
 
     for ( int i = 0; i < m_numRows; i++ )
     {
-        int rowBottom = ( GetRowPos( i ) + 1 ) * m_defaultRowHeight;;
+        int rowBottom = ( GetRowPos( i ) + 1 ) * m_defaultRowHeight;
         m_rowBottoms.Add( rowBottom );
     }
 }
diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp
index beec3586dc..1dd33a5d6a 100644
--- a/src/msw/debughlp.cpp
+++ b/src/msw/debughlp.cpp
@@ -129,7 +129,7 @@ bool wxDbgHelpDLL::BindDbgHelpFunctions(const wxDynamicLibrary& dllDbgHelp)
             return false;                                                     \
         }
 
-    wxDO_FOR_ALL_SYM_FUNCS_REQUIRED(LOAD_SYM_FUNCTION);
+    wxDO_FOR_ALL_SYM_FUNCS_REQUIRED(LOAD_SYM_FUNCTION)
 
     #undef LOAD_SYM_FUNCTION
 
@@ -140,7 +140,7 @@ bool wxDbgHelpDLL::BindDbgHelpFunctions(const wxDynamicLibrary& dllDbgHelp)
                 dllDbgHelp.GetSymbol(wxT(#name));                             \
         }
 
-    wxDO_FOR_ALL_SYM_FUNCS_OPTIONAL(LOAD_SYM_FUNCTION_OPTIONAL);
+    wxDO_FOR_ALL_SYM_FUNCS_OPTIONAL(LOAD_SYM_FUNCTION_OPTIONAL)
 
     #undef LOAD_SYM_FUNCTION_CAN_FAIL
 
diff --git a/src/msw/graphicsd2d.cpp b/src/msw/graphicsd2d.cpp
index 14ac604cb1..7d31c0c5d4 100644
--- a/src/msw/graphicsd2d.cpp
+++ b/src/msw/graphicsd2d.cpp
@@ -165,7 +165,7 @@ private:
         #define wxLOAD_FUNC(dll, name)                    \
         name = (name##_t)dll.RawGetSymbol(#name);         \
             if ( !name )                                  \
-            return false;
+            return false
 
         wxLOAD_FUNC(m_dllDirect2d, D2D1CreateFactory);
         wxLOAD_FUNC(m_dllDirect2d, D2D1MakeRotateMatrix);
@@ -3810,8 +3810,8 @@ public:
     void PushState() override {}
     void PopState() override {}
     void Flush() override {}
-    WXHDC GetNativeHDC() override { return nullptr; };
-    void ReleaseNativeHDC(WXHDC WXUNUSED(hdc)) override {};
+    WXHDC GetNativeHDC() override { return nullptr; }
+    void ReleaseNativeHDC(WXHDC WXUNUSED(hdc)) override {}
 
 protected:
     void DoDrawText(const wxString&, wxDouble, wxDouble) override {}
diff --git a/src/xrc/xh_infobar.cpp b/src/xrc/xh_infobar.cpp
index 5029378166..71ae95a8c7 100644
--- a/src/xrc/xh_infobar.cpp
+++ b/src/xrc/xh_infobar.cpp
@@ -20,7 +20,7 @@
 
 wxIMPLEMENT_DYNAMIC_CLASS(wxInfoBarXmlHandler, wxXmlResourceHandler);
 
-#define XRC_ADD_SHOW_EFFECT(style) m_effectNames[style] = #style;
+#define XRC_ADD_SHOW_EFFECT(style) m_effectNames[style] = #style
 
 wxInfoBarXmlHandler::wxInfoBarXmlHandler()
     : wxXmlResourceHandler(), m_insideBar(false)