diff --git a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
index e2de72a6a7..e6731f938c 100644
--- a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
+++ b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.h
@@ -35,6 +35,6 @@ namespace S3D
         wxString& prevModelSelectDir, int& prevModelWildcard, MODULE_3D_SETTINGS* aModel );
 
     bool Configure3DPaths( wxWindow* aParent, S3D_FILENAME_RESOLVER* aResolver );
-};
+}
 
 #endif  // CACHE_DIALOGS_3D_H
diff --git a/3d-viewer/3d_cache/sg/sg_helpers.cpp b/3d-viewer/3d_cache/sg/sg_helpers.cpp
index e2b3809435..fec16bfef3 100644
--- a/3d-viewer/3d_cache/sg/sg_helpers.cpp
+++ b/3d-viewer/3d_cache/sg/sg_helpers.cpp
@@ -362,7 +362,7 @@ bool S3D::degenerate( glm::dvec3* pts )
         return true;
 
     return false;
-};
+}
 
 
 static void calcTriad( glm::dvec3* pts, glm::dvec3& tri )
diff --git a/3d-viewer/3d_cache/sg/sg_helpers.h b/3d-viewer/3d_cache/sg/sg_helpers.h
index a2f024139c..34de4eb1b0 100644
--- a/3d-viewer/3d_cache/sg/sg_helpers.h
+++ b/3d-viewer/3d_cache/sg/sg_helpers.h
@@ -242,6 +242,6 @@ namespace S3D
 
     // read an RGB color
     bool ReadColor( std::istream& aFile, SGCOLOR& aColor );
-};
+}
 
 #endif  // SG_HELPERS_H
diff --git a/3d-viewer/3d_cache/sg/sg_node.h b/3d-viewer/3d_cache/sg/sg_node.h
index fc6e646f2e..575a1aad08 100644
--- a/3d-viewer/3d_cache/sg/sg_node.h
+++ b/3d-viewer/3d_cache/sg/sg_node.h
@@ -66,7 +66,7 @@ namespace S3D
 
     void FREE_SMESH( SMESH& aMesh);
     void FREE_S3DMODEL( S3DMODEL& aModel );
-};
+}
 
 
 /**
diff --git a/3d-viewer/3d_cache/str_rsort.h b/3d-viewer/3d_cache/str_rsort.h
index 13c00e05fb..35044c6d71 100644
--- a/3d-viewer/3d_cache/str_rsort.h
+++ b/3d-viewer/3d_cache/str_rsort.h
@@ -82,6 +82,6 @@ namespace S3D
         }
     };
 
-};  // end NAMESPACE
+} // end NAMESPACE
 
 #endif  // STR_RSORT_H
diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.h b/3d-viewer/3d_canvas/eda_3d_canvas.h
index 6b20a2b292..e0d601a613 100644
--- a/3d-viewer/3d_canvas/eda_3d_canvas.h
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.h
@@ -161,7 +161,7 @@ class EDA_3D_CANVAS : public wxGLCanvas
 
     void OnTimerTimeout_Redraw( wxTimerEvent& event );
 
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 
  private:
 
diff --git a/3d-viewer/3d_model_viewer/c3d_model_viewer.h b/3d-viewer/3d_model_viewer/c3d_model_viewer.h
index 3c2e839e0e..2e8e3b8f29 100644
--- a/3d-viewer/3d_model_viewer/c3d_model_viewer.h
+++ b/3d-viewer/3d_model_viewer/c3d_model_viewer.h
@@ -105,7 +105,7 @@ private:
 
     void OnRightClick( wxMouseEvent &event );
 
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 
 
 private:
diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.h b/3d-viewer/3d_viewer/eda_3d_viewer.h
index d620a46588..f878029cc4 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer.h
+++ b/3d-viewer/3d_viewer/eda_3d_viewer.h
@@ -222,7 +222,7 @@ class EDA_3D_VIEWER : public KIWAY_PLAYER
      */
     void RenderEngineChanged();
 
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 
  private:
 
