diff --git a/clients/oxygen/config/oxygenanimationconfigwidget.h b/clients/oxygen/config/oxygenanimationconfigwidget.h
index 6867e9cecb..3953529469 100644
--- a/clients/oxygen/config/oxygenanimationconfigwidget.h
+++ b/clients/oxygen/config/oxygenanimationconfigwidget.h
@@ -55,7 +55,7 @@ namespace Oxygen
         void setConfiguration( ConfigurationPtr configuration )
         { _configuration = configuration; }
 
-        public slots:
+        public Q_SLOTS:
 
         //! read current configuration
         virtual void load( void );
@@ -63,7 +63,7 @@ namespace Oxygen
         //! save current configuration
         virtual void save( void );
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! check whether configuration is changed and emit appropriate signal if yes
         virtual void updateChanged();
diff --git a/clients/oxygen/config/oxygenconfig.h b/clients/oxygen/config/oxygenconfig.h
index 8d24aaf3a1..c445b700a7 100644
--- a/clients/oxygen/config/oxygenconfig.h
+++ b/clients/oxygen/config/oxygenconfig.h
@@ -55,7 +55,7 @@ namespace Oxygen {
         //! destructor
         ~Config();
 
-        signals:
+        Q_SIGNALS:
 
         //! emmited whenever configuration is changed
         void changed();
@@ -63,7 +63,7 @@ namespace Oxygen {
         //! emmited whenever configuration is changed
         void changed( bool );
 
-        public slots:
+        public Q_SLOTS:
 
         //! load configuration
         /*! although kconfiggroup argument is not used. It is required by KWin API */
@@ -87,7 +87,7 @@ namespace Oxygen {
         //! toggle expert mode
         void toggleExpertMode( bool );
 
-        private slots:
+        private Q_SLOTS:
 
         //! update change state
         void updateChanged( void );
diff --git a/clients/oxygen/config/oxygenconfigwidget.h b/clients/oxygen/config/oxygenconfigwidget.h
index b423e6f3f1..a1f67b62fc 100644
--- a/clients/oxygen/config/oxygenconfigwidget.h
+++ b/clients/oxygen/config/oxygenconfigwidget.h
@@ -81,12 +81,12 @@ namespace Oxygen
         //! event filter
         virtual bool eventFilter( QObject*, QEvent* );
 
-        signals:
+        Q_SIGNALS:
 
         //! emmited when changed
         void changed( bool );
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! toggle expert mode
         void toggleExpertModeInternal( void )
diff --git a/clients/oxygen/config/oxygendetectwidget.h b/clients/oxygen/config/oxygendetectwidget.h
index 487808c71e..7aaf98cd5b 100644
--- a/clients/oxygen/config/oxygendetectwidget.h
+++ b/clients/oxygen/config/oxygendetectwidget.h
@@ -72,7 +72,7 @@ namespace Oxygen
             else return Configuration::ExceptionWindowClassName;
         }
 
-        signals:
+        Q_SIGNALS:
 
         void detectionDone( bool );
 
diff --git a/clients/oxygen/config/oxygenexceptiondialog.h b/clients/oxygen/config/oxygenexceptiondialog.h
index 50e8808cee..fe4e9f41d5 100644
--- a/clients/oxygen/config/oxygenexceptiondialog.h
+++ b/clients/oxygen/config/oxygenexceptiondialog.h
@@ -64,7 +64,7 @@ namespace Oxygen
         virtual bool isChanged( void ) const
         { return _changed; }
 
-        signals:
+        Q_SIGNALS:
 
         //! emmited when changed
         void changed( bool );
@@ -78,12 +78,12 @@ namespace Oxygen
             emit changed( value );
         }
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! check whether configuration is changed and emit appropriate signal if yes
         virtual void updateChanged();
 
-        private slots:
+        private Q_SLOTS:
 
         //! select window properties from grabbed pointers
         void selectWindowProperties( void );
diff --git a/clients/oxygen/config/oxygenexceptionlistwidget.h b/clients/oxygen/config/oxygenexceptionlistwidget.h
index fea223c436..dfc8b291b8 100644
--- a/clients/oxygen/config/oxygenexceptionlistwidget.h
+++ b/clients/oxygen/config/oxygenexceptionlistwidget.h
@@ -53,7 +53,7 @@ namespace Oxygen
         virtual bool isChanged( void ) const
         { return _changed; }
 
-        signals:
+        Q_SIGNALS:
 
         //! emitted when changed
         void changed( bool );
@@ -68,7 +68,7 @@ namespace Oxygen
         ExceptionModel& model()
         { return _model; }
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! update button states
         virtual void updateButtons( void );
diff --git a/clients/oxygen/demo/oxygenshadowdemodialog.h b/clients/oxygen/demo/oxygenshadowdemodialog.h
index 945bb049be..de50c32834 100644
--- a/clients/oxygen/demo/oxygenshadowdemodialog.h
+++ b/clients/oxygen/demo/oxygenshadowdemodialog.h
@@ -50,7 +50,7 @@ namespace Oxygen
         virtual ~ShadowDemoDialog( void )
         {}
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! reparse configuration
         void reparseConfiguration( void );
diff --git a/clients/oxygen/demo/oxygenshadowdemowidget.h b/clients/oxygen/demo/oxygenshadowdemowidget.h
index d34bf02317..6ebc55afc2 100644
--- a/clients/oxygen/demo/oxygenshadowdemowidget.h
+++ b/clients/oxygen/demo/oxygenshadowdemowidget.h
@@ -87,7 +87,7 @@ namespace Oxygen
              if( isVisible() ) update();
         }
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! toggle background drawing
         void toggleBackground( bool value )
