diff --git a/config/qt.m4 b/config/qt.m4
index 42ae774326..9efead39a8 100644
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -472,7 +472,7 @@ AC_DEFUN([QT4_DO_IT_ALL],
 	AC_SUBST(QT4_LDFLAGS)
 
 	dnl Preprocessor flags
-	QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT3_SUPPORT -DQT_NO_EMIT"
+	QT4_CPPFLAGS="-DQT_CLEAN_NAMESPACE -DQT_GENUINE_STR -DQT_NO_STL -DQT3_SUPPORT -DQT_NO_KEYWORDS"
 	case ${host} in
 	*mingw*) QT4_CPPFLAGS="-DQT_DLL $QT4_CPPFLAGS";;
 	esac
diff --git a/src/frontends/qt4/Action.h b/src/frontends/qt4/Action.h
index b5c501d820..ba00167e0e 100644
--- a/src/frontends/qt4/Action.h
+++ b/src/frontends/qt4/Action.h
@@ -46,7 +46,7 @@ public:
 
 //	void setAction(FuncRequest const & func);
 
-private slots:
+private Q_SLOTS:
 	void action();
 
 private:
diff --git a/src/frontends/qt4/BulletsModule.h b/src/frontends/qt4/BulletsModule.h
index 9481a64df3..050854004a 100644
--- a/src/frontends/qt4/BulletsModule.h
+++ b/src/frontends/qt4/BulletsModule.h
@@ -38,10 +38,10 @@ public:
 	/// get bullet setting
 	Bullet const & getBullet(int level) const;
 
-signals:
+Q_SIGNALS:
 	void changed();
 
-protected slots:
+protected Q_SLOTS:
 
 	/// menu callbacks
 	void standard(int row, int col);
diff --git a/src/frontends/qt4/FileDialog_private.h b/src/frontends/qt4/FileDialog_private.h
index a8f3c80e4e..0a0fc56c58 100644
--- a/src/frontends/qt4/FileDialog_private.h
+++ b/src/frontends/qt4/FileDialog_private.h
@@ -36,7 +36,7 @@ public:
 		      lyx::support::FileFilterList const & filters,
 		      FileDialog::Button const & b1,
 		      FileDialog::Button const & b2);
-public slots:
+public Q_SLOTS:
 	void buttonClicked();
 private:
 	QToolButton * b1_;
diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 6173ac5fbb..6918e4d51e 100644
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -78,7 +78,7 @@ public:
 	///
 	static QMainWindow* mainWidget();
 
-public slots:
+public Q_SLOTS:
 	/// idle timeout
 	void update_view_state_qt();
 
diff --git a/src/frontends/qt4/GuiWorkArea.h b/src/frontends/qt4/GuiWorkArea.h
index b44cad93c2..878f1869a8 100644
--- a/src/frontends/qt4/GuiWorkArea.h
+++ b/src/frontends/qt4/GuiWorkArea.h
@@ -168,7 +168,7 @@ protected:
 	/// IM events
 	void inputMethodEvent(QInputMethodEvent * e);
 
-public slots:
+public Q_SLOTS:
 
 	/// Timeout event Slot for keyboard bufferring.
 	/// \todo This is not used currently in the code, remove?
diff --git a/src/frontends/qt4/InsertTableWidget.h b/src/frontends/qt4/InsertTableWidget.h
index 176ed95417..311b4f9288 100644
--- a/src/frontends/qt4/InsertTableWidget.h
+++ b/src/frontends/qt4/InsertTableWidget.h
@@ -26,17 +26,17 @@ public:
 
 	InsertTableWidget(LyXView &, QWidget *);
 
-signals:
+Q_SIGNALS:
 	//! widget is visible
 	void visible(bool);
 
-public slots:
+public Q_SLOTS:
 	//! show the widget
 	void show(bool);
 	//! enable/disable parent
 	void updateParent();
 
-protected slots:
+protected Q_SLOTS:
 	void mouseMoveEvent(QMouseEvent *);
 	void mouseReleaseEvent(QMouseEvent *);
 	void mousePressEvent(QMouseEvent *);