diff --git a/common/bitmap.cpp b/common/bitmap.cpp
index d9741ec2e1..d0af48c7c7 100644
--- a/common/bitmap.cpp
+++ b/common/bitmap.cpp
@@ -132,7 +132,7 @@ wxMenuItem* AddMenuItem( wxMenu* aMenu, wxMenu* aSubMenu, int aId,
     aMenu->Append( item );
 
     return item;
-};
+}
 
 
 wxMenuItem* AddMenuItem( wxMenu* aMenu, wxMenu* aSubMenu, int aId,
@@ -153,4 +153,4 @@ wxMenuItem* AddMenuItem( wxMenu* aMenu, wxMenu* aSubMenu, int aId,
     aMenu->Append( item );
 
     return item;
-};
+}
diff --git a/common/eagle_parser.cpp b/common/eagle_parser.cpp
index dd2d10d1ea..c0d2ee94ca 100644
--- a/common/eagle_parser.cpp
+++ b/common/eagle_parser.cpp
@@ -934,7 +934,7 @@ ECONNECT::ECONNECT( wxXmlNode* aConnect )
     gate =  parseRequiredAttribute<string>( aConnect, "gate" );
     pin =  parseRequiredAttribute<string>( aConnect, "pin" );
     pad = parseRequiredAttribute<string>( aConnect, "pad" );
-};
+}
 
 
 EDEVICE::EDEVICE( wxXmlNode* aDevice )
@@ -957,7 +957,7 @@ EDEVICE::EDEVICE( wxXmlNode* aDevice )
         connectNode = connectNode->GetNext();
     }
 
-};
+}
 
 
 EDEVICE_SET::EDEVICE_SET( wxXmlNode* aDeviceSet )
diff --git a/common/single_top.cpp b/common/single_top.cpp
index 4370829f0e..a1f41ec25d 100644
--- a/common/single_top.cpp
+++ b/common/single_top.cpp
@@ -202,7 +202,7 @@ struct APP_SINGLE_TOP : public wxApp
 #endif
 };
 
-IMPLEMENT_APP( APP_SINGLE_TOP );
+IMPLEMENT_APP( APP_SINGLE_TOP )
 
 
 bool PGM_SINGLE_TOP::OnPgmInit()
diff --git a/common/view/view.cpp b/common/view/view.cpp
index 65e4f19659..5244a61bfe 100644
--- a/common/view/view.cpp
+++ b/common/view/view.cpp
@@ -1397,4 +1397,4 @@ void VIEW::Update( VIEW_ITEM* aItem, int aUpdateFlags )
 
 const int VIEW::TOP_LAYER_MODIFIER = -VIEW_MAX_LAYERS;
 
-};
+}
diff --git a/common/widgets/mathplot.cpp b/common/widgets/mathplot.cpp
index 6ad1057e19..e696a23649 100644
--- a/common/widgets/mathplot.cpp
+++ b/common/widgets/mathplot.cpp
@@ -1288,13 +1288,13 @@ mpScaleXBase::mpScaleXBase( wxString name, int flags, bool ticks, unsigned int t
 mpScaleX::mpScaleX( wxString name, int flags, bool ticks, unsigned int type ) :
     mpScaleXBase( name, flags, ticks, type )
 {
-};
+}
 
 
 mpScaleXLog::mpScaleXLog( wxString name, int flags, bool ticks, unsigned int type ) :
     mpScaleXBase( name, flags, ticks, type )
 {
-};
+}
 
 
 void mpScaleXBase::Plot( wxDC& dc, mpWindow& w )
@@ -2701,7 +2701,7 @@ void mpWindow::SetMPScrollbars( bool status )
     ////         SetVirtualSize((int) (m_maxX - m_minX), (int) (m_maxY - m_minY));
     // }
     // Refresh(false);*/
