diff --git a/client.cpp b/client.cpp
index aa9971cfc9..f58faf26f7 100644
--- a/client.cpp
+++ b/client.cpp
@@ -109,7 +109,7 @@ public:
     QCString windowRole;
 };
 
-};
+}
 
 // put all externs before the namespace statement to allow the linker
 // to resolve them properly
diff --git a/client.h b/client.h
index 737ade5909..c1a64c8b75 100644
--- a/client.h
+++ b/client.h
@@ -527,6 +527,6 @@ public:
     void setShade( bool , int ){}
 };
 
-};
+}
 
 #endif
diff --git a/clients/b2/b2client.cpp b/clients/b2/b2client.cpp
index 8bda927f39..72124f132c 100644
--- a/clients/b2/b2client.cpp
+++ b/clients/b2/b2client.cpp
@@ -142,7 +142,7 @@ B2Button::B2Button(Client *_client, QWidget *parent, const QString& tip)
     client = _client;
     useMiniIcon = false;
     setFixedSize(16,16); 
-};
+}
 
 
 QSize B2Button::sizeHint() const
@@ -958,7 +958,7 @@ void B2Client::positionButtons()
     titlebar->move(bar_x_ofs, 0);
 }
 
-};
+}
 
 extern "C"
 {
diff --git a/clients/b2/b2client.h b/clients/b2/b2client.h
index 55f3d24359..1ab398c68c 100644
--- a/clients/b2/b2client.h
+++ b/clients/b2/b2client.h
@@ -126,6 +126,6 @@ private:
     int in_unobs;
 };
 
-};
+}
 
 #endif
diff --git a/clients/default/kdedefault.cpp b/clients/default/kdedefault.cpp
index d3d95142b9..4bd1635be1 100644
--- a/clients/default/kdedefault.cpp
+++ b/clients/default/kdedefault.cpp
@@ -1100,7 +1100,7 @@ void KDEDefaultClient::menuButtonReleased()
 		closeWindow();
 }
 
-};
+}
 
 // Extended KWin plugin interface
 extern "C"
diff --git a/clients/default/kdedefault.h b/clients/default/kdedefault.h
index 7173f624ea..269018e7eb 100644
--- a/clients/default/kdedefault.h
+++ b/clients/default/kdedefault.h
@@ -117,7 +117,7 @@ class KDEDefaultClient : public Client
 		bool m_closing;
 };
 
-};
+}
 
 #endif
 // vim: ts=4
diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp
index f355b20207..209f55552a 100644
--- a/clients/keramik/keramik.cpp
+++ b/clients/keramik/keramik.cpp
@@ -1457,7 +1457,7 @@ Client::MousePosition KeramikClient::mousePosition( const QPoint &p ) const
 	return Nowhere;
 }
 
-}; // namespace Keramik
+} // namespace Keramik
 
 
 
diff --git a/clients/kwmtheme/kwmthemeclient.cpp b/clients/kwmtheme/kwmthemeclient.cpp
index 1838f99ea5..6e00a4ea11 100644
--- a/clients/kwmtheme/kwmthemeclient.cpp
+++ b/clients/kwmtheme/kwmthemeclient.cpp
@@ -799,7 +799,7 @@ void KWMThemeClient::init()
     //
 }
 
-};
+}
 
 extern "C"
 {
diff --git a/clients/kwmtheme/kwmthemeclient.h b/clients/kwmtheme/kwmthemeclient.h
index 7a91cf3822..e52c617749 100644
--- a/clients/kwmtheme/kwmthemeclient.h
+++ b/clients/kwmtheme/kwmthemeclient.h
@@ -54,7 +54,7 @@ private:
     QGridLayout* layout;
 };
 
-};
+}
 
 #endif
 
diff --git a/clients/laptop/laptopclient.cpp b/clients/laptop/laptopclient.cpp
index 4729f641fe..56ee2873f9 100644
--- a/clients/laptop/laptopclient.cpp
+++ b/clients/laptop/laptopclient.cpp
@@ -683,7 +683,7 @@ LaptopClient::mousePosition( const QPoint& p ) const
   return m;
 }
 