diff --git a/src/frontends/qt4/QBibitemDialog.h b/src/frontends/qt4/QBibitemDialog.h
index 0e03222dd2..5415c42308 100644
--- a/src/frontends/qt4/QBibitemDialog.h
+++ b/src/frontends/qt4/QBibitemDialog.h
@@ -29,7 +29,7 @@ class QBibitemDialog : public QDialog, public Ui::QBibitemUi {
 public:
 
 	QBibitemDialog(QBibitem * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 protected:
 	virtual void closeEvent(QCloseEvent * e);
diff --git a/src/frontends/qt4/QBibtexDialog.h b/src/frontends/qt4/QBibtexDialog.h
index 5161a340f2..7c70e79654 100644
--- a/src/frontends/qt4/QBibtexDialog.h
+++ b/src/frontends/qt4/QBibtexDialog.h
@@ -45,7 +45,7 @@ public:
 
 	UiDialog<Ui::QBibtexAddUi> * add_;
 
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void browsePressed();
 	virtual void browseBibPressed();
diff --git a/src/frontends/qt4/QBoxDialog.h b/src/frontends/qt4/QBoxDialog.h
index f6bc189389..86f6188a58 100644
--- a/src/frontends/qt4/QBoxDialog.h
+++ b/src/frontends/qt4/QBoxDialog.h
@@ -26,7 +26,7 @@ class QBoxDialog : public QDialog, public Ui::QBoxUi {
 	Q_OBJECT
 public:
 	QBoxDialog(QBox * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void innerBoxChanged(const QString &);
 	virtual void typeChanged(int);
diff --git a/src/frontends/qt4/QBranchDialog.h b/src/frontends/qt4/QBranchDialog.h
index 99b8354836..b87e25d957 100644
--- a/src/frontends/qt4/QBranchDialog.h
+++ b/src/frontends/qt4/QBranchDialog.h
@@ -26,7 +26,7 @@ class QBranchDialog : public QDialog, public Ui::QBranchUi {
 	Q_OBJECT
 public:
 	QBranchDialog(QBranch * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 protected:
 	virtual void closeEvent(QCloseEvent * e);
diff --git a/src/frontends/qt4/QBranches.h b/src/frontends/qt4/QBranches.h
index b83d197b4c..cfbfd5f131 100644
--- a/src/frontends/qt4/QBranches.h
+++ b/src/frontends/qt4/QBranches.h
@@ -40,14 +40,14 @@ public:
 	void update(BufferParams const & params);
 	void apply(BufferParams & params) const;
 
-signals:
+Q_SIGNALS:
 	void changed();
 
 protected:
 	void toggleBranch(QTreeWidgetItem *);
 	void update();
 
-protected slots:
+protected Q_SLOTS:
 	void on_addBranchPB_pressed();
 	void on_removePB_pressed();
 	void on_activatePB_pressed();
diff --git a/src/frontends/qt4/QChangesDialog.h b/src/frontends/qt4/QChangesDialog.h
index 2cbb7d3f91..74703da0f6 100644
--- a/src/frontends/qt4/QChangesDialog.h
+++ b/src/frontends/qt4/QChangesDialog.h
@@ -29,7 +29,7 @@ public:
 
 	QChangesDialog(QChanges * form);
 
-protected slots:
+protected Q_SLOTS:
 
 	virtual void nextPressed();
 	virtual void acceptPressed();
diff --git a/src/frontends/qt4/QCharacterDialog.h b/src/frontends/qt4/QCharacterDialog.h
index 2127a225e6..4b6863ae79 100644
--- a/src/frontends/qt4/QCharacterDialog.h
+++ b/src/frontends/qt4/QCharacterDialog.h
@@ -33,7 +33,7 @@ protected:
 	void closeEvent(QCloseEvent * e);
 private:
 	QCharacter * form_;
-protected slots:
+protected Q_SLOTS:
 	void change_adaptor();
 };
 
diff --git a/src/frontends/qt4/QCitationDialog.h b/src/frontends/qt4/QCitationDialog.h
index 6867c5a5a1..46fd7ffe0b 100644
--- a/src/frontends/qt4/QCitationDialog.h
+++ b/src/frontends/qt4/QCitationDialog.h
@@ -45,7 +45,7 @@ public:
 	/// \return true if the dialog is visible.
 	bool isVisible() const;
 
-protected slots:
+protected Q_SLOTS:
 
 	void on_okPB_clicked();
 	void on_cancelPB_clicked();
diff --git a/src/frontends/qt4/QCommandBuffer.h b/src/frontends/qt4/QCommandBuffer.h
index 44f87a9a57..3aee759f7f 100644
--- a/src/frontends/qt4/QCommandBuffer.h
+++ b/src/frontends/qt4/QCommandBuffer.h
@@ -30,7 +30,7 @@ public:
 
 	/// focus the edit widget
 	void focus_command();
-public slots:
+public Q_SLOTS:
 	/// cancel command compose
 	void cancel();
 	/// dispatch a command
diff --git a/src/frontends/qt4/QCommandEdit.h b/src/frontends/qt4/QCommandEdit.h
index 1400b73d10..d37c1a2f00 100644
--- a/src/frontends/qt4/QCommandEdit.h
+++ b/src/frontends/qt4/QCommandEdit.h
@@ -23,7 +23,7 @@ class QCommandEdit : public QLineEdit {
 	Q_OBJECT
 public:
 	QCommandEdit(QWidget * parent);
-signals:
+Q_SIGNALS:
 	/// cancel
 	void escapePressed();
 
diff --git a/src/frontends/qt4/QDelimiterDialog.h b/src/frontends/qt4/QDelimiterDialog.h
index 2ef6d6374e..6c18d2d48f 100644
--- a/src/frontends/qt4/QDelimiterDialog.h
+++ b/src/frontends/qt4/QDelimiterDialog.h
@@ -30,7 +30,7 @@ class QDelimiterDialog : public QDialog, public Ui::QDelimiterUi {
 	Q_OBJECT
 public:
 	QDelimiterDialog(QMathDelimiter * form);
-public slots:
+public Q_SLOTS:
 	void ldelim_clicked(const std::string & str);
 	void rdelim_clicked(const std::string & str);
 	void insertClicked();
diff --git a/src/frontends/qt4/QDialogView.h b/src/frontends/qt4/QDialogView.h
index 1d9ca041cd..06d2e999a8 100644
--- a/src/frontends/qt4/QDialogView.h
+++ b/src/frontends/qt4/QDialogView.h
@@ -63,7 +63,7 @@ protected:
 	/// are we updating ?
 	bool updating_;
 
-public slots:
+public Q_SLOTS:
 	// dialog closed from WM
 	void slotWMHide();
 
diff --git a/src/frontends/qt4/QDocumentDialog.h b/src/frontends/qt4/QDocumentDialog.h
index ad75999f74..fe2fdd3b6c 100644
--- a/src/frontends/qt4/QDocumentDialog.h
+++ b/src/frontends/qt4/QDocumentDialog.h
@@ -67,13 +67,13 @@ public:
 
 	void showPreamble();
 
-public slots:
+public Q_SLOTS:
 	void updateNumbering();
 	void change_adaptor();
 	void saveDefaultClicked();
 	void useDefaultsClicked();
 
-protected slots:
+protected Q_SLOTS:
 	void setLSpacing(int);
 	void setMargins(bool);
 	void setCustomPapersize(int);
diff --git a/src/frontends/qt4/QERTDialog.h b/src/frontends/qt4/QERTDialog.h
index 9cf4bfa374..529c5e7d08 100644
--- a/src/frontends/qt4/QERTDialog.h
+++ b/src/frontends/qt4/QERTDialog.h
@@ -26,7 +26,7 @@ class QERTDialog : public QDialog, public Ui::QERTUi {
 	Q_OBJECT
 public:
 	QERTDialog(QERT * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 protected:
 	virtual void closeEvent(QCloseEvent * e);
diff --git a/src/frontends/qt4/QErrorListDialog.h b/src/frontends/qt4/QErrorListDialog.h
index 0dfa88ca03..d4893e1f15 100644
--- a/src/frontends/qt4/QErrorListDialog.h
+++ b/src/frontends/qt4/QErrorListDialog.h
@@ -29,7 +29,7 @@ class QErrorListDialog : public QDialog, public Ui::QErrorListUi {
 public:
 	QErrorListDialog(QErrorList * form);
 	~QErrorListDialog();
-public slots:
+public Q_SLOTS:
 	void select_adaptor(QListWidgetItem *);
 protected:
 	void closeEvent(QCloseEvent * e);
diff --git a/src/frontends/qt4/QExternalDialog.h b/src/frontends/qt4/QExternalDialog.h
index 4469263fa1..e55c0079f2 100644
--- a/src/frontends/qt4/QExternalDialog.h
+++ b/src/frontends/qt4/QExternalDialog.h
@@ -28,7 +28,7 @@ public:
 	QExternalDialog(QExternal * form);
 
 	virtual void show();
-protected slots:
+protected Q_SLOTS:
 	virtual void bbChanged();
 	virtual void browseClicked();
 	virtual void change_adaptor();
diff --git a/src/frontends/qt4/QFloatDialog.h b/src/frontends/qt4/QFloatDialog.h
index 0c38fdc77d..24e75f5dc9 100644
--- a/src/frontends/qt4/QFloatDialog.h
+++ b/src/frontends/qt4/QFloatDialog.h
@@ -27,7 +27,7 @@ class QFloatDialog : public QDialog, public Ui::QFloatUi {
 public:
 	QFloatDialog(QFloat * form);
 
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 
 protected:
diff --git a/src/frontends/qt4/QGraphicsDialog.h b/src/frontends/qt4/QGraphicsDialog.h
index 82685b5d0e..be98f8b5fd 100644
--- a/src/frontends/qt4/QGraphicsDialog.h
+++ b/src/frontends/qt4/QGraphicsDialog.h
@@ -30,7 +30,7 @@ public:
 	QGraphicsDialog(QGraphics * form);
 
 	virtual void show();
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void change_bb();
 	virtual void change_WUnit();
diff --git a/src/frontends/qt4/QIncludeDialog.h b/src/frontends/qt4/QIncludeDialog.h
index d955ee8726..66d74d22f2 100644
--- a/src/frontends/qt4/QIncludeDialog.h
+++ b/src/frontends/qt4/QIncludeDialog.h
@@ -30,7 +30,7 @@ public:
 	void updateLists();
 
 	virtual void show();
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void loadClicked();
 	virtual void browseClicked();
diff --git a/src/frontends/qt4/QIndexDialog.h b/src/frontends/qt4/QIndexDialog.h
index 3578407da9..93754e1501 100644
--- a/src/frontends/qt4/QIndexDialog.h
+++ b/src/frontends/qt4/QIndexDialog.h
@@ -28,7 +28,7 @@ public:
 	QIndexDialog(QIndex * form);
 
 	virtual void show();
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void reject();
 protected:
diff --git a/src/frontends/qt4/QLMenubar.h b/src/frontends/qt4/QLMenubar.h
index ab17a4a043..553752473c 100644
--- a/src/frontends/qt4/QLMenubar.h
+++ b/src/frontends/qt4/QLMenubar.h
@@ -55,7 +55,7 @@ public:
 	/// update the state of the menuitems - not needed
 	void update();
 
-public slots:
+public Q_SLOTS:
 	/// populate a toplevel menu and all its children on demand
 //	void updateMenu();
 
diff --git a/src/frontends/qt4/QLPopupMenu.h b/src/frontends/qt4/QLPopupMenu.h
index 932ea0057c..49ef6327bc 100644
--- a/src/frontends/qt4/QLPopupMenu.h
+++ b/src/frontends/qt4/QLPopupMenu.h
@@ -36,7 +36,7 @@ public:
 	/// This is used as a recursive function
 	void populate(QMenu* qMenu, Menu * menu);
 
-public slots:
+public Q_SLOTS:
 	/// populate the toplevel menu and all children
 	void update();
 
diff --git a/src/frontends/qt4/QLPrintDialog.h b/src/frontends/qt4/QLPrintDialog.h
index 7b07de2446..f61ca673e7 100644
--- a/src/frontends/qt4/QLPrintDialog.h
+++ b/src/frontends/qt4/QLPrintDialog.h
@@ -26,7 +26,7 @@ class QLPrintDialog : public QDialog, public Ui::QPrintUi {
 	Q_OBJECT
 public:
 	QLPrintDialog(QPrint * f);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void browseClicked();
 	virtual void fileChanged();
diff --git a/src/frontends/qt4/QLToolbar.h b/src/frontends/qt4/QLToolbar.h
index 0a7d303ea6..3557ff07d5 100644
--- a/src/frontends/qt4/QLToolbar.h
+++ b/src/frontends/qt4/QLToolbar.h
@@ -49,7 +49,7 @@ public:
 	///
 	void setEnabled(bool);
 
-private slots:
+private Q_SLOTS:
 	void selected(const QString & str);
 
 private:
@@ -71,7 +71,7 @@ public:
 	void update();
 	LayoutBox * layout() const { return layout_.get(); }
 
-signals:
+Q_SIGNALS:
 	void updated();
 
 private:
diff --git a/src/frontends/qt4/QLogDialog.h b/src/frontends/qt4/QLogDialog.h
index 21b345cced..8ea96fc6e2 100644
--- a/src/frontends/qt4/QLogDialog.h
+++ b/src/frontends/qt4/QLogDialog.h
@@ -26,7 +26,7 @@ class QLogDialog : public QDialog, public Ui::QLogUi {
 	Q_OBJECT
 public:
 	QLogDialog(QLog * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void updateClicked();
 protected:
 	virtual void closeEvent(QCloseEvent * e);
diff --git a/src/frontends/qt4/QMathDialog.h b/src/frontends/qt4/QMathDialog.h
index 633506b8b7..b783e3b0e3 100644
--- a/src/frontends/qt4/QMathDialog.h
+++ b/src/frontends/qt4/QMathDialog.h
@@ -30,9 +30,9 @@ public:
 	: QAction(text,parent), action_(action) {
 		connect(this, SIGNAL(triggered()), this, SLOT(action()));
 	}
-signals:
+Q_SIGNALS:
 	void action(const std::string &);
-protected slots:
+protected Q_SLOTS:
 	void action() {
                 // emit signal
 		action(action_);
@@ -49,7 +49,7 @@ class QMathDialog : public QDialog, public Ui::QMathUi
 	Q_OBJECT
 public:
 	QMathDialog(QMath * form);
-public slots:
+public Q_SLOTS:
 	virtual void delimiterClicked();
 	virtual void expandClicked();
 	virtual void fracClicked();
diff --git a/src/frontends/qt4/QMathMatrixDialog.h b/src/frontends/qt4/QMathMatrixDialog.h
index 4569a69d6d..19028620de 100644
--- a/src/frontends/qt4/QMathMatrixDialog.h
+++ b/src/frontends/qt4/QMathMatrixDialog.h
@@ -27,10 +27,10 @@ class QMathMatrixDialog : public QDialog, public Ui::QMathMatrixUi {
 	Q_OBJECT
 public:
 	QMathMatrixDialog(QMathMatrix * form);
-public slots:
+public Q_SLOTS:
 	void slotOK();
 	void slotClose();
-protected slots:
+protected Q_SLOTS:
 	virtual void columnsChanged(int);
 	virtual void rowsChanged(int);
 	virtual void change_adaptor();
diff --git a/src/frontends/qt4/QNoteDialog.h b/src/frontends/qt4/QNoteDialog.h
index 62a4b494a7..f06c4c34b6 100644
--- a/src/frontends/qt4/QNoteDialog.h
+++ b/src/frontends/qt4/QNoteDialog.h
@@ -26,7 +26,7 @@ class QNoteDialog : public QDialog, public Ui::QNoteUi {
 	Q_OBJECT
 public:
 	QNoteDialog(QNote * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 protected:
 	virtual void closeEvent(QCloseEvent * e);
diff --git a/src/frontends/qt4/QParagraphDialog.h b/src/frontends/qt4/QParagraphDialog.h
index 87da411393..48c7a694ff 100644
--- a/src/frontends/qt4/QParagraphDialog.h
+++ b/src/frontends/qt4/QParagraphDialog.h
@@ -31,7 +31,7 @@ protected:
 	void closeEvent (QCloseEvent * e);
 private:
 	QParagraph * form_;
-protected slots:
+protected Q_SLOTS:
 	void change_adaptor();
 	void enableLinespacingValue(int);
 };
diff --git a/src/frontends/qt4/QPrefsDialog.h b/src/frontends/qt4/QPrefsDialog.h
index f4958f82c5..d86e7eb4bd 100644
--- a/src/frontends/qt4/QPrefsDialog.h
+++ b/src/frontends/qt4/QPrefsDialog.h
@@ -82,7 +82,7 @@ protected:
 	std::string title_;
 	QPrefs * form_;
 
-signals:
+Q_SIGNALS:
 	void changed();
 };
 
@@ -121,7 +121,7 @@ public:
 	virtual void apply(LyXRC & rc) const;
 	virtual void update(LyXRC const & rc);
 
-private slots:
+private Q_SLOTS:
 	void on_firstKeymapPB_clicked(bool);
 	void on_secondKeymapPB_clicked(bool);
 
@@ -152,7 +152,7 @@ public:
 	virtual void apply(LyXRC & rc) const;
 	virtual void update(LyXRC const & rc);
 
-private slots:
+private Q_SLOTS:
 	void select_roman(const QString&);
 	void select_sans(const QString&);
 	void select_typewriter(const QString&);
@@ -169,7 +169,7 @@ public:
 	void apply(LyXRC & rc) const;
 	void update(LyXRC const & rc);
 
-private slots:
+private Q_SLOTS:
 	void change_color();
 
 private:
@@ -214,7 +214,7 @@ public:
 	void apply(LyXRC & rc) const;
 	void update(LyXRC const & rc);
 
-private slots:
+private Q_SLOTS:
 	void select_templatedir();
 	void select_tempdir();
 	void select_backupdir();
@@ -234,7 +234,7 @@ public:
 	void apply(LyXRC & rc) const;
 	void update(LyXRC const & rc);
 
-private slots:
+private Q_SLOTS:
 	void select_dict();
 };
 
@@ -251,7 +251,7 @@ public:
 
 	void updateGui();
 
-private slots:
+private Q_SLOTS:
 	void switch_converter(int);
 	void converter_changed();
 	void new_converter();
@@ -275,7 +275,7 @@ public:
 
 	void update();
 
-private slots:
+private Q_SLOTS:
 	void switch_copierLB(int nr);
 	void switch_copierCO(int nr);
 	void copiers_changed();
@@ -305,7 +305,7 @@ public:
 private:
 	void updateButtons();
 
-private slots:
+private Q_SLOTS:
 	void switch_format(int);
 	void fileformat_changed();
 	void new_format();
@@ -356,7 +356,7 @@ public:
 	void apply(LyXRC & rc) const;
 	void update(LyXRC const & rc);
 
-public slots:
+public Q_SLOTS:
 	void select_ui();
 	void select_bind();
 
@@ -386,7 +386,7 @@ public:
 	void apply(LyXRC & rc) const;
 	void update(LyXRC const & rc);
 
-public slots:
+public Q_SLOTS:
 	void change_adaptor();
 
 protected:
diff --git a/src/frontends/qt4/QRefDialog.h b/src/frontends/qt4/QRefDialog.h
index d01d78f874..26f9dad76e 100644
--- a/src/frontends/qt4/QRefDialog.h
+++ b/src/frontends/qt4/QRefDialog.h
@@ -32,7 +32,7 @@ public:
 
 	virtual void show();
 
-public slots:
+public Q_SLOTS:
 	void changed_adaptor();
 	void gotoClicked();
 	void refHighlighted(QListWidgetItem *);
diff --git a/src/frontends/qt4/QSearchDialog.h b/src/frontends/qt4/QSearchDialog.h
index e6db98c573..e75cbeae62 100644
--- a/src/frontends/qt4/QSearchDialog.h
+++ b/src/frontends/qt4/QSearchDialog.h
@@ -32,7 +32,7 @@ public:
 	QSearchDialog(QSearch * form);
 
 	virtual void show();
-protected slots:
+protected Q_SLOTS:
 	void findChanged();
 	void findClicked();
 	void replaceClicked();
diff --git a/src/frontends/qt4/QSendtoDialog.h b/src/frontends/qt4/QSendtoDialog.h
index 312b232db2..7d73ace9f4 100644
--- a/src/frontends/qt4/QSendtoDialog.h
+++ b/src/frontends/qt4/QSendtoDialog.h
@@ -28,7 +28,7 @@ class QSendtoDialog : public QDialog, public Ui::QSendtoUi {
 	Q_OBJECT
 public:
 	QSendtoDialog(QSendto * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void changed_adaptor();
 	virtual void slotFormatHighlighted(QListWidgetItem *) {}
 	virtual void slotFormatSelected(QListWidgetItem *) {}
diff --git a/src/frontends/qt4/QSpellcheckerDialog.h b/src/frontends/qt4/QSpellcheckerDialog.h
index 18ef0863a2..dba8ec8fee 100644
--- a/src/frontends/qt4/QSpellcheckerDialog.h
+++ b/src/frontends/qt4/QSpellcheckerDialog.h
@@ -28,10 +28,10 @@ class QSpellcheckerDialog: public QDialog, public Ui::QSpellcheckerUi {
 	Q_OBJECT
 public:
 	QSpellcheckerDialog(QSpellchecker * form);
-public slots:
+public Q_SLOTS:
 	virtual void suggestionChanged(QListWidgetItem *);
 
-protected slots:
+protected Q_SLOTS:
 	virtual void acceptClicked();
 	virtual void addClicked();
 	virtual void replaceClicked();
diff --git a/src/frontends/qt4/QTabularCreateDialog.h b/src/frontends/qt4/QTabularCreateDialog.h
index c4eae1b87f..e7dde850fb 100644
--- a/src/frontends/qt4/QTabularCreateDialog.h
+++ b/src/frontends/qt4/QTabularCreateDialog.h
@@ -26,7 +26,7 @@ class QTabularCreateDialog : public QDialog, public Ui::QTabularCreateUi {
 	Q_OBJECT
 public:
 	QTabularCreateDialog(QTabularCreate * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void columnsChanged(int);
 	virtual void rowsChanged(int);
 private:
diff --git a/src/frontends/qt4/QTabularDialog.h b/src/frontends/qt4/QTabularDialog.h
index 120c063f97..4f0fb2e406 100644
--- a/src/frontends/qt4/QTabularDialog.h
+++ b/src/frontends/qt4/QTabularDialog.h
@@ -29,7 +29,7 @@ class QTabularDialog : public QDialog, public Ui::QTabularUi {
 public:
 	QTabularDialog(QTabular * form);
 
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 
 	virtual void close_clicked();
diff --git a/src/frontends/qt4/QTexinfoDialog.h b/src/frontends/qt4/QTexinfoDialog.h
index 7c23620ee4..9074518d95 100644
--- a/src/frontends/qt4/QTexinfoDialog.h
+++ b/src/frontends/qt4/QTexinfoDialog.h
@@ -26,7 +26,7 @@ class QTexinfoDialog : public QDialog, public Ui::QTexinfoUi {
 	Q_OBJECT
 public:
 	QTexinfoDialog(QTexinfo * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void rescanClicked();
 	virtual void viewClicked();
diff --git a/src/frontends/qt4/QThesaurusDialog.h b/src/frontends/qt4/QThesaurusDialog.h
index 9f6af12f53..90f80c32d1 100644
--- a/src/frontends/qt4/QThesaurusDialog.h
+++ b/src/frontends/qt4/QThesaurusDialog.h
@@ -30,7 +30,7 @@ public:
 	QThesaurusDialog(QThesaurus * form);
 
 	void updateLists();
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 	virtual void entryChanged();
 	virtual void replaceClicked();
diff --git a/src/frontends/qt4/QTocDialog.h b/src/frontends/qt4/QTocDialog.h
index dd9d60b90b..df86647ebf 100644
--- a/src/frontends/qt4/QTocDialog.h
+++ b/src/frontends/qt4/QTocDialog.h
@@ -52,7 +52,7 @@ public:
 	/// \return true if the dialog is visible.
 	bool isVisible() const;
 
-protected slots:
+protected Q_SLOTS:
 	///
 	void select(QModelIndex const & index);
 	///
diff --git a/src/frontends/qt4/QURLDialog.h b/src/frontends/qt4/QURLDialog.h
index c6a38f3b1f..22c83f25a0 100644
--- a/src/frontends/qt4/QURLDialog.h
+++ b/src/frontends/qt4/QURLDialog.h
@@ -29,7 +29,7 @@ public:
 	~QURLDialog();
 
 	virtual void show();
-public slots:
+public Q_SLOTS:
 	void changed_adaptor();
 protected:
 	void closeEvent(QCloseEvent *);
diff --git a/src/frontends/qt4/QVSpaceDialog.h b/src/frontends/qt4/QVSpaceDialog.h
index 5bbb363ef9..921eb01de8 100644
--- a/src/frontends/qt4/QVSpaceDialog.h
+++ b/src/frontends/qt4/QVSpaceDialog.h
@@ -29,10 +29,10 @@ class QVSpaceDialog : public QDialog, public Ui::QVSpaceUi {
 public:
 	QVSpaceDialog(QVSpace * form);
 
-public slots:
+public Q_SLOTS:
 	void change_adaptor();
 
-protected slots:
+protected Q_SLOTS:
 	void closeEvent(QCloseEvent *);
 	void enableCustom(int);
 
diff --git a/src/frontends/qt4/QWrapDialog.h b/src/frontends/qt4/QWrapDialog.h
index 1987fd4033..5613caa23e 100644
--- a/src/frontends/qt4/QWrapDialog.h
+++ b/src/frontends/qt4/QWrapDialog.h
@@ -26,7 +26,7 @@ class QWrapDialog : public QDialog, public Ui::QWrapUi {
 	Q_OBJECT
 public:
 	QWrapDialog(QWrap * form);
-protected slots:
+protected Q_SLOTS:
 	virtual void change_adaptor();
 protected:
 	virtual void closeEvent(QCloseEvent * e);
diff --git a/src/frontends/qt4/emptytable.h b/src/frontends/qt4/emptytable.h
index 107d52f09f..6d6d274ee6 100644
--- a/src/frontends/qt4/emptytable.h
+++ b/src/frontends/qt4/emptytable.h
@@ -29,12 +29,12 @@ public:
 	~EmptyTable() {}
 
 	virtual QSize sizeHint() const;
-public slots:
+public Q_SLOTS:
 	/// set the number of columns in the table and emit colsChanged() signal
 	void setNumberColumns(int nr_cols);
 	/// set the number of rows in the table and emit rowsChanged() signal
 	void setNumberRows(int nr_rows);
-signals:
+Q_SIGNALS:
 	/// the number of columns changed
 	void colsChanged(int);
 	/// the number of rows changed
diff --git a/src/frontends/qt4/floatplacement.h b/src/frontends/qt4/floatplacement.h
index 5a00857fbc..e61529e1bb 100644
--- a/src/frontends/qt4/floatplacement.h
+++ b/src/frontends/qt4/floatplacement.h
@@ -39,14 +39,14 @@ public:
 	std::string const get(bool & wide, bool & sideways) const;
 	std::string const get() const;
 
-public slots:
+public Q_SLOTS:
 	void tbhpClicked();
 	void heredefinitelyClicked();
 	void spanClicked();
 	void sidewaysClicked();
 	void changedSlot();
 
-signals:
+Q_SIGNALS:
 	void changed();
 
 private:
diff --git a/src/frontends/qt4/iconpalette.h b/src/frontends/qt4/iconpalette.h
index 49e23cafe1..e17d180bd9 100644
--- a/src/frontends/qt4/iconpalette.h
+++ b/src/frontends/qt4/iconpalette.h
@@ -35,11 +35,11 @@ public:
 
 	/// add a button
 	void add(QPixmap const & pixmap, std::string name, std::string tooltip);
-signals:
+Q_SIGNALS:
 	void button_clicked(const std::string &);
 protected:
 	virtual void resizeEvent(QResizeEvent * e);
-protected slots:
+protected Q_SLOTS:
 	virtual void clicked();
 private:
 	int maxcol_;
diff --git a/src/frontends/qt4/lengthcombo.h b/src/frontends/qt4/lengthcombo.h
index bb2b5f5b6a..4ec1d2a9d0 100644
--- a/src/frontends/qt4/lengthcombo.h
+++ b/src/frontends/qt4/lengthcombo.h
@@ -38,9 +38,9 @@ public:
 	/// use the %-items?
 	virtual void noPercents();
 
-protected slots:
+protected Q_SLOTS:
 	virtual void has_activated(int index);
-signals:
+Q_SIGNALS:
 	/// the current selection has changed
 	void selectionChanged(LyXLength::UNIT unit);
 
diff --git a/src/frontends/qt4/panelstack.h b/src/frontends/qt4/panelstack.h
index da83c03f2b..689e9cec0f 100644
--- a/src/frontends/qt4/panelstack.h
+++ b/src/frontends/qt4/panelstack.h
@@ -36,7 +36,7 @@ public:
 	/// set current panel by logical name
 	void setCurrentPanel(std::string const &);
 
-public slots:
+public Q_SLOTS:
 	/// set current panel from an item
 	void switchPanel(QTreeWidgetItem * i, QTreeWidgetItem* previous=0);
 
diff --git a/src/frontends/qt4/qsetborder.h b/src/frontends/qt4/qsetborder.h
index c74faa491f..b6512d907c 100644
--- a/src/frontends/qt4/qsetborder.h
+++ b/src/frontends/qt4/qsetborder.h
@@ -35,14 +35,14 @@ public:
 	bool getTop();
 	bool getBottom();
 
-signals:
+Q_SIGNALS:
 	void rightSet(bool);
 	void leftSet(bool);
 	void topSet(bool);
 	void bottomSet(bool);
 	void clicked();
 
-public slots:
+public Q_SLOTS:
 	void setLeftEnabled(bool);
 	void setRightEnabled(bool);
 	void setTopEnabled(bool);
diff --git a/src/frontends/qt4/socket_callback.h b/src/frontends/qt4/socket_callback.h
index 1036ed8551..aa2232d6c3 100644
--- a/src/frontends/qt4/socket_callback.h
+++ b/src/frontends/qt4/socket_callback.h
@@ -34,7 +34,7 @@ class socket_callback : public QObject {
 public:
 	/// connect a connection notification from the LyXServerSocket
 	socket_callback(int fd, boost::function<void()> func);
-public slots:
+public Q_SLOTS:
 	void data_received();
 private:
 	/// our notifier