-};
+}
 
 bool mpWindow::UpdateBBox()
 {
diff --git a/eeschema/dialogs/dialog_bom.cpp b/eeschema/dialogs/dialog_bom.cpp
index 51cc37c22d..934e4bf49c 100644
--- a/eeschema/dialogs/dialog_bom.cpp
+++ b/eeschema/dialogs/dialog_bom.cpp
@@ -72,7 +72,7 @@ struct BOM_PLUGIN
  */
 WX_DECLARE_OBJARRAY( BOM_PLUGIN, BOM_PLUGIN_ARRAY );
 #include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY( BOM_PLUGIN_ARRAY );
+WX_DEFINE_OBJARRAY( BOM_PLUGIN_ARRAY )
 
 /**
  * Class BOM_CFG_READER_PARSER
diff --git a/eeschema/pin_shape.cpp b/eeschema/pin_shape.cpp
index f59dbb4241..4cfe64b2d9 100644
--- a/eeschema/pin_shape.cpp
+++ b/eeschema/pin_shape.cpp
@@ -101,4 +101,4 @@ BITMAP_DEF GetBitmap( GRAPHIC_PINSHAPE shape )
 
     assert( !"Invalid pin shape" );
     return 0;
-};
+}
diff --git a/eeschema/plot_schematic_HPGL.cpp b/eeschema/plot_schematic_HPGL.cpp
index 0c1846ef37..4cad993072 100644
--- a/eeschema/plot_schematic_HPGL.cpp
+++ b/eeschema/plot_schematic_HPGL.cpp
@@ -93,7 +93,7 @@ static const wxChar* plot_sheet_list( int aSize )
     }
 
     return ret;
-};
+}
 
 
 void DIALOG_PLOT_SCHEMATIC::SetHPGLPenWidth()
diff --git a/eeschema/sch_io_mgr.cpp b/eeschema/sch_io_mgr.cpp
index 7a8d9e1b4e..9259147f78 100644
--- a/eeschema/sch_io_mgr.cpp
+++ b/eeschema/sch_io_mgr.cpp
@@ -172,4 +172,4 @@ void SCH_IO_MGR::Save( SCH_FILE_T aFileType, const wxString& aFileName,
 }
 
 
-DECLARE_ENUM_VECTOR( SCH_IO_MGR, SCH_FILE_T );
+DECLARE_ENUM_VECTOR( SCH_IO_MGR, SCH_FILE_T )
diff --git a/eeschema/sch_io_mgr.h b/eeschema/sch_io_mgr.h
index eb3f5b83d0..8818edf298 100644
--- a/eeschema/sch_io_mgr.h
+++ b/eeschema/sch_io_mgr.h
@@ -60,7 +60,7 @@ public:
 
         // ALTIUM,
         // etc.
-    } );
+    } )
 
     /**
      * Return a #SCH_PLUGIN which the caller can use to import, export, save, or load
diff --git a/gerbview/class_gerber_draw_item.h b/gerbview/class_gerber_draw_item.h
index a272392e34..6c9fa5aebf 100644
--- a/gerbview/class_gerber_draw_item.h
+++ b/gerbview/class_gerber_draw_item.h
@@ -46,7 +46,7 @@ class GBR_DISPLAY_OPTIONS;
 namespace KIGFX
 {
     class VIEW;
-};
+}
 
 
 /* Shapes id for basic shapes ( .m_Shape member ) */
diff --git a/include/class_draw_panel_gal.h b/include/class_draw_panel_gal.h
index b12c4b3822..ea04963062 100644
--- a/include/class_draw_panel_gal.h
+++ b/include/class_draw_panel_gal.h
@@ -49,7 +49,7 @@ class WX_VIEW_CONTROLS;
 class VIEW_CONTROLS;
 class PAINTER;
 class GAL_DISPLAY_OPTIONS;
-};
+}
 
 
 class EDA_DRAW_PANEL_GAL : public wxScrolledCanvas
diff --git a/include/geometry/rtree.h b/include/geometry/rtree.h
index 1710d5aea2..8334b7734c 100644
--- a/include/geometry/rtree.h
+++ b/include/geometry/rtree.h
@@ -822,7 +822,7 @@ bool RTREE_QUAL::Load( const char* a_fileName )
     stream.Close();
 
     return result;
-};
+}
 
 
 RTREE_TEMPLATE
diff --git a/include/plugins/3dapi/ifsg_api.h b/include/plugins/3dapi/ifsg_api.h
index 7eb88e97e2..a1d97afd31 100644
--- a/include/plugins/3dapi/ifsg_api.h
+++ b/include/plugins/3dapi/ifsg_api.h
@@ -193,6 +193,6 @@ namespace S3D
      * creates and initializes an SMESH struct
      */
     SGLIB_API void Init3DMesh( SMESH& aMesh );