-};
+}
 
 extern "C"
 {
diff --git a/clients/laptop/laptopclient.h b/clients/laptop/laptopclient.h
index 89922c1be2..b000f9259d 100644
--- a/clients/laptop/laptopclient.h
+++ b/clients/laptop/laptopclient.h
@@ -82,6 +82,6 @@ private:
     int lastBufferWidth;
 };
 
-};
+}
 
 #endif
diff --git a/clients/modernsystem/modernsys.cpp b/clients/modernsystem/modernsys.cpp
index 3f57b3e2f6..bab5421a61 100644
--- a/clients/modernsystem/modernsys.cpp
+++ b/clients/modernsystem/modernsys.cpp
@@ -615,7 +615,7 @@ Client::MousePosition ModernSys::mousePosition( const QPoint& p) const
     return m;
 }
 
-};
+}
 
 // KWin extended plugin interface
 extern "C"
diff --git a/clients/modernsystem/modernsys.h b/clients/modernsystem/modernsys.h
index 7275a16127..febe3cea78 100644
--- a/clients/modernsystem/modernsys.h
+++ b/clients/modernsystem/modernsys.h
@@ -68,6 +68,6 @@ private:
     QString oldTitle;
 };
 
-};
+}
 
 #endif
diff --git a/clients/quartz/quartz.cpp b/clients/quartz/quartz.cpp
index 9cd8637ae0..23f773a677 100644
--- a/clients/quartz/quartz.cpp
+++ b/clients/quartz/quartz.cpp
@@ -798,7 +798,7 @@ void QuartzClient::menuButtonPressed()
 	button[BtnMenu]->setDown(false);
 }
 
-};
+}
 
 // Extended KWin plugin interface
 /////////////////////////////////
diff --git a/clients/quartz/quartz.h b/clients/quartz/quartz.h
index 799edc6307..d69d227474 100644
--- a/clients/quartz/quartz.h
+++ b/clients/quartz/quartz.h
@@ -112,7 +112,7 @@ class QuartzClient : public Client
 		QSpacerItem*  titlebar;
 };
 
-};
+}
 
 #endif
 // vim: ts=4
diff --git a/clients/redmond/redmond.cpp b/clients/redmond/redmond.cpp
index 9b74275427..f93656d33b 100644
--- a/clients/redmond/redmond.cpp
+++ b/clients/redmond/redmond.cpp
@@ -784,7 +784,7 @@ void GalliumClient::menuButtonReleased()
 	closeWindow();
 }
 
-};
+}
 
 extern "C"
 {
diff --git a/clients/redmond/redmond.h b/clients/redmond/redmond.h
index 752b004551..7d415bd965 100644
--- a/clients/redmond/redmond.h
+++ b/clients/redmond/redmond.h
@@ -98,7 +98,7 @@ class GalliumClient : public Client
 		bool           closing;
 };
 
-};
+}
 
 #endif
 // vim: ts=4
diff --git a/clients/web/Web.cpp b/clients/web/Web.cpp
index 281be2908e..aeb4a74c78 100644
--- a/clients/web/Web.cpp
+++ b/clients/web/Web.cpp
@@ -511,7 +511,7 @@ WebClient::animateIconifyOrDeiconify(bool /* iconify */)
   // Nice and simple ;)
 }
 
-};
+}
 
 #include "Web.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/clients/web/WebButton.cpp b/clients/web/WebButton.cpp
index ec8ce78ca6..c0a2074cb6 100644
--- a/clients/web/WebButton.cpp
+++ b/clients/web/WebButton.cpp
@@ -252,7 +252,7 @@ WebButton::resizeEvent(QResizeEvent *)
   repaint();
 }
 
-};
+}
 
 #include "WebButton.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/clients/web/WebButtonClose.cpp b/clients/web/WebButtonClose.cpp