diff --git a/clients/oxygen/oxygenbutton.h b/clients/oxygen/oxygenbutton.h
index e84600cf6b..1302f52a61 100644
--- a/clients/oxygen/oxygenbutton.h
+++ b/clients/oxygen/oxygenbutton.h
@@ -168,7 +168,7 @@ namespace Oxygen
 
         //@}
 
-        private slots:
+        private Q_SLOTS:
             void slotAppMenuHidden();
 
         private:
diff --git a/clients/oxygen/oxygenclient.h b/clients/oxygen/oxygenclient.h
index 208e8724a4..d0c130faaa 100644
--- a/clients/oxygen/oxygenclient.h
+++ b/clients/oxygen/oxygenclient.h
@@ -236,7 +236,7 @@ namespace Oxygen
         //! paint background to painter
         void paintBackground( QPainter& ) const;
 
-        public slots:
+        public Q_SLOTS:
 
         //! triggers widget update in titleRect only
         /*! one needs to add the title top margin to avoid some clipping glitches */
@@ -419,7 +419,7 @@ namespace Oxygen
         //! remove shadow hint
         void removeShadowHint( void );
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! set target item to -1
         void clearTargetItem( void );
diff --git a/clients/oxygen/oxygensizegrip.h b/clients/oxygen/oxygensizegrip.h
index df9ba79249..153df6f380 100644
--- a/clients/oxygen/oxygensizegrip.h
+++ b/clients/oxygen/oxygensizegrip.h
@@ -51,12 +51,12 @@ namespace Oxygen
         //! event filter
         virtual bool eventFilter( QObject*, QEvent* );
 
-        public slots:
+        public Q_SLOTS:
 
         //! update background color
         void activeChange( void );
 
-        protected slots:
+        protected Q_SLOTS:
 
         //! embed into parent widget
         void embed( void );
diff --git a/clients/oxygen/oxygentitleanimationdata.h b/clients/oxygen/oxygentitleanimationdata.h
index c07d5868d4..24e13733ce 100644
--- a/clients/oxygen/oxygentitleanimationdata.h
+++ b/clients/oxygen/oxygentitleanimationdata.h
@@ -154,7 +154,7 @@ namespace Oxygen
         bool isDirty( void ) const
         { return _dirty; }
 
-        signals:
+        Q_SIGNALS:
 
         void pixmapsChanged( void );