-};
+}
 
 #endif  // IFSG_API_H
diff --git a/include/plugins/3dapi/sg_types.h b/include/plugins/3dapi/sg_types.h
index db4cadfc3e..f85cef3a4a 100644
--- a/include/plugins/3dapi/sg_types.h
+++ b/include/plugins/3dapi/sg_types.h
@@ -44,6 +44,6 @@ namespace S3D
         SGTYPE_SHAPE,
         SGTYPE_END
     };
-};
+}
 
 #endif  // SG_TYPES_H
diff --git a/include/system/libcontext.h b/include/system/libcontext.h
index 336787bec5..e274e43157 100644
--- a/include/system/libcontext.h
+++ b/include/system/libcontext.h
@@ -85,11 +85,11 @@ fcontext_t LIBCONTEXT_CALL_CONVENTION make_fcontext( void* sp, size_t size,
         void (* fn)( intptr_t ) );
 
 #ifdef __cplusplus
-};    // namespace
+}    // namespace
 #endif
 
 #ifdef __cplusplus
-};    // extern "C"
+}    // extern "C"
 #endif
 
 #endif
diff --git a/include/tool/tool_base.h b/include/tool/tool_base.h
index 167c51d450..0302c15858 100644
--- a/include/tool/tool_base.h
+++ b/include/tool/tool_base.h
@@ -42,7 +42,7 @@ namespace KIGFX
 {
 class VIEW;
 class VIEW_CONTROLS;
-};
+}
 
 enum TOOL_TYPE
 {
diff --git a/include/tool/tool_dispatcher.h b/include/tool/tool_dispatcher.h
index 6a47342a9b..44a3c31af6 100644
--- a/include/tool/tool_dispatcher.h
+++ b/include/tool/tool_dispatcher.h
@@ -36,7 +36,7 @@ class ACTIONS;
 namespace KIGFX
 {
 class VIEW;
-};
+}
 
 /**
  * Class TOOL_DISPATCHER
diff --git a/include/ttl/halfedge/hetraits.h b/include/ttl/halfedge/hetraits.h
index 04288a0ba5..a186c405ea 100644
--- a/include/ttl/halfedge/hetraits.h
+++ b/include/ttl/halfedge/hetraits.h
@@ -184,6 +184,6 @@ struct TTLtraits
     //@} // End of Geometric Predicates Group
 };
 
-}; // End of hed namespace
+} // End of hed namespace
 
 #endif
diff --git a/include/ttl/halfedge/hetriang.h b/include/ttl/halfedge/hetriang.h
index 03ba5f9bc3..0d30b7ed2c 100644
--- a/include/ttl/halfedge/hetriang.h
+++ b/include/ttl/halfedge/hetriang.h
@@ -61,7 +61,7 @@ class CN_CLUSTER;
 namespace ttl
 {
     class TRIANGULATION_HELPER;
-};
+}
 
 /**
  * The half-edge data structure
@@ -426,6 +426,6 @@ public:
 
     friend class ttl::TRIANGULATION_HELPER;
 };
-}; // End of hed namespace
+} // End of hed namespace
 
 #endif
diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp
index 76ffcc9f66..c919519c5d 100644
--- a/kicad/kicad.cpp
+++ b/kicad/kicad.cpp
@@ -262,7 +262,7 @@ struct APP_KICAD : public wxApp
     }
 };
 
-IMPLEMENT_APP( APP_KICAD );
+IMPLEMENT_APP( APP_KICAD )
 
 
 // The C++ project manager supports one open PROJECT, so Prj() calls within
diff --git a/pcb_calculator/UnitSelector.cpp b/pcb_calculator/UnitSelector.cpp
index 06b3768628..913fce1213 100644
--- a/pcb_calculator/UnitSelector.cpp
+++ b/pcb_calculator/UnitSelector.cpp
@@ -40,7 +40,7 @@ UNIT_SELECTOR_LEN::UNIT_SELECTOR_LEN( wxWindow *parent, wxWindowID id,
     Append( _( "cm" ) );
     Append( _( "mil" ) );
     Append( _( "inch" ) );
-};
+}
 
 
 /*
@@ -73,7 +73,7 @@ UNIT_SELECTOR_THICKNESS::UNIT_SELECTOR_THICKNESS( wxWindow *parent, wxWindowID i
     Append( _( "mil" ) );
     Append( _( "inch" ) );
     Append( _( "oz/ft^2" ) );
-};
+}
 
 
 /*
@@ -105,7 +105,7 @@ UNIT_SELECTOR_FREQUENCY::UNIT_SELECTOR_FREQUENCY( wxWindow *parent, wxWindowID i
     Append( _( "MHz" ) );
     Append( _( "KHz" ) );
     Append( _( "Hz" ) );
-};
+}
 
 /*
  * Function GetUnitScale
@@ -132,7 +132,7 @@ UNIT_SELECTOR_ANGLE::UNIT_SELECTOR_ANGLE( wxWindow *parent, wxWindowID id,
 {
     Append( _( "Radian" ) );
     Append( _( "Degree" ) );
-};
+}
 
 /*
  * Function GetUnitScale
@@ -157,7 +157,7 @@ UNIT_SELECTOR_RESISTOR::UNIT_SELECTOR_RESISTOR( wxWindow *parent, wxWindowID id,
 {
     Append( _( "Ohm" ) );
     Append( _( "KOhm" ) );
-};
+}
 
 
 /*
diff --git a/pcbnew/class_drawsegment.cpp b/pcbnew/class_drawsegment.cpp
index fc547ce14a..989a28f372 100644
--- a/pcbnew/class_drawsegment.cpp
+++ b/pcbnew/class_drawsegment.cpp
@@ -102,7 +102,7 @@ void DRAWSEGMENT::Rotate( const wxPoint& aRotCentre, double aAngle )
                 + ShowShape( m_Shape ) ) );
         break;
     }
-};
+}
 
 void DRAWSEGMENT::Flip( const wxPoint& aCentre )
 {
diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h
index f8f74a6fc6..c92fbafcf6 100644
--- a/pcbnew/class_module.h
+++ b/pcbnew/class_module.h
@@ -56,7 +56,7 @@ class MSG_PANEL_ITEM;
 
 namespace KIGFX {
 class VIEW;
-};
+}
 
 enum INCLUDE_NPTH_T
 {
diff --git a/pcbnew/class_netclass.h b/pcbnew/class_netclass.h
index 7d35bd13b7..f6ebaddf5e 100644
--- a/pcbnew/class_netclass.h
+++ b/pcbnew/class_netclass.h
@@ -219,7 +219,7 @@ public:
 
 
 DECL_SPTR_FOR_SWIG( NETCLASSPTR, NETCLASS )
-DECL_MAP_FOR_SWIG( NETCLASS_MAP, wxString, NETCLASSPTR );
+DECL_MAP_FOR_SWIG( NETCLASS_MAP, wxString, NETCLASSPTR )
 
 
 /**
diff --git a/pcbnew/class_pad.h b/pcbnew/class_pad.h
index 274553f3ba..b767d0bc10 100644
--- a/pcbnew/class_pad.h
+++ b/pcbnew/class_pad.h
@@ -57,7 +57,7 @@ class MSG_PANEL_INFO;
 namespace KIGFX
 {
     class VIEW;
-};
+}
 
 // Helper class to store parameters used to draw a pad
 class PAD_DRAWINFO
diff --git a/pcbnew/class_zone.cpp b/pcbnew/class_zone.cpp
index 97a7687d61..5b5bfc60a1 100644
--- a/pcbnew/class_zone.cpp
+++ b/pcbnew/class_zone.cpp
@@ -655,7 +655,7 @@ void ZONE_CONTAINER::SetCornerRadius( unsigned int aRadius )
     m_cornerRadius = aRadius;
     if( m_cornerRadius > (unsigned int) Mils2iu( MAX_ZONE_CORNER_RADIUS_MILS ) )
         m_cornerRadius = Mils2iu( MAX_ZONE_CORNER_RADIUS_MILS );
-};
+}
 
 
 bool ZONE_CONTAINER::HitTest( const wxPoint& aPosition ) const
diff --git a/pcbnew/class_zone_settings.cpp b/pcbnew/class_zone_settings.cpp
index d9a3f6bba1..b55efa66b8 100644
--- a/pcbnew/class_zone_settings.cpp
+++ b/pcbnew/class_zone_settings.cpp
@@ -142,4 +142,4 @@ void ZONE_SETTINGS::SetCornerRadius( int aRadius )
         m_cornerRadius = 0;
     else
         m_cornerRadius = aRadius;
-};
+}
diff --git a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp b/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
index 1e32a827d8..ab0bf3be71 100644
--- a/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
+++ b/pcbnew/dialogs/dialog_footprint_wizard_list.cpp
@@ -39,9 +39,9 @@
 #include <python_scripting.h>
 #else
 // Dummy functions, actually defined in python_scripting.h when KICAD_SCRIPTING is enabled
-static void pcbnewGetWizardsBackTrace( wxString& aText ) {};
-static void pcbnewGetScriptsSearchPaths( wxString& aText ) {};
-static void pcbnewGetUnloadableScriptNames( wxString& aText ) {};
+static void pcbnewGetWizardsBackTrace( wxString& aText ) {}
+static void pcbnewGetScriptsSearchPaths( wxString& aText ) {}
+static void pcbnewGetUnloadableScriptNames( wxString& aText ) {}
 #endif
 
 enum FPGeneratorRowNames
diff --git a/pcbnew/exporters/export_gencad.cpp b/pcbnew/exporters/export_gencad.cpp
index ac84c2055b..aa8ebac35f 100644
--- a/pcbnew/exporters/export_gencad.cpp
+++ b/pcbnew/exporters/export_gencad.cpp
@@ -156,7 +156,7 @@ static std::string GenCADLayerName( int aCuCount, PCB_LAYER_ID aId )
 
         return txt;
     }
-};
+}
 
 
 static const PCB_LAYER_ID gc_seq[] = {
@@ -204,7 +204,7 @@ static std::string GenCADLayerNameFlipped( int aCuCount, PCB_LAYER_ID aId )
     }
 
     return GenCADLayerName( aCuCount, aId );
-};
+}
 
 
 static wxString escapeString( const wxString& aString )
diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp
index 66dda6b64a..a88fca39cb 100644
--- a/pcbnew/exporters/export_vrml.cpp
+++ b/pcbnew/exporters/export_vrml.cpp
@@ -1618,7 +1618,7 @@ static SGNODE* getSGColor( VRML_COLOR_INDEX colorIdx )
     sgmaterial[colorIdx] = vcolor.GetRawPtr();
 
     return sgmaterial[colorIdx];
-};
+}
 
 
 static void create_vrml_plane( IFSG_TRANSFORM& PcbOutput, VRML_COLOR_INDEX colorID,
diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp
index 8c891b107b..903813c10f 100644
--- a/pcbnew/moduleframe.cpp
+++ b/pcbnew/moduleframe.cpp
@@ -398,7 +398,7 @@ const wxString FOOTPRINT_EDIT_FRAME::getLibPath()
 const wxString FOOTPRINT_EDIT_FRAME::GetCurrentLib() const
 {
     return Prj().GetRString( PROJECT::PCB_LIB_NICKNAME );
-};
+}
 
 
 void FOOTPRINT_EDIT_FRAME::retainLastFootprint()
diff --git a/pcbnew/pcb_view.cpp b/pcbnew/pcb_view.cpp
index 48e7609bb7..f4f913eaf3 100644
--- a/pcbnew/pcb_view.cpp
+++ b/pcbnew/pcb_view.cpp
@@ -107,4 +107,4 @@ void PCB_VIEW::UpdateDisplayOptions( PCB_DISPLAY_OPTIONS* aOptions )
 
     settings->LoadDisplayOptions( aOptions );
 }
-};
+}
diff --git a/pcbnew/pcb_view.h b/pcbnew/pcb_view.h
index 2782c5d526..c05b67389a 100644
--- a/pcbnew/pcb_view.h
+++ b/pcbnew/pcb_view.h
@@ -59,6 +59,6 @@ private:
     PCB_LAYER_ID m_routeLayerBottom;
 };
 
-};
+}
 
 #endif
diff --git a/pcbnew/router/pns_kicad_iface.h b/pcbnew/router/pns_kicad_iface.h
index 3d9b6e223a..18e6c8b3eb 100644
--- a/pcbnew/router/pns_kicad_iface.h
+++ b/pcbnew/router/pns_kicad_iface.h
@@ -37,7 +37,7 @@ class PCB_TOOL;
 namespace KIGFX
 {
     class VIEW;
-};
+}
 
 class PNS_KICAD_IFACE : public PNS::ROUTER_IFACE {
 public:
diff --git a/pcbnew/router/pns_router.h b/pcbnew/router/pns_router.h
index 67e6b9dd5d..5ee6bd28f7 100644
--- a/pcbnew/router/pns_router.h
+++ b/pcbnew/router/pns_router.h
@@ -42,7 +42,7 @@ namespace KIGFX
 class VIEW;
 class VIEW_GROUP;
 
-};
+}
 
 namespace PNS {
 
diff --git a/pcbnew/tools/tool_event_utils.h b/pcbnew/tools/tool_event_utils.h
index d633d281ef..c8331625c1 100644
--- a/pcbnew/tools/tool_event_utils.h
+++ b/pcbnew/tools/tool_event_utils.h
@@ -72,6 +72,6 @@ namespace TOOL_EVT_UTILS
      */
     int GetEventRotationAngle( const PCB_BASE_EDIT_FRAME& aFrame,
                                const TOOL_EVENT& aEvt );