index 2ed765201c..a83e2752d4 100644
--- a/clients/web/WebButtonClose.cpp
+++ b/clients/web/WebButtonClose.cpp
@@ -44,7 +44,7 @@ WebButtonClose::clickEvent(int /* button */)
   emit(closeWindow());
 }
 
-};
+}
 
 #include "WebButtonClose.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/clients/web/WebButtonHelp.cpp b/clients/web/WebButtonHelp.cpp
index 061eb5ffc0..7690c6097b 100644
--- a/clients/web/WebButtonHelp.cpp
+++ b/clients/web/WebButtonHelp.cpp
@@ -45,7 +45,7 @@ WebButtonHelp::clickEvent(int /* button */)
   emit(help());
 }
 
-};
+}
 
 #include "WebButtonHelp.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/clients/web/WebButtonIconify.cpp b/clients/web/WebButtonIconify.cpp
index 8087407ced..c93865ff7c 100644
--- a/clients/web/WebButtonIconify.cpp
+++ b/clients/web/WebButtonIconify.cpp
@@ -44,7 +44,7 @@ WebButtonIconify::clickEvent(int /* button */)
   emit(iconify());
 }
 
-};
+}
 
 #include "WebButtonIconify.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/clients/web/WebButtonLower.cpp b/clients/web/WebButtonLower.cpp
index 69eee6bf55..2bf0fad231 100644
--- a/clients/web/WebButtonLower.cpp
+++ b/clients/web/WebButtonLower.cpp
@@ -44,7 +44,7 @@ WebButtonLower::clickEvent(int /* button */)
   emit(lowerWindow());
 }
 
-};
+}
 
 #include "WebButtonLower.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/clients/web/WebButtonMaximize.cpp b/clients/web/WebButtonMaximize.cpp
index 9eba98fa37..43206c4dd5 100644
--- a/clients/web/WebButtonMaximize.cpp
+++ b/clients/web/WebButtonMaximize.cpp
@@ -58,7 +58,7 @@ WebButtonMaximize::clickEvent(int button)
   emit(maximize(button));
 }
 
-};
+}
 
 #include "WebButtonMaximize.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/clients/web/WebButtonSticky.cpp b/clients/web/WebButtonSticky.cpp
index 7df6dba49c..c5707a410a 100644
--- a/clients/web/WebButtonSticky.cpp
+++ b/clients/web/WebButtonSticky.cpp
@@ -58,7 +58,7 @@ WebButtonSticky::clickEvent(int /* button */)
   emit(toggleSticky());
 }
 
-};
+}
 
 #include "WebButtonSticky.moc"
 // vim:ts=2:sw=2:tw=78:set et:
diff --git a/geometrytip.h b/geometrytip.h
index bb6418bf5a..29f93165c2 100644
--- a/geometrytip.h
+++ b/geometrytip.h
@@ -25,6 +25,6 @@ class GeometryTip: public QLabel
 	const Client* c;
 };
 
-};
+}
 
 #endif
diff --git a/kcmkwin/kwindecoration/buttons.cpp b/kcmkwin/kwindecoration/buttons.cpp
index cb0edadb86..81f35a1c66 100644
--- a/kcmkwin/kwindecoration/buttons.cpp
+++ b/kcmkwin/kwindecoration/buttons.cpp
@@ -137,7 +137,7 @@ ButtonSource::ButtonSource( QWidget* parent, const char* name )
 
 	spacerCount = 0;	// No spacers inserted yet
 	setAcceptDrops( TRUE );
-};
+}
 
 
 ButtonSource::~ButtonSource()
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index d557a6ef5c..0cca376a2d 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -43,7 +43,7 @@
 // KCModule plugin interface
 // =========================
 typedef KGenericFactory<KWinDecorationModule, QWidget> KWinDecoFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") );
+K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") )
 
 KWinDecorationModule::KWinDecorationModule(QWidget* parent, const char* name, const QStringList &)
        : DCOPObject("KWinClientDecoration"), KCModule(KWinDecoFactory::instance(), parent, name),