-};
+}
 
 #endif // TOOL_EVENT_UTILS_H
diff --git a/pcbnew/tools/zone_create_helper.cpp b/pcbnew/tools/zone_create_helper.cpp
index 131f2d30f5..f72409032d 100644
--- a/pcbnew/tools/zone_create_helper.cpp
+++ b/pcbnew/tools/zone_create_helper.cpp
@@ -181,7 +181,7 @@ void ZONE_CREATE_HELPER::commitZone( std::unique_ptr<ZONE_CONTAINER> aZone )
             break;
         }
     }
-};
+}
 
 
 bool ZONE_CREATE_HELPER::OnFirstPoint()
diff --git a/plugins/3d/idf/s3d_plugin_idf.cpp b/plugins/3d/idf/s3d_plugin_idf.cpp
index 39068ec3c4..e45c1f3c45 100644
--- a/plugins/3d/idf/s3d_plugin_idf.cpp
+++ b/plugins/3d/idf/s3d_plugin_idf.cpp
@@ -169,7 +169,7 @@ static SGNODE* getColor( IFSG_SHAPE& shape, int colorIdx )
         cidx = 1;
 
     return material.GetRawPtr();
-};
+}
 
 
 const char* GetKicadPluginName( void )
diff --git a/plugins/3d/vrml/wrlfacet.cpp b/plugins/3d/vrml/wrlfacet.cpp
index f09d5637c4..04c408017b 100644
--- a/plugins/3d/vrml/wrlfacet.cpp
+++ b/plugins/3d/vrml/wrlfacet.cpp
@@ -62,7 +62,7 @@ static bool VDegenerate( glm::vec3* pts )
         return true;
 
     return false;
-};
+}
 
 
 static WRLVEC3F VCalcTriNorm( const WRLVEC3F& p1, const WRLVEC3F& p2, const WRLVEC3F& p3 )
diff --git a/plugins/3d/vrml/x3d/x3d_ops.h b/plugins/3d/vrml/x3d/x3d_ops.h
index b1d8712858..e724613ea9 100644
--- a/plugins/3d/vrml/x3d/x3d_ops.h
+++ b/plugins/3d/vrml/x3d/x3d_ops.h
@@ -48,7 +48,7 @@ namespace X3D
     bool ParseSFVec3( const wxString& aSource, WRLVEC3F& aResult );
     bool ParseSFRotation( const wxString& aSource, WRLROTATION& aResult );
 
-};
+}
 
 #endif  // X3D_OPS_H
 
diff --git a/polygon/clipper.cpp b/polygon/clipper.cpp
index a912f7cc44..448aff4856 100644
--- a/polygon/clipper.cpp
+++ b/polygon/clipper.cpp
@@ -429,7 +429,7 @@ Int128 Int128Mul( long64 lhs, long64 rhs )
         tmp = -tmp;
 
     return tmp;
-};
+}
 #endif
 
 // ------------------------------------------------------------------------------