diff --git a/killwindow.h b/killwindow.h
index 68b40cc680..1f9a360cb0 100644
--- a/killwindow.h
+++ b/killwindow.h
@@ -23,6 +23,6 @@ private:
     Workspace* workspace;
 };
 
-};
+}
 
 #endif
diff --git a/kwinbutton.h b/kwinbutton.h
index 51db1190a3..dcd9daecd5 100644
--- a/kwinbutton.h
+++ b/kwinbutton.h
@@ -112,7 +112,7 @@ class KWinWidgetButton: public QWidget
 };
 
 
-};
+}
 
 #endif
 // vim: ts=4
diff --git a/main.cpp b/main.cpp
index 8a3cba6bb4..9ba163661b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,7 +39,7 @@ using namespace KWinInternal;
 
 namespace KWinInternal {
 Options* options;
-};
+}
 
 Atoms* atoms;
 
diff --git a/options.cpp b/options.cpp
index 26c5cdb4d6..20764abd34 100644
--- a/options.cpp
+++ b/options.cpp
@@ -33,7 +33,7 @@ public:
     int electric_border_delay;
     bool show_geometry_tip;
 };
-};
+}
 
 #define colors (d->colors)
 #define cg (d->cg)
diff --git a/options.h b/options.h
index 4df1d38408..5d319640a9 100644
--- a/options.h
+++ b/options.h
@@ -364,6 +364,6 @@ private:
 
 extern Options* options;
 
-}; // namespace
+} // namespace
 
 #endif
diff --git a/placement.cpp b/placement.cpp
index 5dbe777f69..3e87c3dbe2 100644
--- a/placement.cpp
+++ b/placement.cpp
@@ -35,7 +35,7 @@ public:
     Workspace* m_WorkspacePtr;
 };
 
-};
+}
 
 Placement::Placement(Workspace* w)
 {
diff --git a/placement.h b/placement.h
index 7ace73c5c2..299fe3e9db 100644
--- a/placement.h
+++ b/placement.h
@@ -43,6 +43,6 @@ private:
 
 };
 
-};
+}
 
 #endif
diff --git a/plugins.h b/plugins.h
index 54d43860b8..e96d8a7d1d 100644
--- a/plugins.h
+++ b/plugins.h
@@ -40,6 +40,6 @@ protected:
     QCString defaultPlugin;
 };
 
-};
+}
 
 #endif
diff --git a/popupinfo.h b/popupinfo.h
index fcb4efa8f7..741f938ff7 100644
--- a/popupinfo.h
+++ b/popupinfo.h
@@ -38,6 +38,6 @@ private:
     QString m_infoString;
 };
 
-};
+}
 
 #endif
diff --git a/tabbox.h b/tabbox.h
index fc3a4f9ece..0b979a146d 100644
--- a/tabbox.h
+++ b/tabbox.h
@@ -82,6 +82,6 @@ inline TabBox::Mode TabBox::mode() const
     return m;
 }
 
-};
+}
 
 #endif
diff --git a/workspace.cpp b/workspace.cpp
index 1a5dfec1d6..eda78c98c5 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -135,7 +135,7 @@ public:
     QRect* workarea; //  array of workareas for virtual desktops
 };
 
-};
+}
 
 using namespace KWinInternal;
 
@@ -3009,10 +3009,10 @@ void Workspace::slotGrabWindow()
 		QMemArray<QRect> maskedAwayRects = maskedAway.rects();
 
 		//Fill the masked away area with black.
-		QPainter p(&p);
+		QPainter pt(&p);
 		for (uint pos = 0; pos < maskedAwayRects.count(); pos++)
-		    p.fillRect(maskedAwayRects[pos], Qt::black);
-		p.end();
+		    pt.fillRect(maskedAwayRects[pos], Qt::black);
+		pt.end();
 	    }
 	}
 
diff --git a/workspace.h b/workspace.h
index 8fb55171c3..10f6e38e17 100644
--- a/workspace.h
+++ b/workspace.h
@@ -522,6 +522,6 @@ inline void Workspace::showWindowMenu(QPoint pos, Client* cl)
 }
 
 
-};
+}
 
 #endif