[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Remove moc includes that can be omitted.
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2012-01-31 21:46:57
Message-ID: 20120131214657.C4625A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 4cff11aa5e0c237df549f5ded9b1d0207b3a77a9 by Stephen Kelly.
Committed on 22/01/2012 at 15:37.
Pushed by skelly into branch 'frameworks'.

Remove moc includes that can be omitted.

Mostly these are "<name>.moc" style includes which are incorrect
compared to qmake and cmake automoc behaviour.

M  +0    -1    interfaces/kimproxy/library/kimproxy.cpp
M  +0    -1    interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
M  +1    -1    interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
M  +1    -1    interfaces/kmediaplayer/kmediaplayeradaptor.cpp
M  +0    -1    interfaces/kmediaplayer/player.cpp
M  +0    -1    interfaces/kmediaplayer/view.cpp
M  +0    -1    interfaces/ktexteditor/codecompletionmodel.cpp
M  +1    -1    interfaces/ktexteditor/document.cpp
M  +0    -1    kconf_update/tests/test_kconf_update.cpp
M  +0    -1    kconf_update/tests/test_kconfigutils.cpp
M  +1    -1    kde3support/kdecore/k3multipledrag.cpp
M  +1    -1    kde3support/kdecore/k3process.cpp
M  +1    -1    kde3support/kdecore/k3processcontroller.cpp
M  +1    -1    kde3support/kdecore/k3procio.cpp
M  +2    -2    kde3support/kdeui/k3aboutdialog.cpp
M  +1    -1    kde3support/kdeui/k3activelabel.cpp
M  +1    -1    kde3support/kdeui/k3buttonbox.cpp
M  +1    -1    kde3support/kdeui/k3colordrag.cpp
M  +1    -1    kde3support/kdeui/k3command.cpp
M  +1    -1    kde3support/kdeui/k3dockwidget.cpp
M  +1    -1    kde3support/kdeui/k3dockwidget_private.cpp
M  +1    -1    kde3support/kdeui/k3iconview.cpp
M  +1    -1    kde3support/kdeui/k3iconviewsearchline.cpp
M  +1    -1    kde3support/kdeui/k3listbox.cpp
M  +1    -1    kde3support/kdeui/k3listview.cpp
M  +1    -1    kde3support/kdeui/k3listviewsearchline.cpp
M  +1    -1    kde3support/kdeui/k3panelapplet.cpp
M  +1    -1    kde3support/kdeui/k3panelmenu.cpp
M  +1    -1    kde3support/kdeui/k3passworddialog.cpp
M  +1    -1    kde3support/kdeui/k3popupmenu.cpp
M  +1    -1    kde3support/kdeui/k3sconfig.cpp
M  +1    -1    kde3support/kdeui/k3spell.cpp
M  +1    -1    kde3support/kdeui/k3spelldlg.cpp
M  +1    -1    kde3support/kdeui/k3syntaxhighlighter.cpp
M  +1    -1    kde3support/kdeui/k3textedit.cpp
M  +1    -1    kde3support/kdeui/k3wizard.cpp
M  +1    -1    kde3support/kio/kfile/k3filetreeview.cpp
M  +1    -1    kde3support/kio/kfile/k3fileview.cpp
M  +1    -1    kde3support/kio/kfile/kfiletreebranch.cpp
M  +1    -1    kde3support/kparts/dockmainwindow3.cpp
M  +1    -1    kde3support/kunittest/runner.cpp
M  +1    -1    kde3support/kunittest/tester.cpp
M  +1    -1    kde3support/tests/itemcontainertest.cpp
M  +1    -1    kde3support/tests/k3processtest.cpp
M  +1    -1    kde3support/tests/k3prociotest.cpp
M  +1    -1    kde3support/tests/kactivelabeltest.cpp
M  +1    -1    kde3support/tests/kcommandtest.cpp
M  +1    -1    kde3support/tests/kdocktest.cpp
M  +1    -1    kde3support/tests/kdockwidgetdemo.cpp
M  +1    -1    kde3support/tests/kdockwidgettest.cpp
M  +1    -1    kde3support/tests/krfcdatetest.cpp
M  +0    -1    kdecore/config/kcoreconfigskeleton.cpp
M  +1    -1    kdecore/date/ksystemtimezone.cpp
M  +1    -1    kdecore/io/kdebugdbusiface.cpp
M  +1    -1    kdecore/io/kprocess.cpp
M  +1    -1    kdecore/network/klocalsocket.cpp
M  +1    -1    kdecore/network/kssld/kssld.cpp
M  +1    -1    kdecore/network/ktcpsocket.cpp
M  +0    -1    kdecore/tests/kautostarttest.cpp
M  +0    -1    kdecore/tests/kcalendartest.cpp
M  +0    -1    kdecore/tests/kconfigtest.cpp
M  +2    -1    kdecore/tests/kdatetimetest.cpp
M  +0    -1    kdecore/tests/kdebug_unittest.cpp
M  +0    -1    kdecore/tests/kdesktopfiletest.cpp
M  +0    -1    kdecore/tests/kencodingdetectortest.cpp
M  +0    -1    kdecore/tests/kentrymaptest.cpp
M  +0    -1    kdecore/tests/klocaletimeformattest.cpp
M  +0    -1    kdecore/tests/klocalizedstringtest.cpp
M  +0    -1    kdecore/tests/klocalsocketservertest.cpp
M  +0    -1    kdecore/tests/klocalsockettest.cpp
M  +0    -1    kdecore/tests/kmountpointtest.cpp
M  +0    -1    kdecore/tests/ksavefiletest.cpp
M  +0    -1    kdecore/tests/kservicetest.cpp
M  +0    -1    kdecore/tests/ksharedptrtest.cpp
M  +0    -1    kdecore/tests/kstandarddirstest.cpp
M  +0    -1    kdecore/tests/kstringhandlertest.cpp
M  +0    -1    kdecore/tests/ktcpsockettest.cpp
M  +1    -1    kdecore/tests/ktimezonestest.cpp
M  +0    -1    kdecore/tests/kurlmimetest.cpp
M  +0    -1    kdecore/tests/kurltest.cpp
M  +0    -1    kded/kbuildsycoca.cpp
M  +0    -1    kded/kded.cpp
M  +0    -1    kded/kdedadaptor.cpp
M  +0    -1    kded/vfolder_menu.cpp
M  +1    -1    kdeui/actions/kaction.cpp
M  +0    -1    kdeui/actions/kactioncategory.cpp
M  +1    -1    kdeui/actions/kactioncollection.cpp
M  +0    -1    kdeui/actions/kactionmenu.cpp
M  +1    -1    kdeui/actions/kcodecaction.cpp
M  +1    -1    kdeui/actions/kdualaction.cpp
M  +1    -1    kdeui/actions/kfontaction.cpp
M  +0    -1    kdeui/actions/kfontsizeaction.cpp
M  +1    -1    kdeui/actions/kpastetextaction.cpp
M  +1    -1    kdeui/actions/krecentfilesaction.cpp
M  +1    -1    kdeui/actions/kselectaction.cpp
M  +1    -1    kdeui/actions/kstandardaction.cpp
M  +0    -1    kdeui/actions/ktoggleaction.cpp
M  +0    -1    kdeui/actions/ktogglefullscreenaction.cpp
M  +0    -1    kdeui/actions/ktoggletoolbaraction.cpp
M  +0    -1    kdeui/actions/ktoolbarlabelaction.cpp
M  +0    -1    kdeui/actions/ktoolbarpopupaction.cpp
M  +1    -1    kdeui/actions/ktoolbarspaceraction.cpp
M  +1    -1    kdeui/colors/kcolorbutton.cpp
M  +1    -1    kdeui/colors/kcolorcombo.cpp
M  +2    -2    kdeui/colors/kcolordialog.cpp
M  +0    -1    kdeui/colors/kcolorvalueselector.cpp
M  +0    -1    kdeui/colors/khuesaturationselect.cpp
M  +0    -1    kdeui/config/kconfigskeleton.cpp
M  +1    -1    kdeui/dialogs/kaboutapplicationdialog.cpp
M  +0    -1    kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp
M  +0    -1    kdeui/dialogs/kaboutkdedialog_p.cpp
M  +1    -1    kdeui/dialogs/kassistantdialog.cpp
M  +1    -1    kdeui/dialogs/kbugreport.cpp
M  +1    -1    kdeui/dialogs/kconfigdialog.cpp
M  +0    -1    kdeui/dialogs/kconfigdialogmanager.cpp
M  +0    -1    kdeui/dialogs/kcupsoptionsjobwidget_p.cpp
M  +0    -1    kdeui/dialogs/kcupsoptionspageswidget_p.cpp
M  +1    -1    kdeui/dialogs/kdialog.cpp
M  +2    -2    kdeui/dialogs/kedittoolbar.cpp
M  +1    -1    kdeui/dialogs/kinputdialog.cpp
M  +0    -1    kdeui/dialogs/kmessageboxmessagehandler.cpp
M  +1    -1    kdeui/dialogs/knewpassworddialog.cpp
M  +1    -1    kdeui/dialogs/kpassworddialog.cpp
M  +1    -1    kdeui/dialogs/kpixmapregionselectordialog.cpp
M  +1    -1    kdeui/dialogs/kprogressdialog.cpp
M  +2    -2    kdeui/dialogs/kshortcutsdialog.cpp
M  +1    -1    kdeui/dialogs/kshortcutseditor.cpp
M  +0    -1    kdeui/dialogs/ksplashscreen.cpp
M  +1    -1    kdeui/dialogs/kswitchlanguagedialog_p.cpp
M  +1    -1    kdeui/dialogs/ktip.cpp
M  +1    -1    kdeui/findreplace/kfind.cpp
M  +1    -1    kdeui/findreplace/kfinddialog.cpp
M  +1    -1    kdeui/findreplace/kreplace.cpp
M  +1    -1    kdeui/findreplace/kreplacedialog.cpp
M  +1    -1    kdeui/fonts/kfontchooser.cpp
M  +0    -1    kdeui/fonts/kfontdialog.cpp
M  +1    -1    kdeui/fonts/kfontrequester.cpp
M  +1    -1    kdeui/icons/kiconbutton.cpp
M  +2    -2    kdeui/icons/kicondialog.cpp
M  +0    -1    kdeui/icons/kiconloader.cpp
M  +1    -1    kdeui/itemviews/kcategorizedview.cpp
M  +0    -1    kdeui/itemviews/kcategorydrawer.cpp
M  +1    -1    kdeui/itemviews/kextendableitemdelegate.cpp
M  +1    -1    kdeui/itemviews/kfilterproxysearchline.cpp
M  +1    -1    kdeui/itemviews/klistwidget.cpp
M  +1    -1    kdeui/itemviews/klistwidgetsearchline.cpp
M  +1    -1    kdeui/itemviews/ktreewidgetsearchline.cpp
M  +2    -2    kdeui/itemviews/kwidgetitemdelegate.cpp
M  +0    -1    kdeui/jobs/kabstractwidgetjobtracker.cpp
M  +0    -1    kdeui/jobs/kdialogjobuidelegate.cpp
M  +2    -2    kdeui/jobs/kstatusbarjobtracker.cpp
M  +2    -2    kdeui/jobs/kuiserverjobtracker.cpp
M  +2    -2    kdeui/jobs/kwidgetjobtracker.cpp
M  +1    -1    kdeui/kernel/kapplication.cpp
M  +1    -1    kdeui/kernel/kclipboard.cpp
M  +1    -1    kdeui/kernel/kglobalsettings.cpp
M  +1    -1    kdeui/kernel/kstartupinfo.cpp
M  +0    -1    kdeui/kernel/kstyle.cpp
M  +2    -2    kdeui/kernel/kuniqueapplication.cpp
M  +0    -1    kdeui/notifications/knotification.cpp
M  +1    -1    kdeui/notifications/knotificationmanager.cpp
M  +1    -1    kdeui/notifications/knotificationrestrictions.cpp
M  +1    -1    kdeui/notifications/kstatusnotifieritem.cpp
M  +0    -1    kdeui/notifications/kstatusnotifieritemdbus_p.cpp
M  +1    -1    kdeui/notifications/ksystemtrayicon.cpp
M  +0    -1    kdeui/paged/kpagedialog.cpp
M  +0    -1    kdeui/paged/kpagemodel.cpp
M  +1    -1    kdeui/paged/kpageview.cpp
M  +0    -1    kdeui/paged/kpageview_p.cpp
M  +1    -1    kdeui/paged/kpagewidget.cpp
M  +1    -1    kdeui/paged/kpagewidgetmodel.cpp
M  +0    -1    kdeui/shortcuts/kcheckaccelerators.cpp
M  +0    -1    kdeui/shortcuts/kgesturemap.cpp
M  +1    -1    kdeui/shortcuts/kglobalaccel.cpp
M  +0    -1    kdeui/shortcuts/kglobalshortcutinfo.cpp
M  +1    -1    kdeui/sonnet/configdialog.cpp
M  +0    -1    kdeui/sonnet/configwidget.cpp
M  +0    -1    kdeui/sonnet/dialog.cpp
M  +1    -1    kdeui/sonnet/dictionarycombobox.cpp
M  +0    -1    kdeui/sonnet/highlighter.cpp
M  +0    -1    kdeui/sonnet/tests/backgroundtest.cpp
M  +0    -1    kdeui/sonnet/tests/test_dialog.cpp
M  +0    -1    kdeui/sonnet/tests/test_highlighter.cpp
M  +0    -1    kdeui/tests/kactioncategorytest.cpp
M  +0    -1    kdeui/tests/kactioncollectiontest.cpp
M  +0    -1    kdeui/tests/kanimatedbuttontest.cpp
M  +0    -1    kdeui/tests/kapplication_unittest.cpp
M  +0    -1    kdeui/tests/kbuttongrouptest.cpp
M  +0    -1    kdeui/tests/kcodecactiontest.cpp
M  +0    -1    kdeui/tests/kcolorcombotest.cpp
M  +0    -1    kdeui/tests/kcolorutilsdemo.cpp
M  +0    -1    kdeui/tests/kcolorutilstest.cpp
M  +0    -1    kdeui/tests/kcomboboxtest.cpp
M  +0    -1    kdeui/tests/kcompletioncoretest.cpp
M  +0    -1    kdeui/tests/kcompletionuitest.cpp
M  +0    -1    kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp
M  +0    -1    kdeui/tests/kconfigguitest.cpp
M  +0    -1    kdeui/tests/kconfigskeletontest.cpp
M  +0    -1    kdeui/tests/kdatecomboboxtest.cpp
M  +0    -1    kdeui/tests/kdatetimeedittest.cpp
M  +0    -1    kdeui/tests/kfindtest.cpp
M  +0    -1    kdeui/tests/kglobalsettingstest.cpp
M  +0    -1    kdeui/tests/kglobalshortcuttest.cpp
M  +0    -1    kdeui/tests/khboxtest.cpp
M  +0    -1    kdeui/tests/kiconeffecttest.cpp
M  +0    -1    kdeui/tests/kimageframe.cpp
M  +0    -1    kdeui/tests/kjobtrackerstest.cpp
M  +0    -1    kdeui/tests/kledtest.cpp
M  +0    -1    kdeui/tests/klineedittest.cpp
M  +0    -1    kdeui/tests/kmainwindow_unittest.cpp
M  +0    -1    kdeui/tests/kmainwindowrestoretest.cpp
M  +0    -1    kdeui/tests/kmainwindowtest.cpp
M  +0    -1    kdeui/tests/kmessagetest.cpp
M  +0    -1    kdeui/tests/knuminputtest.cpp
M  +0    -1    kdeui/tests/kpagedialogtest.cpp
M  +0    -1    kdeui/tests/kpagewidgettest.cpp
M  +0    -1    kdeui/tests/kpassivepopuptest.cpp
M  +0    -1    kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp
M  +0    -1    kdeui/tests/kreplacetest.cpp
M  +0    -1    kdeui/tests/krulertest.cpp
M  +0    -1    kdeui/tests/kselectaction_unittest.cpp
M  +0    -1    kdeui/tests/kselectactiontest.cpp
M  +0    -1    kdeui/tests/kstandardactiontest.cpp
M  +0    -1    kdeui/tests/kstandardshortcuttest.cpp
M  +0    -1    kdeui/tests/kstatusbartest.cpp
M  +0    -1    kdeui/tests/ktabwidgettest.cpp
M  +0    -1    kdeui/tests/ktimecomboboxtest.cpp
M  +0    -1    kdeui/tests/ktreewidgetsearchlinetest.cpp
M  +0    -1    kdeui/tests/kwindowtest.cpp
M  +0    -1    kdeui/tests/kxmlgui_unittest.cpp
M  +0    -1    kdeui/tests/kxmlguitest.cpp
M  +0    -1    kdeui/util/kcompletion.cpp
M  +1    -1    kdeui/util/kcursor.cpp
M  +0    -1    kdeui/util/kmanagerselection.cpp
M  +0    -1    kdeui/util/kmodifierkeyinfo.cpp
M  +1    -1    kdeui/util/kmodifierkeyinfoprovider.cpp
M  +0    -1    kdeui/util/knumvalidator.cpp
M  +0    -1    kdeui/util/kpassivepopup.cpp
M  +0    -1    kdeui/util/kpassivepopupmessagehandler.cpp
M  +1    -1    kdeui/util/kpixmapsequenceoverlaypainter.cpp
M  +0    -1    kdeui/util/kpixmapsequencewidget.cpp
M  +0    -1    kdeui/util/kundostack.cpp
M  +1    -1    kdeui/util/kwallet.cpp
M  +0    -1    kdeui/util/kxmessages.cpp
M  +1    -1    kdeui/widgets/kactionselector.cpp
M  +1    -1    kdeui/widgets/kanimatedbutton.cpp
M  +0    -1    kdeui/widgets/karrowbutton.cpp
M  +1    -1    kdeui/widgets/kbuttongroup.cpp
M  +0    -1    kdeui/widgets/kcapacitybar.cpp
M  +2    -2    kdeui/widgets/kcharselect.cpp
M  +0    -1    kdeui/widgets/kcmodule.cpp
M  +0    -1    kdeui/widgets/kcombobox.cpp
M  +0    -1    kdeui/widgets/kcompletionbox.cpp
M  +1    -1    kdeui/widgets/kdatecombobox.cpp
M  +2    -2    kdeui/widgets/kdatepicker.cpp
M  +1    -1    kdeui/widgets/kdatetable.cpp
M  +1    -1    kdeui/widgets/kdatetimeedit.cpp
M  +0    -1    kdeui/widgets/kdatetimewidget.cpp
M  +0    -1    kdeui/widgets/kdatewidget.cpp
M  +0    -1    kdeui/widgets/kdialogbuttonbox.cpp
M  +0    -1    kdeui/widgets/keditlistbox.cpp
M  +0    -1    kdeui/widgets/keditlistwidget.cpp
M  +0    -1    kdeui/widgets/khbox.cpp
M  +0    -1    kdeui/widgets/khelpmenu.cpp
M  +0    -1    kdeui/widgets/khistorycombobox.cpp
M  +2    -2    kdeui/widgets/kkeysequencewidget.cpp
M  +2    -1    kdeui/widgets/klanguagebutton.cpp
M  +0    -1    kdeui/widgets/kled.cpp
M  +2    -2    kdeui/widgets/klineedit.cpp
M  +1    -1    kdeui/widgets/kmainwindow.cpp
M  +1    -1    kdeui/widgets/kmenu.cpp
M  +0    -1    kdeui/widgets/kmenubar.cpp
M  +1    -1    kdeui/widgets/kmessagewidget.cpp
M  +2    -2    kdeui/widgets/kmultitabbar.cpp
M  +1    -1    kdeui/widgets/knuminput.cpp
M  +0    -1    kdeui/widgets/kpixmapregionselectorwidget.cpp
M  +1    -1    kdeui/widgets/kpushbutton.cpp
M  +0    -1    kdeui/widgets/kratingwidget.cpp
M  +0    -1    kdeui/widgets/krestrictedline.cpp
M  +0    -1    kdeui/widgets/krichtextedit.cpp
M  +1    -1    kdeui/widgets/krichtextwidget.cpp
M  +0    -1    kdeui/widgets/kruler.cpp
M  +0    -1    kdeui/widgets/kselector.cpp
M  +0    -1    kdeui/widgets/kseparator.cpp
M  +1    -1    kdeui/widgets/kshortcutwidget.cpp
M  +1    -1    kdeui/widgets/ksqueezedtextlabel.cpp
M  +0    -1    kdeui/widgets/kstatusbar.cpp
M  +0    -1    kdeui/widgets/kstringvalidator.cpp
M  +0    -1    kdeui/widgets/ktabbar.cpp
M  +1    -1    kdeui/widgets/ktabwidget.cpp
M  +0    -1    kdeui/widgets/ktextbrowser.cpp
M  +1    -1    kdeui/widgets/ktextedit.cpp
M  +1    -1    kdeui/widgets/ktimecombobox.cpp
M  +0    -1    kdeui/widgets/ktimezonewidget.cpp
M  +1    -1    kdeui/widgets/ktitlewidget.cpp
M  +1    -1    kdeui/widgets/ktoolbar.cpp
M  +1    -1    kdeui/widgets/kurllabel.cpp
M  +0    -1    kdeui/widgets/kvbox.cpp
M  +0    -1    kdeui/widgets/kxyselector.cpp
M  +1    -1    kdeui/xmlgui/kmainwindowiface.cpp
M  +0    -1    kdeui/xmlgui/kmenumenuhandler_p.cpp
M  +1    -1    kdeui/xmlgui/ktoolbarhandler.cpp
M  +0    -1    kdeui/xmlgui/kxmlguifactory.cpp
M  +1    -1    kdeui/xmlgui/kxmlguiwindow.cpp
M  +0    -1    kdewebkit/kgraphicswebview.cpp
M  +1    -1    kdewebkit/kwebpage.cpp
M  +0    -1    kdewebkit/kwebpluginfactory.cpp
M  +0    -1    kdewebkit/kwebview.cpp
M  +1    -1    kdewebkit/kwebwallet.cpp
M  +1    -1    kfile/kdiroperator.cpp
M  +1    -1    kfile/kdirselectdialog.cpp
M  +1    -1    kfile/kdirsortfilterproxymodel.cpp
M  +1    -1    kfile/kfilebookmarkhandler.cpp
M  +1    -1    kfile/kfilefiltercombo.cpp
M  +0    -1    kfile/kfilemodule.cpp
M  +0    -1    kfile/kfileplaceeditdialog.cpp
M  +1    -1    kfile/kfileplacesitem.cpp
M  +1    -1    kfile/kfileplacesmodel.cpp
M  +1    -1    kfile/kfileplacessharedbookmarks.cpp
M  +2    -2    kfile/kfileplacesview.cpp
M  +1    -1    kfile/kfilepreviewgenerator.cpp
M  +1    -1    kfile/kfiletreeview.cpp
M  +1    -1    kfile/kfilewidget.cpp
M  +1    -1    kfile/knameandurlinputdialog.cpp
M  +1    -1    kfile/knewfilemenu.cpp
M  +1    -1    kfile/kurlnavigator.cpp
M  +1    -1    kfile/kurlnavigatorbutton.cpp
M  +1    -1    kfile/kurlnavigatorbuttonbase.cpp
M  +1    -1    kfile/kurlnavigatordropdownbutton.cpp
M  +1    -1    kfile/kurlnavigatormenu.cpp
M  +1    -1    kfile/kurlnavigatorplacesselector.cpp
M  +1    -1    kfile/kurlnavigatorprotocolcombo.cpp
M  +1    -1    kfile/kurlnavigatortogglebutton.cpp
M  +0    -1    kfile/tests/kfiletreeviewtest.cpp
M  +0    -1    kfile/tests/kurlnavigatortest.cpp
M  +0    -1    khtml/ecma/debugger/breakpointsdock.cpp
M  +0    -1    khtml/ecma/debugger/callstackdock.cpp
M  +0    -1    khtml/ecma/debugger/consoledock.cpp
M  +0    -1    khtml/ecma/debugger/debugwindow.cpp
M  +0    -1    khtml/ecma/debugger/localvariabledock.cpp
M  +0    -1    khtml/ecma/debugger/scriptsdock.cpp
M  +0    -1    khtml/ecma/debugger/watchesdock.cpp
M  +0    -1    khtml/ecma/kjs_audio.cpp
M  +0    -1    khtml/ecma/kjs_window.cpp
M  +0    -1    khtml/ecma/xmlhttprequest.cpp
M  +0    -1    khtml/editing/editor.cpp
M  +0    -1    khtml/html/html_documentimpl.cpp
M  +0    -1    khtml/html/html_objectimpl.cpp
M  +0    -1    khtml/imload/animtimer.cpp
M  +0    -1    khtml/imload/updater.cpp
M  +0    -1    khtml/java/kjavaapplet.cpp
M  +0    -1    khtml/java/kjavaappletserver.cpp
M  +0    -1    khtml/java/kjavaappletviewer.cpp
M  +0    -1    khtml/java/kjavaappletwidget.cpp
M  +0    -1    khtml/java/kjavadownloader.cpp
M  +0    -1    khtml/java/kjavaprocess.cpp
M  +0    -1    khtml/khtml_ext.cpp
M  +0    -1    khtml/khtml_factory.cpp
M  +0    -1    khtml/khtml_pagecache.cpp
M  +0    -1    khtml/khtml_part.cpp
M  +0    -1    khtml/khtml_printsettings.cpp
M  +0    -1    khtml/khtml_run.cpp
M  +0    -1    khtml/khtmladaptorpart.cpp
M  +0    -1    khtml/khtmlimage.cpp
M  +0    -1    khtml/khtmlview.cpp
M  +0    -1    khtml/kjserrordlg.cpp
M  +0    -1    khtml/kmultipart/kmultipart.cpp
M  +0    -1    khtml/misc/loader.cpp
M  +0    -1    khtml/rendering/render_form.cpp
M  +0    -1    khtml/rendering/render_frames.cpp
M  +0    -1    khtml/rendering/render_layer.cpp
M  +0    -1    khtml/rendering/render_replaced.cpp
M  +0    -1    khtml/test_regression.cpp
M  +0    -1    khtml/test_regression_gui_window.cpp
M  +0    -1    khtml/testkhtml.cpp
M  +0    -1    khtml/tests/testkhtmlnew.cpp
M  +0    -1    khtml/xml/dom_docimpl.cpp
M  +0    -1    khtml/xml/xml_tokenizer.cpp
M  +0    -1    kinit/klauncher.cpp
M  +0    -1    kinit/klauncher_adaptor.cpp
M  +1    -1    kio/kfile/kabstractfilemodule.cpp
M  +2    -2    kio/kfile/kacleditwidget.cpp
M  +1    -1    kio/kfile/kcommentwidget.cpp
M  +1    -1    kio/kfile/kdevicelistmodel.cpp
M  +1    -1    kio/kfile/kdiskfreespace.cpp
M  +1    -1    kio/kfile/kencodingfiledialog.cpp
M  +1    -1    kio/kfile/kfile.cpp
M  +1    -1    kio/kfile/kfiledialog.cpp
M  +1    -1    kio/kfile/kfilemetadataconfigurationwidget.cpp
M  +1    -1    kio/kfile/kfilemetadataprovider.cpp
M  +1    -1    kio/kfile/kfilemetadatareader.cpp
M  +1    -1    kio/kfile/kfilemetadatawidget.cpp
M  +1    -1    kio/kfile/kfilemetainfowidget.cpp
M  +1    -1    kio/kfile/kfilemetapreview.cpp
M  +1    -1    kio/kfile/kfilesharedialog.cpp
M  +1    -1    kio/kfile/kfsprocess.cpp
M  +1    -1    kio/kfile/kimagefilepreview.cpp
M  +1    -1    kio/kfile/kmetaprops.cpp
M  +2    -2    kio/kfile/kopenwithdialog.cpp
M  +1    -1    kio/kfile/kpreviewprops.cpp
M  +1    -1    kio/kfile/kpreviewwidgetbase.cpp
M  +2    -2    kio/kfile/kpropertiesdialog.cpp
M  +1    -1    kio/kfile/kurlcombobox.cpp
M  +1    -1    kio/kfile/kurlrequester.cpp
M  +1    -1    kio/kfile/kurlrequesterdialog.cpp
M  +0    -1    kio/kio/accessmanager.cpp
M  +0    -1    kio/kio/accessmanagerreply_p.cpp
M  +1    -1    kio/kio/chmodjob.cpp
M  +2    -2    kio/kio/connection.cpp
M  +1    -1    kio/kio/copyjob.cpp
M  +0    -1    kio/kio/dataslave.cpp
M  +0    -1    kio/kio/davjob.cpp
M  +1    -1    kio/kio/delegateanimationhandler.cpp
M  +1    -1    kio/kio/deletejob.cpp
M  +1    -1    kio/kio/directorysizejob.cpp
M  +1    -1    kio/kio/filejob.cpp
M  +2    -2    kio/kio/fileundomanager.cpp
M  +1    -1    kio/kio/forwardingslavebase.cpp
M  +1    -1    kio/kio/job.cpp
M  +0    -1    kio/kio/jobuidelegate.cpp
M  +1    -1    kio/kio/joburlcache.cpp
M  +0    -1    kio/kio/kabstractfileitemactionplugin.cpp
M  +1    -1    kio/kio/kautomount.cpp
M  +1    -1    kio/kio/kbuildsycocaprogressdialog.cpp
M  +0    -1    kio/kio/kdatatool.cpp
M  +2    -2    kio/kio/kdirlister.cpp
M  +1    -1    kio/kio/kdirmodel.cpp
M  +0    -1    kio/kio/kdirnotify.cpp
M  +1    -1    kio/kio/kdynamicjobtracker.cpp
M  +0    -1    kio/kio/kfileitemactionplugin.cpp
M  +0    -1    kio/kio/kfileitemdelegate.cpp
M  +1    -2    kio/kio/kfileshare.cpp
M  +0    -1    kio/kio/kfilewriteplugin.cpp
M  +1    -1    kio/kio/kmimetypechooser.cpp
M  +1    -1    kio/kio/kmimetyperesolver.cpp
M  +1    -1    kio/kio/knfsshare.cpp
M  +1    -1    kio/kio/kpasswdserverloop.cpp
M  +2    -2    kio/kio/krun.cpp
M  +0    -1    kio/kio/kscan.cpp
M  +0    -1    kio/kio/kshellcompletion.cpp
M  +1    -1    kio/kio/kstatusbarofflineindicator.cpp
M  +0    -1    kio/kio/kurifilter.cpp
M  +1    -1    kio/kio/kurlcompletion.cpp
M  +0    -1    kio/kio/metainfojob.cpp
M  +0    -1    kio/kio/netaccess.cpp
M  +0    -1    kio/kio/passworddialog.cpp
M  +0    -1    kio/kio/pastedialog.cpp
M  +1    -1    kio/kio/previewjob.cpp
M  +0    -1    kio/kio/renamedialog.cpp
M  +0    -1    kio/kio/renamedialogplugin.cpp
M  +2    -2    kio/kio/scheduler.cpp
M  +0    -1    kio/kio/sessiondata.cpp
M  +0    -1    kio/kio/skipdialog.cpp
M  +0    -1    kio/kio/slave.cpp
M  +0    -1    kio/kio/slaveconfig.cpp
M  +1    -1    kio/kio/slaveinterface.cpp
M  +0    -1    kio/kssl/kcm/cacertificatespage.cpp
M  +0    -1    kio/kssl/kcm/kcmssl.cpp
M  +0    -1    kio/kssl/ksslcertdialog.cpp
M  +0    -1    kio/kssl/ksslcertificatebox.cpp
M  +0    -1    kio/kssl/ksslinfodialog.cpp
M  +2    -2    kio/kssl/ksslkeygen.cpp
M  +1    -1    kio/misc/kpac/discovery.cpp
M  +0    -1    kio/misc/kpac/downloader.cpp
M  +0    -1    kio/misc/kpac/proxyscout.cpp
M  +0    -1    kio/misc/ksendbugmail/main.cpp
M  +0    -1    kio/misc/ksendbugmail/smtp.cpp
M  +0    -1    kio/tests/dummymeta.cpp
M  +0    -1    kio/tests/fileundomanagertest.cpp
M  +0    -1    kio/tests/jobremotetest.cpp
M  +0    -1    kio/tests/jobtest.cpp
M  +0    -1    kio/tests/kbookmarktest.cpp
M  +0    -1    kio/tests/kdcopcheck.cpp
M  +0    -1    kio/tests/kdirlistertest.cpp
M  +0    -1    kio/tests/kdirmodeltest.cpp
M  +0    -1    kio/tests/kfdtest.cpp
M  +0    -1    kio/tests/kfileitemtest.cpp
M  +0    -1    kio/tests/kfilemetainfotest.cpp
M  +0    -1    kio/tests/kioslavetest.cpp
M  +0    -1    kio/tests/kruntest.cpp
M  +0    -1    kio/tests/krununittest.cpp
M  +0    -1    kio/tests/speed.cpp
M  +0    -1    kioslave/file/file.cpp
M  +0    -1    kioslave/http/http.cpp
M  +0    -1    kioslave/http/kcookiejar/kcookieserver.cpp
M  +0    -1    kioslave/http/kcookiejar/kcookiewin.cpp
M  +0    -1    kioslave/http/tests/httpheaderdispositiontest.cpp
M  +0    -1    kioslave/http/tests/httpheadertokenizetest.cpp
M  +0    -1    kjsembed/examples/kjsconsole/console.cpp
M  +0    -1    kjsembed/examples/kjsconsole/kjs_object_model.cpp
M  +0    -1    kjsembed/examples/kjsconsole/numberedtextview.cpp
M  +0    -1    knewstuff/knewstuff2/core/coreengine.cpp
M  +0    -1    knewstuff/knewstuff2/core/entryloader.cpp
M  +0    -1    knewstuff/knewstuff2/core/providerloader.cpp
M  +0    -1    knewstuff/knewstuff2/core/security.cpp
M  +0    -1    knewstuff/knewstuff2/dxs/dxs.cpp
M  +0    -1    knewstuff/knewstuff2/dxs/dxsengine.cpp
M  +0    -1    knewstuff/knewstuff2/dxs/soap.cpp
M  +0    -1    knewstuff/knewstuff2/ui/downloaddialog.cpp
M  +0    -1    knewstuff/knewstuff2/ui/itemsview.cpp
M  +0    -1    knewstuff/knewstuff2/ui/kdxsbutton.cpp
M  +0    -1    knewstuff/knewstuff2/ui/kdxschanges.cpp
M  +0    -1    knewstuff/knewstuff2/ui/kdxscomment.cpp
M  +0    -1    knewstuff/knewstuff2/ui/kdxscomments.cpp
M  +0    -1    knewstuff/knewstuff2/ui/kdxsrating.cpp
M  +0    -1    knewstuff/knewstuff2/ui/kdxstranslation.cpp
M  +0    -1    knewstuff/knewstuff2/ui/knewstuffbutton.cpp
M  +0    -1    knewstuff/knewstuff2/ui/providerdialog.cpp
M  +1    -1    knewstuff/knewstuff2/ui/qasyncimage.cpp
M  +0    -1    knewstuff/knewstuff2/ui/qprogressindicator.cpp
M  +0    -1    knewstuff/knewstuff2/ui/qstarframe.cpp
M  +0    -1    knewstuff/knewstuff2/ui/uploaddialog.cpp
M  +0    -1    knewstuff/knewstuff3/attica/atticaprovider.cpp
M  +0    -1    knewstuff/knewstuff3/core/cache.cpp
M  +0    -1    knewstuff/knewstuff3/core/engine.cpp
M  +0    -1    knewstuff/knewstuff3/core/installation.cpp
M  +0    -1    knewstuff/knewstuff3/core/provider.cpp
M  +0    -1    knewstuff/knewstuff3/core/security.cpp
M  +0    -1    knewstuff/knewstuff3/core/xmlloader.cpp
M  +0    -1    knewstuff/knewstuff3/downloaddialog.cpp
M  +1    -1    knewstuff/knewstuff3/downloadmanager.cpp
M  +1    -1    knewstuff/knewstuff3/downloadwidget.cpp
M  +0    -1    knewstuff/knewstuff3/knewstuffbutton.cpp
M  +0    -1    knewstuff/knewstuff3/staticxml/staticxmlprovider.cpp
M  +0    -1    knewstuff/knewstuff3/ui/entrydetailsdialog.cpp
M  +0    -1    knewstuff/knewstuff3/ui/imageloader.cpp
M  +0    -1    knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp
M  +0    -1    knewstuff/knewstuff3/ui/itemsmodel.cpp
M  +0    -1    knewstuff/knewstuff3/ui/itemsviewdelegate.cpp
M  +0    -1    knewstuff/knewstuff3/ui/progressindicator.cpp
M  +0    -1    knewstuff/knewstuff3/upload/atticahelper.cpp
M  +1    -1    knewstuff/knewstuff3/uploaddialog.cpp
M  +0    -1    knewstuff/tests/kdxsview.cpp
M  +0    -1    knewstuff/tests/knewstuff2_download.cpp
M  +0    -1    knewstuff/tests/knewstuff2_standard.cpp
M  +0    -1    knewstuff/tests/knewstuff2_test.cpp
M  +0    -1    knotify/config/knotifyconfigactionswidget.cpp
M  +0    -1    knotify/config/knotifyconfigwidget.cpp
M  +0    -1    knotify/config/knotifyeventlist.cpp
M  +0    -1    knotify/tests/knotifytestwindow.cpp
M  +0    -1    kparts/browserextension.cpp
M  +0    -1    kparts/browserinterface.cpp
M  +2    -2    kparts/browserrun.cpp
M  +0    -1    kparts/factory.cpp
M  +0    -1    kparts/historyprovider.cpp
M  +0    -1    kparts/mainwindow.cpp
M  +1    -1    kparts/part.cpp
M  +0    -1    kparts/partmanager.cpp
M  +0    -1    kparts/plugin.cpp
M  +2    -2    kparts/scriptableextension.cpp
M  +0    -1    kparts/statusbarextension.cpp
M  +0    -1    kparts/tests/normalktm.cpp
M  +0    -1    kparts/tests/notepad.cpp
M  +0    -1    kparts/tests/parts.cpp
M  +0    -1    kparts/tests/parttest.cpp
M  +0    -1    kparts/tests/partviewer.cpp
M  +0    -1    kparts/tests/testmainwindow.cpp
M  +1    -1    kpty/kptydevice.cpp
M  +1    -1    kpty/kptyprocess.cpp
M  +0    -1    kpty/tests/kptyprocesstest.cpp
M  +0    -1    kross/core/action.cpp
M  +0    -1    kross/core/actioncollection.cpp
M  +0    -1    kross/core/interpreter.cpp
M  +0    -1    kross/core/manager.cpp
M  +0    -1    kross/core/script.cpp
M  +0    -1    kross/modules/form.cpp
M  +0    -1    kross/modules/translation.cpp
M  +0    -1    kross/qts/script.cpp
M  +0    -1    kross/ui/model.cpp
M  +0    -1    kross/ui/plugin.cpp
M  +0    -1    kross/ui/view.cpp
M  +0    -1    kunitconversion/converter.cpp
M  +0    -1    kutils/kcmodulecontainer.cpp
M  +1    -1    kutils/kcmoduleproxy.cpp
M  +1    -1    kutils/kcmultidialog.cpp
M  +1    -1    kutils/kemoticons/kemoticons.cpp
M  +0    -1    kutils/kemoticons/tests/kemoticontest.cpp
M  +0    -1    kutils/kidletime/abstractsystempoller.cpp
M  +1    -1    kutils/kidletime/kidletime.cpp
M  +0    -1    kutils/kidletime/macpoller.cpp
M  +0    -1    kutils/kidletime/widgetbasedpoller.cpp
M  +0    -1    kutils/kidletime/windowspoller.cpp
M  +0    -1    kutils/kidletime/xscreensaverbasedpoller.cpp
M  +0    -1    kutils/kidletime/xsyncbasedpoller.cpp
M  +2    -2    kutils/kpluginselector.cpp
M  +0    -1    kutils/kprintpreview.cpp
M  +1    -1    kutils/ksettings/componentsdialog.cpp
M  +1    -1    kutils/ksettings/dialog.cpp
M  +1    -1    kutils/ksettings/dispatcher.cpp
M  +1    -1    kutils/ksettings/pluginpage.cpp
M  +0    -1    kutils/ksettingswidgetadaptor.cpp
M  +1    -1    nepomuk/core/graphwrapper.cpp
M  +0    -1    nepomuk/core/nepomukmainmodel.cpp
M  +0    -1    nepomuk/core/nepomukservice.cpp
M  +0    -1    nepomuk/core/resourcefiltermodel.cpp
M  +1    -1    nepomuk/core/resourcemanager.cpp
M  +2    -2    nepomuk/query/queryserviceclient.cpp
M  +0    -1    nepomuk/test/queryparsertest.cpp
M  +0    -1    nepomuk/test/queryserializertest.cpp
M  +0    -1    nepomuk/test/querytest.cpp
M  +0    -1    nepomuk/test/ratingpaintertestwidget.cpp
M  +0    -1    nepomuk/test/resourcetest.cpp
M  +0    -1    nepomuk/test/tagwidgettest.cpp
M  +0    -1    nepomuk/test/testbase.cpp
M  +0    -1    nepomuk/test/typefacettest.cpp
M  +1    -1    nepomuk/ui/kedittagsdialog.cpp
M  +0    -1    nepomuk/ui/ktagcloudwidget.cpp
M  +0    -1    nepomuk/ui/ktagdisplaywidget.cpp
M  +0    -1    nepomuk/ui/nepomukmassupdatejob.cpp
M  +0    -1    nepomuk/ui/tagcheckbox.cpp
M  +0    -1    nepomuk/ui/tagwidget.cpp
M  +0    -1    nepomuk/utils/datefacet.cpp
M  +1    -1    nepomuk/utils/daterangeselectionwidget.cpp
M  +1    -1    nepomuk/utils/dynamicresourcefacet.cpp
M  +0    -1    nepomuk/utils/facet.cpp
M  +0    -1    nepomuk/utils/facetfiltermodel.cpp
M  +1    -1    nepomuk/utils/facetmodel.cpp
M  +0    -1    nepomuk/utils/facetwidget.cpp
M  +0    -1    nepomuk/utils/proxyfacet.cpp
M  +0    -1    nepomuk/utils/resourcemodel.cpp
M  +1    -1    nepomuk/utils/searchlineedit.cpp
M  +1    -1    nepomuk/utils/searchwidget.cpp
M  +0    -1    nepomuk/utils/simplefacet.cpp
M  +0    -1    nepomuk/utils/simpleresourcemodel.cpp
M  +0    -1    nepomuk/utils/typefacet.cpp
M  +0    -1    plasma/abstractdialogmanager.cpp
M  +0    -1    plasma/abstractrunner.cpp
M  +0    -1    plasma/abstracttoolbox.cpp
M  +0    -1    plasma/animations/animation.cpp
M  +1    -1    plasma/animations/easinganimation.cpp
M  +1    -1    plasma/animations/fade.cpp
M  +1    -1    plasma/animations/geometry.cpp
M  +1    -1    plasma/animations/grow.cpp
M  +1    -1    plasma/animations/pixmaptransition.cpp
M  +1    -1    plasma/animations/pulser.cpp
M  +1    -1    plasma/animations/rotation.cpp
M  +1    -1    plasma/animations/rotationstacked.cpp
M  +1    -1    plasma/animations/slide.cpp
M  +1    -2    plasma/applet.cpp
M  +0    -1    plasma/containment.cpp
M  +0    -1    plasma/containmentactions.cpp
M  +0    -1    plasma/corona.cpp
M  +0    -1    plasma/datacontainer.cpp
M  +0    -1    plasma/dataengine.cpp
M  +0    -1    plasma/dataenginemanager.cpp
M  +0    -1    plasma/delegate.cpp
M  +0    -1    plasma/dialog.cpp
M  +0    -1    plasma/framesvg.cpp
M  +1    -1    plasma/intoJavascriptEngine/bindings/animationgroup.cpp
M  +1    -1    plasma/intoJavascriptEngine/javascriptanimation.cpp
M  +0    -1    plasma/packagestructure.cpp
M  +0    -1    plasma/popupapplet.cpp
M  +1    -1    plasma/private/animablegraphicswebview.cpp
M  +1    -1    plasma/private/applethandle.cpp
M  +0    -1    plasma/private/datacontainer_p.cpp
M  +1    -1    plasma/private/dataengineconsumer.cpp
M  +1    -1    plasma/private/dataengineservice.cpp
M  +1    -1    plasma/private/effectwatcher.cpp
M  +1    -1    plasma/private/getsource.cpp
M  +1    -1    plasma/private/nativetabbar.cpp
M  +1    -1    plasma/private/packages.cpp
M  +1    -1    plasma/private/plasmoidservice.cpp
M  +1    -1    plasma/private/qtjolie-branch/qtjolie/clientthread.cpp
M  +1    -1    plasma/private/qtjolie-branch/qtjolie/serverthread.cpp
M  +1    -1    plasma/private/remotedataengine.cpp
M  +1    -1    plasma/private/remoteservice.cpp
M  +0    -1    plasma/private/runnerjobs.cpp
M  +1    -1    plasma/private/serviceprovider.cpp
M  +1    -1    plasma/private/storage.cpp
M  +1    -1    plasma/private/storagethread.cpp
M  +1    -1    plasma/private/style.cpp
M  +1    -1    plasma/private/themedwidgetinterface.cpp
M  +1    -1    plasma/private/tooltip.cpp
M  +1    -1    plasma/private/wallpaperrenderthread.cpp
M  +1    -1    plasma/private/windowpreview.cpp
M  +1    -1    plasma/private/windowshadows.cpp
M  +0    -1    plasma/remote/accessappletjob.cpp
M  +0    -1    plasma/remote/accessmanager.cpp
M  +0    -1    plasma/remote/authorizationmanager.cpp
M  +0    -1    plasma/remote/authorizationrule.cpp
M  +0    -1    plasma/remote/clientpinrequest.cpp
M  +1    -1    plasma/remote/pinpairingdialog.cpp
M  +0    -1    plasma/remote/serviceaccessjob.cpp
M  +0    -1    plasma/runnercontext.cpp
M  +0    -1    plasma/runnermanager.cpp
M  +0    -1    plasma/scripting/appletscript.cpp
M  +0    -1    plasma/scripting/dataenginescript.cpp
M  +0    -1    plasma/scripting/runnerscript.cpp
M  +0    -1    plasma/scripting/wallpaperscript.cpp
M  +0    -1    plasma/service.cpp
M  +0    -1    plasma/servicejob.cpp
M  +0    -1    plasma/svg.cpp
M  +0    -1    plasma/tests/configloadertest.cpp
M  +0    -1    plasma/tests/packagestructuretest.cpp
M  +0    -1    plasma/tests/testcontainmentactionsplugin/test.cpp
M  +0    -1    plasma/tests/testengine/testengine.cpp
M  +0    -1    plasma/tooltipmanager.cpp
M  +0    -1    plasma/view.cpp
M  +1    -2    plasma/wallpaper.cpp
M  +0    -1    plasma/widgets/flashinglabel.cpp
M  +1    -2    plasma/widgets/iconwidget.cpp
M  +0    -1    plasma/widgets/itembackground.cpp
M  +1    -2    plasma/widgets/meter.cpp
M  +0    -1    plasma/widgets/separator.cpp
M  +0    -1    plasma/widgets/signalplotter.cpp
M  +0    -1    plasma/widgets/svgwidget.cpp
M  +0    -1    plasma/widgets/webview.cpp
M  +0    -1    security/crypto/certexport.cpp
M  +0    -1    security/crypto/crypto.cpp
M  +0    -1    security/crypto/kdatetimedlg.cpp

http://commits.kde.org/kdelibs/4cff11aa5e0c237df549f5ded9b1d0207b3a77a9

diff --git a/interfaces/kimproxy/library/kimproxy.cpp \
b/interfaces/kimproxy/library/kimproxy.cpp index 2b76481..a654d5e 100644
--- a/interfaces/kimproxy/library/kimproxy.cpp
+++ b/interfaces/kimproxy/library/kimproxy.cpp
@@ -651,4 +651,3 @@ QString KIMProxy::preferredApp()
 	return preferredApp;
 }
 
-#include "kimproxy.moc"
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp \
b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp index \
                15f590c..1b1acc3 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -150,4 +150,3 @@ void KFileAudioPreview::toggleAuto( bool on )
         d->player->stop();
 }
 
-#include "kfileaudiopreview.moc"
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp \
b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp index d5882cc..a322d96 \
                100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
@@ -140,5 +140,5 @@ void MediaControlsPrivate::_k_mediaDestroyed()
 
 } // namespace Phonon
 
-#include "mediacontrols.moc"
+#include "moc_mediacontrols.cpp"
 // vim: sw=4 ts=4
diff --git a/interfaces/kmediaplayer/kmediaplayeradaptor.cpp \
b/interfaces/kmediaplayer/kmediaplayeradaptor.cpp index 13d7282..679d28f 100644
--- a/interfaces/kmediaplayer/kmediaplayeradaptor.cpp
+++ b/interfaces/kmediaplayer/kmediaplayeradaptor.cpp
@@ -128,4 +128,4 @@ void KMediaPlayerAdaptor::stop()
 }
 
 
-#include "kmediaplayeradaptor_p.moc"
+#include "moc_kmediaplayeradaptor_p.cpp"
diff --git a/interfaces/kmediaplayer/player.cpp b/interfaces/kmediaplayer/player.cpp
index d28c6f9..531d968 100644
--- a/interfaces/kmediaplayer/player.cpp
+++ b/interfaces/kmediaplayer/player.cpp
@@ -74,4 +74,3 @@ int KMediaPlayer::Player::state(void) const
 	return (int)currentState;
 }
 
-#include "player.moc"
diff --git a/interfaces/kmediaplayer/view.cpp b/interfaces/kmediaplayer/view.cpp
index c07dc0d..0f3cbd5 100644
--- a/interfaces/kmediaplayer/view.cpp
+++ b/interfaces/kmediaplayer/view.cpp
@@ -86,4 +86,3 @@ QWidget* KMediaPlayer::View::videoWidget()
 	return d->videoWidget;
 }
 
-#include "view.moc"
diff --git a/interfaces/ktexteditor/codecompletionmodel.cpp \
b/interfaces/ktexteditor/codecompletionmodel.cpp index 4c80f122..088f447 100644
--- a/interfaces/ktexteditor/codecompletionmodel.cpp
+++ b/interfaces/ktexteditor/codecompletionmodel.cpp
@@ -121,4 +121,3 @@ void CodeCompletionModel2::executeCompletionItem2(Document* \
document, const Rang  document->replaceText(word, data(index.sibling(index.row(), \
Name)).toString());  }
 
-#include "codecompletionmodel.moc"
diff --git a/interfaces/ktexteditor/document.cpp \
b/interfaces/ktexteditor/document.cpp index ba717a7..678cb04 100644
--- a/interfaces/ktexteditor/document.cpp
+++ b/interfaces/ktexteditor/document.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "document.h"
-#include "document.moc"
+#include "moc_document.cpp"
 
 #include "documentadaptor_p.h"
 #include "documentadaptor_p.moc"
diff --git a/kconf_update/tests/test_kconf_update.cpp \
b/kconf_update/tests/test_kconf_update.cpp index 4bd5c13..c9cb491 100644
--- a/kconf_update/tests/test_kconf_update.cpp
+++ b/kconf_update/tests/test_kconf_update.cpp
@@ -523,4 +523,3 @@ void TestKConfUpdate::testScript()
     QCOMPARE(newConfContent, expectedNewConfContent);
 }
 
-#include "test_kconf_update.moc"
diff --git a/kconf_update/tests/test_kconfigutils.cpp \
b/kconf_update/tests/test_kconfigutils.cpp index 0aa85f4..7c57fb5 100644
--- a/kconf_update/tests/test_kconfigutils.cpp
+++ b/kconf_update/tests/test_kconfigutils.cpp
@@ -147,4 +147,3 @@ void TestKConfigUtils::testUnescapeString()
     }
 }
 
-#include "test_kconfigutils.moc"
diff --git a/kde3support/kdecore/k3multipledrag.cpp \
b/kde3support/kdecore/k3multipledrag.cpp index 59cbeaa..6fa21d4 100644
--- a/kde3support/kdecore/k3multipledrag.cpp
+++ b/kde3support/kdecore/k3multipledrag.cpp
@@ -77,6 +77,6 @@ const char* K3MultipleDrag::format( int i ) const
 void K3MultipleDrag::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "k3multipledrag.moc"
+#include "moc_k3multipledrag.cpp"
 
 #endif
diff --git a/kde3support/kdecore/k3process.cpp b/kde3support/kdecore/k3process.cpp
index 8ac86f8..3ca45dc 100644
--- a/kde3support/kdecore/k3process.cpp
+++ b/kde3support/kdecore/k3process.cpp
@@ -1049,4 +1049,4 @@ bool K3ShellProcess::start(RunMode runmode, Communication comm)
 }
 
 
-#include "k3process.moc"
+#include "moc_k3process.cpp"
diff --git a/kde3support/kdecore/k3processcontroller.cpp \
b/kde3support/kdecore/k3processcontroller.cpp index dd8a649..4a8340f 100644
--- a/kde3support/kdecore/k3processcontroller.cpp
+++ b/kde3support/kdecore/k3processcontroller.cpp
@@ -329,4 +329,4 @@ void K3ProcessController::addProcess( int pid )
   ref(); // make sure we stay around when the K3Process goes away
 }
 
-#include "k3processcontroller.moc"
+#include "moc_k3processcontroller.cpp"
diff --git a/kde3support/kdecore/k3procio.cpp b/kde3support/kdecore/k3procio.cpp
index 3cdca07..49f4777 100644
--- a/kde3support/kdecore/k3procio.cpp
+++ b/kde3support/kdecore/k3procio.cpp
@@ -269,5 +269,5 @@ int K3ProcIO::readln (QString &line, bool autoAck, bool *partial)
 
 }
 
-#include "k3procio.moc"
+#include "moc_k3procio.cpp"
 
diff --git a/kde3support/kdeui/k3aboutdialog.cpp \
b/kde3support/kdeui/k3aboutdialog.cpp index 8dc796c..8d544e4 100644
--- a/kde3support/kdeui/k3aboutdialog.cpp
+++ b/kde3support/kdeui/k3aboutdialog.cpp
@@ -54,8 +54,8 @@ template class QList<K3AboutContributor *>;
 
 // ##############################################################
 // MOC OUTPUT FILES:
-#include "k3aboutdialog.moc"
-#include "k3aboutdialog_p.moc"
+#include "moc_k3aboutdialog.cpp"
+#include "moc_k3aboutdialog_p.cpp"
 // ##############################################################
 
 class K3AboutContributor::Private
diff --git a/kde3support/kdeui/k3activelabel.cpp \
b/kde3support/kdeui/k3activelabel.cpp index ce448a9..b367e7d 100644
--- a/kde3support/kdeui/k3activelabel.cpp
+++ b/kde3support/kdeui/k3activelabel.cpp
@@ -138,4 +138,4 @@ QSize K3ActiveLabel::sizeHint() const
    return minimumSizeHint();
 }
 
-#include "k3activelabel.moc"
+#include "moc_k3activelabel.cpp"
diff --git a/kde3support/kdeui/k3buttonbox.cpp b/kde3support/kdeui/k3buttonbox.cpp
index 9015fc2..5c78e14 100644
--- a/kde3support/kdeui/k3buttonbox.cpp
+++ b/kde3support/kdeui/k3buttonbox.cpp
@@ -49,7 +49,7 @@
  *
  */
 
-#include "k3buttonbox.moc"
+#include "moc_k3buttonbox.cpp"
 #include <kglobalsettings.h>
 #include <kguiitem.h>
 #include <kpushbutton.h>
diff --git a/kde3support/kdeui/k3colordrag.cpp b/kde3support/kdeui/k3colordrag.cpp
index 17d9a96..48d68d5 100644
--- a/kde3support/kdeui/k3colordrag.cpp
+++ b/kde3support/kdeui/k3colordrag.cpp
@@ -110,4 +110,4 @@ K3ColorDrag::makeDrag( const QColor &color,QWidget *dragsource)
 void K3ColorDrag::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "k3colordrag.moc"
+#include "moc_k3colordrag.cpp"
diff --git a/kde3support/kdeui/k3command.cpp b/kde3support/kdeui/k3command.cpp
index 68f03ae..47e83ef 100644
--- a/kde3support/kdeui/k3command.cpp
+++ b/kde3support/kdeui/k3command.cpp
@@ -442,4 +442,4 @@ void K3NamedCommand::virtual_hook( int id, void* data )
 void K3MacroCommand::virtual_hook( int id, void* data )
 { K3NamedCommand::virtual_hook( id, data ); }
 
-#include "k3command.moc"
+#include "moc_k3command.cpp"
diff --git a/kde3support/kdeui/k3dockwidget.cpp b/kde3support/kdeui/k3dockwidget.cpp
index d14f818..99313ac 100644
--- a/kde3support/kdeui/k3dockwidget.cpp
+++ b/kde3support/kdeui/k3dockwidget.cpp
@@ -3468,7 +3468,7 @@ void K3DockArea::virtual_hook( int, void* )
 
 
 #ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this \
                name
-#include "k3dockwidget.moc"
+#include "moc_k3dockwidget.cpp"
 #endif
 
 //kate: indent-mode csands; space-indent on; indent-width 2;
diff --git a/kde3support/kdeui/k3dockwidget_private.cpp \
b/kde3support/kdeui/k3dockwidget_private.cpp index e06dff3..2be3654 100644
--- a/kde3support/kdeui/k3dockwidget_private.cpp
+++ b/kde3support/kdeui/k3dockwidget_private.cpp
@@ -717,5 +717,5 @@ void K3DockWidgetPrivate::slotFocusEmbeddedWidget(QWidget* w)
 }
 
 #ifndef NO_INCLUDE_MOCFILES // for Qt-only projects, because tmake doesn't take this \
                name
-#include "k3dockwidget_private.moc"
+#include "moc_k3dockwidget_private.cpp"
 #endif
diff --git a/kde3support/kdeui/k3iconview.cpp b/kde3support/kdeui/k3iconview.cpp
index 3993c35..1a00ba0 100644
--- a/kde3support/kdeui/k3iconview.cpp
+++ b/kde3support/kdeui/k3iconview.cpp
@@ -736,4 +736,4 @@ void K3IconViewItem::setPixmapSize( const QSize& size )
     d->m_pixmapSize = size;
 }
 
-#include "k3iconview.moc"
+#include "moc_k3iconview.cpp"
diff --git a/kde3support/kdeui/k3iconviewsearchline.cpp \
b/kde3support/kdeui/k3iconviewsearchline.cpp index e95c0e9..0361d029 100644
--- a/kde3support/kdeui/k3iconviewsearchline.cpp
+++ b/kde3support/kdeui/k3iconviewsearchline.cpp
@@ -266,4 +266,4 @@ void K3IconViewSearchLine::iconViewDeleted()
   setEnabled( false );
 }
 
-#include "k3iconviewsearchline.moc"
+#include "moc_k3iconviewsearchline.cpp"
diff --git a/kde3support/kdeui/k3listbox.cpp b/kde3support/kdeui/k3listbox.cpp
index 7c22d1f..e84c554 100644
--- a/kde3support/kdeui/k3listbox.cpp
+++ b/kde3support/kdeui/k3listbox.cpp
@@ -256,4 +256,4 @@ void K3ListBox::slotMouseButtonClicked( int btn, Q3ListBoxItem \
*item, const QPoi  emitExecute( item, pos );
 }
 
-#include "k3listbox.moc"
+#include "moc_k3listbox.cpp"
diff --git a/kde3support/kdeui/k3listview.cpp b/kde3support/kdeui/k3listview.cpp
index 8fd170d..20fd324 100644
--- a/kde3support/kdeui/k3listview.cpp
+++ b/kde3support/kdeui/k3listview.cpp
@@ -2350,7 +2350,7 @@ void K3ListViewItem::paintCell(QPainter *p, const QColorGroup \
&cg, int column, i  Q3ListViewItem::paintCell(p, _cg, column, width, alignment);
 }
 
-#include "k3listview.moc"
+#include "moc_k3listview.cpp"
 #include "k3listviewlineedit.moc"
 
 // vim: noet
diff --git a/kde3support/kdeui/k3listviewsearchline.cpp \
b/kde3support/kdeui/k3listviewsearchline.cpp index 5404a8f..fb4e1bc 100644
--- a/kde3support/kdeui/k3listviewsearchline.cpp
+++ b/kde3support/kdeui/k3listviewsearchline.cpp
@@ -569,4 +569,4 @@ K3ListViewSearchLine *K3ListViewSearchLineWidget::searchLine() \
const  return d->searchLine;
 }
 
-#include "k3listviewsearchline.moc"
+#include "moc_k3listviewsearchline.cpp"
diff --git a/kde3support/kdeui/k3panelapplet.cpp \
b/kde3support/kdeui/k3panelapplet.cpp index ee9b10a..87fa78d 100644
--- a/kde3support/kdeui/k3panelapplet.cpp
+++ b/kde3support/kdeui/k3panelapplet.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE \
                SOFTWARE.
 ******************************************************************/
 
 #include "k3panelapplet.h"
-#include "k3panelapplet.moc"
+#include "moc_k3panelapplet.cpp"
 #include <ksharedconfig.h>
 #include <kglobal.h>
 #include <QResizeEvent>
diff --git a/kde3support/kdeui/k3panelmenu.cpp b/kde3support/kdeui/k3panelmenu.cpp
index e78c46b..99ca95b 100644
--- a/kde3support/kdeui/k3panelmenu.cpp
+++ b/kde3support/kdeui/k3panelmenu.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE \
SOFTWARE.  #include <QTimer>
 
 #include "k3panelmenu.h"
-#include "k3panelmenu.moc"
+#include "moc_k3panelmenu.cpp"
 //#include "kaccelmanager.h"
 
 
diff --git a/kde3support/kdeui/k3passworddialog.cpp \
b/kde3support/kdeui/k3passworddialog.cpp index b9e40d8..e0640c5 100644
--- a/kde3support/kdeui/k3passworddialog.cpp
+++ b/kde3support/kdeui/k3passworddialog.cpp
@@ -734,4 +734,4 @@ bool K3PasswordDialog::keep() const
     return m_Keep;
 }
 
-#include "k3passworddialog.moc"
+#include "moc_k3passworddialog.cpp"
diff --git a/kde3support/kdeui/k3popupmenu.cpp b/kde3support/kdeui/k3popupmenu.cpp
index 379d8bd..66d066b 100644
--- a/kde3support/kdeui/k3popupmenu.cpp
+++ b/kde3support/kdeui/k3popupmenu.cpp
@@ -631,4 +631,4 @@ int K3PopupMenu::contextMenuFocusItem()
 
 #endif // END compat methods
 
-#include "k3popupmenu.moc"
+#include "moc_k3popupmenu.cpp"
diff --git a/kde3support/kdeui/k3sconfig.cpp b/kde3support/kdeui/k3sconfig.cpp
index 9563769..9a0f9ed 100644
--- a/kde3support/kdeui/k3sconfig.cpp
+++ b/kde3support/kdeui/k3sconfig.cpp
@@ -1183,7 +1183,7 @@ K3SpellConfig::replaceAllList() const
   return d->replacelist;
 }
 
-#include "k3sconfig.moc"
+#include "moc_k3sconfig.cpp"
 
 
 
diff --git a/kde3support/kdeui/k3spell.cpp b/kde3support/kdeui/k3spell.cpp
index 387abff..5093b8d 100644
--- a/kde3support/kdeui/k3spell.cpp
+++ b/kde3support/kdeui/k3spell.cpp
@@ -1697,5 +1697,5 @@ QString K3Spell::modaltext;
 int K3Spell::modalreturn = 0;
 QWidget* K3Spell::modalWidgetHack = 0;
 
-#include "k3spell.moc"
+#include "moc_k3spell.cpp"
 
diff --git a/kde3support/kdeui/k3spelldlg.cpp b/kde3support/kdeui/k3spelldlg.cpp
index 241040a..b1474d4 100644
--- a/kde3support/kdeui/k3spelldlg.cpp
+++ b/kde3support/kdeui/k3spelldlg.cpp
@@ -293,4 +293,4 @@ K3SpellDlg::slotConfigChanged()
   done( KS_CONFIG );
 }
 
-#include "k3spelldlg.moc"
+#include "moc_k3spelldlg.cpp"
diff --git a/kde3support/kdeui/k3syntaxhighlighter.cpp \
b/kde3support/kdeui/k3syntaxhighlighter.cpp index 7f0a416..a66932e 100644
--- a/kde3support/kdeui/k3syntaxhighlighter.cpp
+++ b/kde3support/kdeui/k3syntaxhighlighter.cpp
@@ -665,4 +665,4 @@ bool K3DictSpellingHighlighter::eventFilter( QObject *o, QEvent \
*e)  return false;
 }
 
-#include "k3syntaxhighlighter.moc"
+#include "moc_k3syntaxhighlighter.cpp"
diff --git a/kde3support/kdeui/k3textedit.cpp b/kde3support/kdeui/k3textedit.cpp
index bf6d9c9..d453deb 100644
--- a/kde3support/kdeui/k3textedit.cpp
+++ b/kde3support/kdeui/k3textedit.cpp
@@ -411,4 +411,4 @@ void K3TextEdit::highLightWord( unsigned int length, unsigned int \
pos )  setSelection( l, cnt, l, cnt + length );
 }
 
-#include "k3textedit.moc"
+#include "moc_k3textedit.cpp"
diff --git a/kde3support/kdeui/k3wizard.cpp b/kde3support/kdeui/k3wizard.cpp
index f88a205..f0ff741 100644
--- a/kde3support/kdeui/k3wizard.cpp
+++ b/kde3support/kdeui/k3wizard.cpp
@@ -54,4 +54,4 @@ K3Wizard::K3Wizard( QWidget *parent, const char *name, bool modal, \
Qt::WFlags f  setTitleFont( font );
 }
 
-#include "k3wizard.moc"
+#include "moc_k3wizard.cpp"
diff --git a/kde3support/kio/kfile/k3filetreeview.cpp \
b/kde3support/kio/kfile/k3filetreeview.cpp index 091058f..4f7bd5f 100644
--- a/kde3support/kio/kfile/k3filetreeview.cpp
+++ b/kde3support/kio/kfile/k3filetreeview.cpp
@@ -677,4 +677,4 @@ void K3FileTreeView::slotSetNextUrlToSelect( const KUrl &url )
 ///////////////////////////////////////////////////////////////////
 
 
-#include "k3filetreeview.moc"
+#include "moc_k3filetreeview.cpp"
diff --git a/kde3support/kio/kfile/k3fileview.cpp \
b/kde3support/kio/kfile/k3fileview.cpp index f3c395b..f61e1d0 100644
--- a/kde3support/kio/kfile/k3fileview.cpp
+++ b/kde3support/kio/kfile/k3fileview.cpp
@@ -494,4 +494,4 @@ int K3FileView::autoOpenDelay()
     return (QApplication::startDragTime() * 3) / 2;
 }
 
-#include "k3fileview.moc"
+#include "moc_k3fileview.cpp"
diff --git a/kde3support/kio/kfile/kfiletreebranch.cpp \
b/kde3support/kio/kfile/kfiletreebranch.cpp index abc4e32..bc6775e 100644
--- a/kde3support/kio/kfile/kfiletreebranch.cpp
+++ b/kde3support/kio/kfile/kfiletreebranch.cpp
@@ -566,5 +566,5 @@ bool KFileTreeBranch::populate( const KUrl& url,  \
K3FileTreeViewItem *currItem )  return ret;
 }
 
-#include "kfiletreebranch.moc"
+#include "moc_kfiletreebranch.cpp"
 
diff --git a/kde3support/kparts/dockmainwindow3.cpp \
b/kde3support/kparts/dockmainwindow3.cpp index b39d0ef..361ab81 100644
--- a/kde3support/kparts/dockmainwindow3.cpp
+++ b/kde3support/kparts/dockmainwindow3.cpp
@@ -161,4 +161,4 @@ void DockMainWindow3::createShellGUI( bool create )
     }
 }
 
-#include "dockmainwindow3.moc"
+#include "moc_dockmainwindow3.cpp"
diff --git a/kde3support/kunittest/runner.cpp b/kde3support/kunittest/runner.cpp
index 915ae9b..cb0f7d5 100644
--- a/kde3support/kunittest/runner.cpp
+++ b/kde3support/kunittest/runner.cpp
@@ -309,5 +309,5 @@ namespace KUnitTest
     }
 }
 
-#include "runner.moc"
+#include "moc_runner.cpp"
 
diff --git a/kde3support/kunittest/tester.cpp b/kde3support/kunittest/tester.cpp
index 15e0501..0072bcd 100644
--- a/kde3support/kunittest/tester.cpp
+++ b/kde3support/kunittest/tester.cpp
@@ -114,4 +114,4 @@ QTextStream& operator<<( QTextStream& str, const QSize& r ) {
     return str;
 }
 
-#include "tester.moc"
+#include "moc_tester.cpp"
diff --git a/kde3support/tests/itemcontainertest.cpp \
b/kde3support/tests/itemcontainertest.cpp index ef80461..8541bec 100644
--- a/kde3support/tests/itemcontainertest.cpp
+++ b/kde3support/tests/itemcontainertest.cpp
@@ -224,4 +224,4 @@ int main( int argc, char ** argv )
     app.exec();
 }
 
-#include "itemcontainertest.moc"
+#include "moc_itemcontainertest.cpp"
diff --git a/kde3support/tests/k3processtest.cpp \
b/kde3support/tests/k3processtest.cpp index ece340a..4ecd1ac 100644
--- a/kde3support/tests/k3processtest.cpp
+++ b/kde3support/tests/k3processtest.cpp
@@ -114,4 +114,4 @@ int main(int argc, char *argv[])
  printf("Entering man Qt event loop -- press <CTRL><C> to abort\n");
  return app.exec();
 }
-#include "k3processtest.moc"
+#include "moc_k3processtest.cpp"
diff --git a/kde3support/tests/k3prociotest.cpp b/kde3support/tests/k3prociotest.cpp
index 26a44c0..671a910 100644
--- a/kde3support/tests/k3prociotest.cpp
+++ b/kde3support/tests/k3prociotest.cpp
@@ -66,4 +66,4 @@ int main(int argc, char *argv[])
  printf("Entering man Qt event loop -- press <CTRL><C> to abort\n");
  return app.exec();
 }
-#include "k3prociotest.moc"
+#include "moc_k3prociotest.cpp"
diff --git a/kde3support/tests/kactivelabeltest.cpp \
b/kde3support/tests/kactivelabeltest.cpp index 45f063f..3c44c75 100644
--- a/kde3support/tests/kactivelabeltest.cpp
+++ b/kde3support/tests/kactivelabeltest.cpp
@@ -54,5 +54,5 @@ int main( int argc, char ** argv )
   app.exec();
 }
 
-#include "kactivelabeltest.moc"
+#include "moc_kactivelabeltest.cpp"
 
diff --git a/kde3support/tests/kcommandtest.cpp b/kde3support/tests/kcommandtest.cpp
index 792b512..c749d38 100644
--- a/kde3support/tests/kcommandtest.cpp
+++ b/kde3support/tests/kcommandtest.cpp
@@ -1,5 +1,5 @@
 #include "kcommandtest.h"
-#include "kcommandtest.moc"
+#include "moc_kcommandtest.cpp"
 
 #include "qtest_kde.h"
 
diff --git a/kde3support/tests/kdocktest.cpp b/kde3support/tests/kdocktest.cpp
index 856a918..eed0e21 100644
--- a/kde3support/tests/kdocktest.cpp
+++ b/kde3support/tests/kdocktest.cpp
@@ -69,4 +69,4 @@ main( int argc, char** argv )
   return a.exec();
 }
 
-#include "kdocktest.moc"
+#include "moc_kdocktest.cpp"
diff --git a/kde3support/tests/kdockwidgetdemo.cpp \
b/kde3support/tests/kdockwidgetdemo.cpp index 84906bc..b1d6527 100644
--- a/kde3support/tests/kdockwidgetdemo.cpp
+++ b/kde3support/tests/kdockwidgetdemo.cpp
@@ -790,5 +790,5 @@ int main(int argc, char* argv[]) {
   return 0;
 }
 
-#include "kdockwidgetdemo.moc"
+#include "moc_kdockwidgetdemo.cpp"
 
diff --git a/kde3support/tests/kdockwidgettest.cpp \
b/kde3support/tests/kdockwidgettest.cpp index 2cd0111..c483293 100644
--- a/kde3support/tests/kdockwidgettest.cpp
+++ b/kde3support/tests/kdockwidgettest.cpp
@@ -267,5 +267,5 @@ int main(int argc, char* argv[]) {
 }
 
 
-#include "kdockwidgettest.moc"
+#include "moc_kdockwidgettest.cpp"
 
diff --git a/kde3support/tests/krfcdatetest.cpp b/kde3support/tests/krfcdatetest.cpp
index 9f91a6c..1bce771 100644
--- a/kde3support/tests/krfcdatetest.cpp
+++ b/kde3support/tests/krfcdatetest.cpp
@@ -1,6 +1,6 @@
 #include "qtest_kde.h"
 #include "krfcdatetest.h"
-#include "krfcdatetest.moc"
+#include "moc_krfcdatetest.cpp"
 
 QTEST_KDEMAIN(KRFCDateTest, NoGUI)
 
diff --git a/kdecore/config/kcoreconfigskeleton.cpp \
b/kdecore/config/kcoreconfigskeleton.cpp index f5dd4bf..6ea7ba7 100644
--- a/kdecore/config/kcoreconfigskeleton.cpp
+++ b/kdecore/config/kcoreconfigskeleton.cpp
@@ -1319,4 +1319,3 @@ KConfigSkeletonItem *KCoreConfigSkeleton::findItem(const \
QString &name) const  }
 
 #include "kcoreconfigskeleton.moc"
-
diff --git a/kdecore/date/ksystemtimezone.cpp b/kdecore/date/ksystemtimezone.cpp
index d3da0fb..770dd6c 100644
--- a/kdecore/date/ksystemtimezone.cpp
+++ b/kdecore/date/ksystemtimezone.cpp
@@ -22,7 +22,7 @@
 // This file requires HAVE_STRUCT_TM_TM_ZONE to be defined if struct tm member \
tm_zone is available.  // This file requires HAVE_TM_GMTOFF to be defined if struct \
tm member tm_gmtoff is available.  
-#include "ksystemtimezone.moc"
+#include "moc_ksystemtimezone.cpp"
 
 #include <config.h>
 #include <config-date.h>
diff --git a/kdecore/io/kdebugdbusiface.cpp b/kdecore/io/kdebugdbusiface.cpp
index 6fbab74..aa205a8 100644
--- a/kdecore/io/kdebugdbusiface.cpp
+++ b/kdecore/io/kdebugdbusiface.cpp
@@ -43,4 +43,4 @@ void KDebugDBusIface::printBacktrace()
     kDebug() << kBacktrace();
 }
 
-#include "kdebugdbusiface_p.moc"
+#include "moc_kdebugdbusiface_p.cpp"
diff --git a/kdecore/io/kprocess.cpp b/kdecore/io/kprocess.cpp
index 9ee8e91..8f9c1af 100644
--- a/kdecore/io/kprocess.cpp
+++ b/kdecore/io/kprocess.cpp
@@ -407,4 +407,4 @@ int KProcess::pid() const
 #endif
 }
 
-#include "kprocess.moc"
+#include "moc_kprocess.cpp"
diff --git a/kdecore/network/klocalsocket.cpp b/kdecore/network/klocalsocket.cpp
index 234e262..cc7a96e 100644
--- a/kdecore/network/klocalsocket.cpp
+++ b/kdecore/network/klocalsocket.cpp
@@ -222,4 +222,4 @@ QString KLocalSocketServer::errorString() const
     return d->errorString;
 }
 
-#include "klocalsocket.moc"
+#include "moc_klocalsocket.cpp"
diff --git a/kdecore/network/kssld/kssld.cpp b/kdecore/network/kssld/kssld.cpp
index 1c4e1bd..352f9a6 100644
--- a/kdecore/network/kssld/kssld.cpp
+++ b/kdecore/network/kssld/kssld.cpp
@@ -280,5 +280,5 @@ KSslCertificateRule KSSLD::rule(const QSslCertificate &cert, \
const QString &host  }
 
 
-#include "kssld.moc"
+#include "moc_kssld.cpp"
 #include "kssld_adaptor.moc"
diff --git a/kdecore/network/ktcpsocket.cpp b/kdecore/network/ktcpsocket.cpp
index 9bcfef3..6240a86 100644
--- a/kdecore/network/ktcpsocket.cpp
+++ b/kdecore/network/ktcpsocket.cpp
@@ -1109,4 +1109,4 @@ KSslErrorUiData &KSslErrorUiData::operator=(const \
KSslErrorUiData &other)  }
 
 
-#include "ktcpsocket.moc"
+#include "moc_ktcpsocket.cpp"
diff --git a/kdecore/tests/kautostarttest.cpp b/kdecore/tests/kautostarttest.cpp
index 47f0681..c980fb4 100644
--- a/kdecore/tests/kautostarttest.cpp
+++ b/kdecore/tests/kautostarttest.cpp
@@ -23,7 +23,6 @@
 
 #include <qtest_kde.h>
 
-#include "kautostarttest.moc"
 
 #include <QtCore/QFile>
 
diff --git a/kdecore/tests/kcalendartest.cpp b/kdecore/tests/kcalendartest.cpp
index f0ec461..f2af963 100644
--- a/kdecore/tests/kcalendartest.cpp
+++ b/kdecore/tests/kcalendartest.cpp
@@ -34,7 +34,6 @@
 #include "kstandarddirs.h"
 #include "kconfiggroup.h"
 
-#include "kcalendartest.moc"
 
 QTEST_KDEMAIN_CORE_WITH_COMPONENTNAME(KCalendarTest, "kdecalendarsystems" /*so that \
the .po exists*/)  
diff --git a/kdecore/tests/kconfigtest.cpp b/kdecore/tests/kconfigtest.cpp
index d59cf46..45454dc 100644
--- a/kdecore/tests/kconfigtest.cpp
+++ b/kdecore/tests/kconfigtest.cpp
@@ -23,7 +23,6 @@
 #include <qtemporarydir.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
-#include "kconfigtest.moc"
 
 #include <kconfig.h>
 #include <kdebug.h>
diff --git a/kdecore/tests/kdatetimetest.cpp b/kdecore/tests/kdatetimetest.cpp
index f40c9b8..5d864f6 100644
--- a/kdecore/tests/kdatetimetest.cpp
+++ b/kdecore/tests/kdatetimetest.cpp
@@ -17,6 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
+#include "kdatetimetest.h"
+
 #include <cstdlib>
 #include <qtest_kde.h>
 #include <QtCore/QDir>
@@ -28,7 +30,6 @@
 #include <kconfiggroup.h>
 #include <QtDBus/QtDBus>
 
-#include "kdatetimetest.moc"
 
 //TODO: test new methods
 
diff --git a/kdecore/tests/kdebug_unittest.cpp b/kdecore/tests/kdebug_unittest.cpp
index 0866c62..9ec235c 100644
--- a/kdecore/tests/kdebug_unittest.cpp
+++ b/kdecore/tests/kdebug_unittest.cpp
@@ -26,7 +26,6 @@
 #include <kdebug.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include "kdebug_unittest.moc"
 
 QTEST_KDEMAIN_CORE( KDebugTest )
 
diff --git a/kdecore/tests/kdesktopfiletest.cpp b/kdecore/tests/kdesktopfiletest.cpp
index d03f845..7500593 100644
--- a/kdecore/tests/kdesktopfiletest.cpp
+++ b/kdecore/tests/kdesktopfiletest.cpp
@@ -19,7 +19,6 @@
 #include <kconfiggroup.h>
 #include <qtemporaryfile.h>
 #include <kstandarddirs.h>
-#include "kdesktopfiletest.moc"
 
 #include "kdesktopfile.h"
 
diff --git a/kdecore/tests/kencodingdetectortest.cpp \
b/kdecore/tests/kencodingdetectortest.cpp index 15a4c4d..e4771ff 100644
--- a/kdecore/tests/kencodingdetectortest.cpp
+++ b/kdecore/tests/kencodingdetectortest.cpp
@@ -21,7 +21,6 @@
 #include <kdebug.h>
 #include <kencodingdetector.h>
 
-#include "kencodingdetectortest.moc"
 
 static const char data1[] = "this should decode correctly";
 static const char data2[] = "this is an invalid utf-8 byte: \xBF and another one: \
                \xBE";
diff --git a/kdecore/tests/kentrymaptest.cpp b/kdecore/tests/kentrymaptest.cpp
index 0bed955..2b45121 100644
--- a/kdecore/tests/kentrymaptest.cpp
+++ b/kdecore/tests/kentrymaptest.cpp
@@ -22,7 +22,6 @@
 #include <qtest_kde.h>
 #include "kconfigdata.h"
 
-#include "kentrymaptest.moc"
 
 const QByteArray group1("A Group");
 const QByteArray key1("A Key");
diff --git a/kdecore/tests/klocaletimeformattest.cpp \
b/kdecore/tests/klocaletimeformattest.cpp index 81c0103..2c981c2 100644
--- a/kdecore/tests/klocaletimeformattest.cpp
+++ b/kdecore/tests/klocaletimeformattest.cpp
@@ -213,4 +213,3 @@ void KLocaleTimeFormatTest::formatAndReadAllCountriesTest()
 }
 
 QTEST_MAIN(KLocaleTimeFormatTest)
-#include "klocaletimeformattest.moc"
diff --git a/kdecore/tests/klocalizedstringtest.cpp \
b/kdecore/tests/klocalizedstringtest.cpp index b2276ca..ce2e3f8 100644
--- a/kdecore/tests/klocalizedstringtest.cpp
+++ b/kdecore/tests/klocalizedstringtest.cpp
@@ -35,7 +35,6 @@
 
 #include <QtCore/QString>
 
-#include "klocalizedstringtest.moc"
 
 void KLocalizedStringTest::initTestCase ()
 {
diff --git a/kdecore/tests/klocalsocketservertest.cpp \
b/kdecore/tests/klocalsocketservertest.cpp index 39d6cb0..4a313e3 100644
--- a/kdecore/tests/klocalsocketservertest.cpp
+++ b/kdecore/tests/klocalsocketservertest.cpp
@@ -299,4 +299,3 @@ void tst_KLocalSocketServer::abstractUnixSocket()
 
 QTEST_MAIN(tst_KLocalSocketServer)
 
-#include "klocalsocketservertest.moc"
diff --git a/kdecore/tests/klocalsockettest.cpp b/kdecore/tests/klocalsockettest.cpp
index 9de659b..90fd00b 100644
--- a/kdecore/tests/klocalsockettest.cpp
+++ b/kdecore/tests/klocalsockettest.cpp
@@ -243,4 +243,3 @@ void tst_KLocalSocket::connected()
 
 QTEST_MAIN(tst_KLocalSocket)
 
-#include "klocalsockettest.moc"
diff --git a/kdecore/tests/kmountpointtest.cpp b/kdecore/tests/kmountpointtest.cpp
index 2051e28..947c916 100644
--- a/kdecore/tests/kmountpointtest.cpp
+++ b/kdecore/tests/kmountpointtest.cpp
@@ -18,7 +18,6 @@
 
 #include "kmountpointtest.h"
 #include <qtest_kde.h>
-#include "kmountpointtest.moc"
 
 #include "kmountpoint.h"
 #include <kdebug.h>
diff --git a/kdecore/tests/ksavefiletest.cpp b/kdecore/tests/ksavefiletest.cpp
index 7a04144..f21b6ea 100644
--- a/kdecore/tests/ksavefiletest.cpp
+++ b/kdecore/tests/ksavefiletest.cpp
@@ -384,4 +384,3 @@ void KSaveFileTest::cleanupTestCase()
     }
 }
 
-#include "ksavefiletest.moc"
diff --git a/kdecore/tests/kservicetest.cpp b/kdecore/tests/kservicetest.cpp
index 7a52154..db778ad 100644
--- a/kdecore/tests/kservicetest.cpp
+++ b/kdecore/tests/kservicetest.cpp
@@ -19,7 +19,6 @@
 #include <locale.h>
 
 #include "kservicetest.h"
-#include "kservicetest.moc"
 #include <qtest_kde.h>
 
 #include <kconfig.h>
diff --git a/kdecore/tests/ksharedptrtest.cpp b/kdecore/tests/ksharedptrtest.cpp
index 0baccb1..3be8f3f 100644
--- a/kdecore/tests/ksharedptrtest.cpp
+++ b/kdecore/tests/ksharedptrtest.cpp
@@ -162,4 +162,3 @@ void KSharedPtrTest::testOrdering()
 	QCOMPARE( map.count(), 2 );
 }
 
-#include "ksharedptrtest.moc"
diff --git a/kdecore/tests/kstandarddirstest.cpp \
b/kdecore/tests/kstandarddirstest.cpp index 7df65d8..479f302 100644
--- a/kdecore/tests/kstandarddirstest.cpp
+++ b/kdecore/tests/kstandarddirstest.cpp
@@ -20,7 +20,6 @@
 #include "qstandardpaths.h"
 
 #include "qtest_kde.h"
-#include "kstandarddirstest.moc"
 
 QTEST_KDEMAIN_CORE( KStandarddirsTest )
 
diff --git a/kdecore/tests/kstringhandlertest.cpp \
b/kdecore/tests/kstringhandlertest.cpp index 0774a13..b08db3f 100644
--- a/kdecore/tests/kstringhandlertest.cpp
+++ b/kdecore/tests/kstringhandlertest.cpp
@@ -1,7 +1,6 @@
 #include "kstringhandlertest.h"
 
 #include "qtest_kde.h"
-#include "kstringhandlertest.moc"
 
 QTEST_KDEMAIN_CORE(KStringHandlerTest)
 
diff --git a/kdecore/tests/ktcpsockettest.cpp b/kdecore/tests/ktcpsockettest.cpp
index 72f9f10..fb80c7d 100644
--- a/kdecore/tests/ktcpsockettest.cpp
+++ b/kdecore/tests/ktcpsockettest.cpp
@@ -371,4 +371,3 @@ void Server::errors()
 
 QTEST_MAIN(KTcpSocketTest)
 
-#include "ktcpsockettest.moc"
diff --git a/kdecore/tests/ktimezonestest.cpp b/kdecore/tests/ktimezonestest.cpp
index 122f424..c2f832d 100644
--- a/kdecore/tests/ktimezonestest.cpp
+++ b/kdecore/tests/ktimezonestest.cpp
@@ -17,6 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
+#include "ktimezonestest.h"
 #include "ktimezonestest_p.h"
 
 #include <stdio.h>
@@ -27,7 +28,6 @@
 #include <config-date.h> // for HAVE_TM_GMTOFF
 #include "ksystemtimezone.h"
 #include "ktzfiletimezone.h"
-#include "ktimezonestest.moc"
 
 QTEST_KDEMAIN_CORE(KTimeZonesTest)
 
diff --git a/kdecore/tests/kurlmimetest.cpp b/kdecore/tests/kurlmimetest.cpp
index 681dd0d..5602d81 100644
--- a/kdecore/tests/kurlmimetest.cpp
+++ b/kdecore/tests/kurlmimetest.cpp
@@ -23,7 +23,6 @@
 #include <kurl.h>
 #include <kdebug.h>
 
-#include "kurlmimetest.moc"
 
 QTEST_KDEMAIN_CORE( KUrlMimeTest )
 
diff --git a/kdecore/tests/kurltest.cpp b/kdecore/tests/kurltest.cpp
index 6008469..4c0a37f 100644
--- a/kdecore/tests/kurltest.cpp
+++ b/kdecore/tests/kurltest.cpp
@@ -22,7 +22,6 @@
 #include "kurltest.h"
 
 #include "qtest_kde.h"
-#include "kurltest.moc"
 
 QTEST_KDEMAIN_CORE( KUrlTest )
 
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
index 68e8eed..00646cd 100644
--- a/kded/kbuildsycoca.cpp
+++ b/kded/kbuildsycoca.cpp
@@ -833,4 +833,3 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
    return 0;
 }
 
-#include "kbuildsycoca.moc"
diff --git a/kded/kded.cpp b/kded/kded.cpp
index 97e9e97..a78d5f7 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -928,4 +928,3 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
      return result;
 }
 
-#include "kded.moc"
diff --git a/kded/kdedadaptor.cpp b/kded/kdedadaptor.cpp
index fe149a3..45279dc 100644
--- a/kded/kdedadaptor.cpp
+++ b/kded/kdedadaptor.cpp
@@ -85,4 +85,3 @@ void KdedAdaptor::quit()
    QCoreApplication::instance()->quit();
 }
 
-#include "kdedadaptor.moc"
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index f0b0b35..bf2020e 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -1646,4 +1646,3 @@ VFolderMenu::setTrackId(const QString &id)
    m_trackId = id;
 }
 
-#include "vfolder_menu.moc"
diff --git a/kdeui/actions/kaction.cpp b/kdeui/actions/kaction.cpp
index 9a5e7e2..a39631d 100644
--- a/kdeui/actions/kaction.cpp
+++ b/kdeui/actions/kaction.cpp
@@ -428,4 +428,4 @@ void KAction::setAuthAction(KAuth::Action *action)
 /* vim: et sw=2 ts=2
  */
 
-#include "kaction.moc"
+#include "moc_kaction.cpp"
diff --git a/kdeui/actions/kactioncategory.cpp b/kdeui/actions/kactioncategory.cpp
index 1f77543..0928b4c 100644
--- a/kdeui/actions/kactioncategory.cpp
+++ b/kdeui/actions/kactioncategory.cpp
@@ -161,4 +161,3 @@ KActionCategoryPrivate::KActionCategoryPrivate( KActionCategory \
*host )  {}
 
 
-#include "moc_kactioncategory.cpp"
diff --git a/kdeui/actions/kactioncollection.cpp \
b/kdeui/actions/kactioncollection.cpp index 49cbc9b..11b4405 100644
--- a/kdeui/actions/kactioncollection.cpp
+++ b/kdeui/actions/kactioncollection.cpp
@@ -781,4 +781,4 @@ void \
KActionCollectionPrivate::_k_associatedWidgetDestroyed(QObject *obj)  /* vim: et sw=2 \
                ts=2
  */
 
-#include "kactioncollection.moc"
+#include "moc_kactioncollection.cpp"
diff --git a/kdeui/actions/kactionmenu.cpp b/kdeui/actions/kactionmenu.cpp
index f4a1391..0bfd893 100644
--- a/kdeui/actions/kactionmenu.cpp
+++ b/kdeui/actions/kactionmenu.cpp
@@ -175,4 +175,3 @@ void KActionMenu::setMenu(KMenu *menu)
 /* vim: et sw=2 ts=2
  */
 
-#include "kactionmenu.moc"
diff --git a/kdeui/actions/kcodecaction.cpp b/kdeui/actions/kcodecaction.cpp
index 30df131..0befd0e 100644
--- a/kdeui/actions/kcodecaction.cpp
+++ b/kdeui/actions/kcodecaction.cpp
@@ -278,4 +278,4 @@ bool \
KCodecAction::setCurrentAutoDetectScript(KEncodingDetector::AutoDetectScrip  return \
false;  }
 
-#include "kcodecaction.moc"
+#include "moc_kcodecaction.cpp"
diff --git a/kdeui/actions/kdualaction.cpp b/kdeui/actions/kdualaction.cpp
index f44c956..69bd819 100644
--- a/kdeui/actions/kdualaction.cpp
+++ b/kdeui/actions/kdualaction.cpp
@@ -131,4 +131,4 @@ bool KDualAction::isActive() const
     return d->isActive;
 }
 
-#include "kdualaction.moc"
+#include "moc_kdualaction.cpp"
diff --git a/kdeui/actions/kfontaction.cpp b/kdeui/actions/kfontaction.cpp
index e57d994..358471e 100644
--- a/kdeui/actions/kfontaction.cpp
+++ b/kdeui/actions/kfontaction.cpp
@@ -178,4 +178,4 @@ void KFontAction::setFont( const QString &family )
     qDebug() << "Font not found " << family.toLower();
 }
 
-#include "kfontaction.moc"
+#include "moc_kfontaction.cpp"
diff --git a/kdeui/actions/kfontsizeaction.cpp b/kdeui/actions/kfontsizeaction.cpp
index b907ca2..8191262 100644
--- a/kdeui/actions/kfontsizeaction.cpp
+++ b/kdeui/actions/kfontsizeaction.cpp
@@ -145,4 +145,3 @@ void KFontSizeAction::actionTriggered( QAction* action )
 /* vim: et sw=2 ts=2
  */
 
-#include "kfontsizeaction.moc"
diff --git a/kdeui/actions/kpastetextaction.cpp b/kdeui/actions/kpastetextaction.cpp
index 82be700..d4c9751 100644
--- a/kdeui/actions/kpastetextaction.cpp
+++ b/kdeui/actions/kpastetextaction.cpp
@@ -143,4 +143,4 @@ void KPasteTextActionPrivate::_k_slotTriggered(QAction* action)
 /* vim: et sw=2 ts=2
  */
 
-#include "kpastetextaction.moc"
+#include "moc_kpastetextaction.cpp"
diff --git a/kdeui/actions/krecentfilesaction.cpp \
b/kdeui/actions/krecentfilesaction.cpp index 61bd703..a0b9bfa 100644
--- a/kdeui/actions/krecentfilesaction.cpp
+++ b/kdeui/actions/krecentfilesaction.cpp
@@ -344,4 +344,4 @@ void KRecentFilesAction::saveEntries( const KConfigGroup &_cg )
 /* vim: et sw=2 ts=2
  */
 
-#include "krecentfilesaction.moc"
+#include "moc_krecentfilesaction.cpp"
diff --git a/kdeui/actions/kselectaction.cpp b/kdeui/actions/kselectaction.cpp
index af34afe..3f380ce 100644
--- a/kdeui/actions/kselectaction.cpp
+++ b/kdeui/actions/kselectaction.cpp
@@ -758,4 +758,4 @@ bool KSelectAction::eventFilter (QObject *watched, QEvent *event)
 /* vim: et sw=2 ts=2
  */
 
-#include "kselectaction.moc"
+#include "moc_kselectaction.cpp"
diff --git a/kdeui/actions/kstandardaction.cpp b/kdeui/actions/kstandardaction.cpp
index 76b5782..fb04372 100644
--- a/kdeui/actions/kstandardaction.cpp
+++ b/kdeui/actions/kstandardaction.cpp
@@ -19,7 +19,7 @@
 
 #include "kstandardaction.h"
 #include "kstandardaction_p.h"
-#include "kstandardaction_p.moc"
+#include "moc_kstandardaction_p.cpp"
 
 #include <QtCore/QMutableStringListIterator>
 #include <QtGui/QToolButton>
diff --git a/kdeui/actions/ktoggleaction.cpp b/kdeui/actions/ktoggleaction.cpp
index 25123cd..d4fffd4 100644
--- a/kdeui/actions/ktoggleaction.cpp
+++ b/kdeui/actions/ktoggleaction.cpp
@@ -109,4 +109,3 @@ void KToggleAction::slotToggled( bool )
   }
 }
 
-#include "ktoggleaction.moc"
diff --git a/kdeui/actions/ktogglefullscreenaction.cpp \
b/kdeui/actions/ktogglefullscreenaction.cpp index 8d03d6e..67fbac0 100644
--- a/kdeui/actions/ktogglefullscreenaction.cpp
+++ b/kdeui/actions/ktogglefullscreenaction.cpp
@@ -109,4 +109,3 @@ void KToggleFullScreenAction::setFullScreen( QWidget* window, \
                bool set )
     window->setWindowState( window->windowState() & ~Qt::WindowFullScreen );
 }
 
-#include "ktogglefullscreenaction.moc"
diff --git a/kdeui/actions/ktoggletoolbaraction.cpp \
b/kdeui/actions/ktoggletoolbaraction.cpp index 9d61651..50ef88a 100644
--- a/kdeui/actions/ktoggletoolbaraction.cpp
+++ b/kdeui/actions/ktoggletoolbaraction.cpp
@@ -131,4 +131,3 @@ void KToggleToolBarAction::slotToggled( bool checked )
   KToggleAction::slotToggled( checked );
 }
 
-#include "ktoggletoolbaraction.moc"
diff --git a/kdeui/actions/ktoolbarlabelaction.cpp \
b/kdeui/actions/ktoolbarlabelaction.cpp index 6b2199e..4d928f6 100644
--- a/kdeui/actions/ktoolbarlabelaction.cpp
+++ b/kdeui/actions/ktoolbarlabelaction.cpp
@@ -124,4 +124,3 @@ QWidget *KToolBarLabelAction::createWidget( QWidget* _parent )
   return d->label;
 }
 
-#include "ktoolbarlabelaction.moc"
diff --git a/kdeui/actions/ktoolbarpopupaction.cpp \
b/kdeui/actions/ktoolbarpopupaction.cpp index 0a2cd75..28efdac 100644
--- a/kdeui/actions/ktoolbarpopupaction.cpp
+++ b/kdeui/actions/ktoolbarpopupaction.cpp
@@ -117,4 +117,3 @@ void KToolBarPopupAction::setStickyMenu( bool sticky )
   d->stickyMenu = sticky;
 }
 
-#include "ktoolbarpopupaction.moc"
diff --git a/kdeui/actions/ktoolbarspaceraction.cpp \
b/kdeui/actions/ktoolbarspaceraction.cpp index 58f4ed0..be004ac 100644
--- a/kdeui/actions/ktoolbarspaceraction.cpp
+++ b/kdeui/actions/ktoolbarspaceraction.cpp
@@ -119,4 +119,4 @@ void KToolBarSpacerAction::deleteWidget(QWidget *widget)
     KAction::deleteWidget(widget);
 }
 
-#include "ktoolbarspaceraction.moc"
+#include "moc_ktoolbarspaceraction.cpp"
diff --git a/kdeui/colors/kcolorbutton.cpp b/kdeui/colors/kcolorbutton.cpp
index 0f283de..4ff0f54 100644
--- a/kdeui/colors/kcolorbutton.cpp
+++ b/kdeui/colors/kcolorbutton.cpp
@@ -282,4 +282,4 @@ void KColorButton::KColorButtonPrivate::_k_colorChosen()
     }
 }
 
-#include "kcolorbutton.moc"
+#include "moc_kcolorbutton.cpp"
diff --git a/kdeui/colors/kcolorcombo.cpp b/kdeui/colors/kcolorcombo.cpp
index 822c071..c198886 100644
--- a/kdeui/colors/kcolorcombo.cpp
+++ b/kdeui/colors/kcolorcombo.cpp
@@ -364,4 +364,4 @@ void KColorComboPrivate::addColors()
     }
 }
 
-#include "kcolorcombo.moc"
+#include "moc_kcolorcombo.cpp"
diff --git a/kdeui/colors/kcolordialog.cpp b/kdeui/colors/kcolordialog.cpp
index 3e52c16..ff74c8b 100644
--- a/kdeui/colors/kcolordialog.cpp
+++ b/kdeui/colors/kcolordialog.cpp
@@ -1826,5 +1826,5 @@ void KColorDialog::KColorDialogPrivate::setHsvEdit(const QColor \
&col)  vedit->setValue(v);
 }
 
-#include "kcolordialog.moc"
-#include "kcolordialog_p.moc"
+#include "moc_kcolordialog.cpp"
+#include "moc_kcolordialog_p.cpp"
diff --git a/kdeui/colors/kcolorvalueselector.cpp \
b/kdeui/colors/kcolorvalueselector.cpp index cf5f379..52ae86b 100644
--- a/kdeui/colors/kcolorvalueselector.cpp
+++ b/kdeui/colors/kcolorvalueselector.cpp
@@ -150,4 +150,3 @@ void KColorValueSelector::drawPalette( QPixmap *pixmap )
 }
 
 
-#include "kcolorvalueselector.moc"
diff --git a/kdeui/colors/khuesaturationselect.cpp \
b/kdeui/colors/khuesaturationselect.cpp index 4e2be4b..9f60de4 100644
--- a/kdeui/colors/khuesaturationselect.cpp
+++ b/kdeui/colors/khuesaturationselect.cpp
@@ -156,4 +156,3 @@ void KHueSaturationSelector::drawPalette( QPixmap *pixmap )
     *pixmap = pix;
 }
 
-#include "khuesaturationselect.moc"
diff --git a/kdeui/config/kconfigskeleton.cpp b/kdeui/config/kconfigskeleton.cpp
index 49d04c8..7704d36 100644
--- a/kdeui/config/kconfigskeleton.cpp
+++ b/kdeui/config/kconfigskeleton.cpp
@@ -118,5 +118,4 @@ KConfigSkeleton::ItemFont *KConfigSkeleton::addItemFont( const \
QString &name, QF  return item;
 }
 
-#include "kconfigskeleton.moc"
 
diff --git a/kdeui/dialogs/kaboutapplicationdialog.cpp \
b/kdeui/dialogs/kaboutapplicationdialog.cpp index 2e209f4..bb4cd70 100644
--- a/kdeui/dialogs/kaboutapplicationdialog.cpp
+++ b/kdeui/dialogs/kaboutapplicationdialog.cpp
@@ -336,4 +336,4 @@ void KAboutApplicationDialog::Private::_k_showLicense( const \
QString &number )  dialog->show();
 }
 
-#include "kaboutapplicationdialog.moc"
+#include "moc_kaboutapplicationdialog.cpp"
diff --git a/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp \
b/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp index 263affc..3ac8435 100644
--- a/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp
+++ b/kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp
@@ -407,4 +407,3 @@ void KAboutApplicationPersonIconsJob::onJobFinished( \
QNetworkReply *reply ) //SL  
 } //namespace KDEPrivate
 
-#include "kaboutapplicationpersonmodel_p.moc"
diff --git a/kdeui/dialogs/kaboutkdedialog_p.cpp \
b/kdeui/dialogs/kaboutkdedialog_p.cpp index b9728bf..161f925 100644
--- a/kdeui/dialogs/kaboutkdedialog_p.cpp
+++ b/kdeui/dialogs/kaboutkdedialog_p.cpp
@@ -156,4 +156,3 @@ KAboutKdeDialog::KAboutKdeDialog(QWidget *parent)
 
 }
 
-#include "kaboutkdedialog_p.moc"
diff --git a/kdeui/dialogs/kassistantdialog.cpp b/kdeui/dialogs/kassistantdialog.cpp
index 8f9f702..afa72b0 100644
--- a/kdeui/dialogs/kassistantdialog.cpp
+++ b/kdeui/dialogs/kassistantdialog.cpp
@@ -164,4 +164,4 @@ bool KAssistantDialog::isAppropriate(KPageWidgetItem * page) \
const  return d->appropriate.value(page, true);
 }
 
-#include "kassistantdialog.moc"
+#include "moc_kassistantdialog.cpp"
diff --git a/kdeui/dialogs/kbugreport.cpp b/kdeui/dialogs/kbugreport.cpp
index 52df287..6e6cae7 100644
--- a/kdeui/dialogs/kbugreport.cpp
+++ b/kdeui/dialogs/kbugreport.cpp
@@ -560,4 +560,4 @@ bool KBugReport::sendBugReport()
 }
 
 
-#include "kbugreport.moc"
+#include "moc_kbugreport.cpp"
diff --git a/kdeui/dialogs/kconfigdialog.cpp b/kdeui/dialogs/kconfigdialog.cpp
index 62ddeb0..dbb188a 100644
--- a/kdeui/dialogs/kconfigdialog.cpp
+++ b/kdeui/dialogs/kconfigdialog.cpp
@@ -319,4 +319,4 @@ void KConfigDialog::settingsChangedSlot()
     d->_k_settingsChangedSlot();
 }
 
-#include "kconfigdialog.moc"
+#include "moc_kconfigdialog.cpp"
diff --git a/kdeui/dialogs/kconfigdialogmanager.cpp \
b/kdeui/dialogs/kconfigdialogmanager.cpp index 0890c0b..3ea60d6 100644
--- a/kdeui/dialogs/kconfigdialogmanager.cpp
+++ b/kdeui/dialogs/kconfigdialogmanager.cpp
@@ -532,5 +532,4 @@ bool KConfigDialogManager::isDefault() const
   return result;
 }
 
-#include "kconfigdialogmanager.moc"
 
diff --git a/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp \
b/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp index 380ffa4..8e8d9f7 100644
--- a/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp
+++ b/kdeui/dialogs/kcupsoptionsjobwidget_p.cpp
@@ -191,4 +191,3 @@ QStringList KCupsOptionsJobWidget::jobOptions() const
     return optionList;
 }
 
-#include "kcupsoptionsjobwidget_p.moc"
diff --git a/kdeui/dialogs/kcupsoptionspageswidget_p.cpp \
b/kdeui/dialogs/kcupsoptionspageswidget_p.cpp index 454a369..96eb291 100644
--- a/kdeui/dialogs/kcupsoptionspageswidget_p.cpp
+++ b/kdeui/dialogs/kcupsoptionspageswidget_p.cpp
@@ -283,4 +283,3 @@ bool KCupsOptionsPagesWidget::mirrorPages() const
     return ui.mirrorPagesCheckBox->isChecked();
 }
 
-#include "kcupsoptionspageswidget_p.moc"
diff --git a/kdeui/dialogs/kdialog.cpp b/kdeui/dialogs/kdialog.cpp
index 0cabb85..601673a 100644
--- a/kdeui/dialogs/kdialog.cpp
+++ b/kdeui/dialogs/kdialog.cpp
@@ -1108,5 +1108,5 @@ void KDialogQueue::Private::slotShowQueuedDialog()
     QTimer::singleShot( 20, q, SLOT( slotShowQueuedDialog() ) );
 }
 
-#include "kdialog.moc"
+#include "moc_kdialog.cpp"
 #include "kdialogqueue_p.moc"
diff --git a/kdeui/dialogs/kedittoolbar.cpp b/kdeui/dialogs/kedittoolbar.cpp
index f40692f..41fb442 100644
--- a/kdeui/dialogs/kedittoolbar.cpp
+++ b/kdeui/dialogs/kedittoolbar.cpp
@@ -1689,5 +1689,5 @@ void KEditToolBar::hideEvent(QHideEvent* event)
   KDialog::hideEvent(event);
 }
 
-#include "kedittoolbar.moc"
-#include "kedittoolbar_p.moc"
+#include "moc_kedittoolbar.cpp"
+#include "moc_kedittoolbar_p.cpp"
diff --git a/kdeui/dialogs/kinputdialog.cpp b/kdeui/dialogs/kinputdialog.cpp
index b8406ee..30bf1f3 100644
--- a/kdeui/dialogs/kinputdialog.cpp
+++ b/kdeui/dialogs/kinputdialog.cpp
@@ -479,7 +479,7 @@ QStringList getItemList( const QString &caption,
 
 }
 
-#include "kinputdialog_p.moc"
+#include "moc_kinputdialog_p.cpp"
 
 /* vim: set ai et sw=2 ts=2
 */
diff --git a/kdeui/dialogs/kmessageboxmessagehandler.cpp \
b/kdeui/dialogs/kmessageboxmessagehandler.cpp index f32c22a..8968bbf 100644
--- a/kdeui/dialogs/kmessageboxmessagehandler.cpp
+++ b/kdeui/dialogs/kmessageboxmessagehandler.cpp
@@ -79,5 +79,4 @@ QWidget *KMessageBoxMessageHandlerPrivate::parentWidget()
     return qobject_cast<QWidget*>(q->parent());
 }
 
-#include "kmessageboxmessagehandler.moc"
 // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on;
diff --git a/kdeui/dialogs/knewpassworddialog.cpp \
b/kdeui/dialogs/knewpassworddialog.cpp index 785f9da..f2097dd 100644
--- a/kdeui/dialogs/knewpassworddialog.cpp
+++ b/kdeui/dialogs/knewpassworddialog.cpp
@@ -355,6 +355,6 @@ bool KNewPasswordDialog::checkPassword(const QString &)
     return true;
 }
 
-#include "knewpassworddialog.moc"
+#include "moc_knewpassworddialog.cpp"
 
 // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on;
diff --git a/kdeui/dialogs/kpassworddialog.cpp b/kdeui/dialogs/kpassworddialog.cpp
index 1e0afab..971b651 100644
--- a/kdeui/dialogs/kpassworddialog.cpp
+++ b/kdeui/dialogs/kpassworddialog.cpp
@@ -409,4 +409,4 @@ bool KPasswordDialog::checkPassword()
     return true;
 }
 
-#include "kpassworddialog.moc"
+#include "moc_kpassworddialog.cpp"
diff --git a/kdeui/dialogs/kpixmapregionselectordialog.cpp \
b/kdeui/dialogs/kpixmapregionselectordialog.cpp index 11d964b..f92f6ce 100644
--- a/kdeui/dialogs/kpixmapregionselectordialog.cpp
+++ b/kdeui/dialogs/kpixmapregionselectordialog.cpp
@@ -160,4 +160,4 @@ QImage KPixmapRegionSelectorDialog::getSelectedImage(const \
QPixmap &pixmap, int  return image;
 }
 
-#include "kpixmapregionselectordialog.moc"
+#include "moc_kpixmapregionselectordialog.cpp"
diff --git a/kdeui/dialogs/kprogressdialog.cpp b/kdeui/dialogs/kprogressdialog.cpp
index 19122b1..3b70441 100644
--- a/kdeui/dialogs/kprogressdialog.cpp
+++ b/kdeui/dialogs/kprogressdialog.cpp
@@ -253,4 +253,4 @@ void KProgressDialog::KProgressDialogPrivate::slotAutoActions(int \
percentage)  }
 }
 
-#include "kprogressdialog.moc"
+#include "moc_kprogressdialog.cpp"
diff --git a/kdeui/dialogs/kshortcutsdialog.cpp b/kdeui/dialogs/kshortcutsdialog.cpp
index a375ac3..e05d8d4 100644
--- a/kdeui/dialogs/kshortcutsdialog.cpp
+++ b/kdeui/dialogs/kshortcutsdialog.cpp
@@ -192,7 +192,7 @@ int KShortcutsDialog::configure(KActionCollection *collection, \
KShortcutsEditor:  return dlg.configure(saveSettings);
 }
 
-#include "kshortcutsdialog.moc"
-#include "kshortcutsdialog_p.moc"
+#include "moc_kshortcutsdialog.cpp"
+#include "moc_kshortcutsdialog_p.cpp"
 
 //kate: space-indent on; indent-width 4; replace-tabs on;tab-width 4;
diff --git a/kdeui/dialogs/kshortcutseditor.cpp b/kdeui/dialogs/kshortcutseditor.cpp
index 991f458..b980f18 100644
--- a/kdeui/dialogs/kshortcutseditor.cpp
+++ b/kdeui/dialogs/kshortcutseditor.cpp
@@ -725,4 +725,4 @@ void KShortcutsEditorPrivate::printShortcuts() const
 #endif
 }
 
-#include "kshortcutseditor.moc"
+#include "moc_kshortcutseditor.cpp"
diff --git a/kdeui/dialogs/ksplashscreen.cpp b/kdeui/dialogs/ksplashscreen.cpp
index 9bc125e..f420acb 100644
--- a/kdeui/dialogs/ksplashscreen.cpp
+++ b/kdeui/dialogs/ksplashscreen.cpp
@@ -41,4 +41,3 @@ KSplashScreen::~KSplashScreen()
 {
 }
 
-#include "ksplashscreen.moc"
diff --git a/kdeui/dialogs/kswitchlanguagedialog_p.cpp \
b/kdeui/dialogs/kswitchlanguagedialog_p.cpp index 6846742..906586f 100644
--- a/kdeui/dialogs/kswitchlanguagedialog_p.cpp
+++ b/kdeui/dialogs/kswitchlanguagedialog_p.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "kswitchlanguagedialog_p.moc"
+#include "moc_kswitchlanguagedialog_p.cpp"
 
 #include <QtGui/QApplication>
 #include <QtGui/QLayout>
diff --git a/kdeui/dialogs/ktip.cpp b/kdeui/dialogs/ktip.cpp
index 2adf019..e415345 100644
--- a/kdeui/dialogs/ktip.cpp
+++ b/kdeui/dialogs/ktip.cpp
@@ -412,4 +412,4 @@ bool KTipDialog::eventFilter( QObject *object, QEvent *event )
 }
 
 
-#include "ktip.moc"
+#include "moc_ktip.cpp"
diff --git a/kdeui/findreplace/kfind.cpp b/kdeui/findreplace/kfind.cpp
index 0f6dedc..41bb1be 100644
--- a/kdeui/findreplace/kfind.cpp
+++ b/kdeui/findreplace/kfind.cpp
@@ -720,4 +720,4 @@ QWidget* KFind::dialogsParent() const
     return d->findDialog ? (QWidget*)d->findDialog : ( d->dialog ? d->dialog : \
parentWidget() );  }
 
-#include "kfind.moc"
+#include "moc_kfind.cpp"
diff --git a/kdeui/findreplace/kfinddialog.cpp b/kdeui/findreplace/kfinddialog.cpp
index 081acd6..1a63142 100644
--- a/kdeui/findreplace/kfinddialog.cpp
+++ b/kdeui/findreplace/kfinddialog.cpp
@@ -572,4 +572,4 @@ void KFindDialog::KFindDialogPrivate::_k_slotOk()
         q->accept();
 }
 // kate: space-indent on; indent-width 4; replace-tabs on;
-#include "kfinddialog.moc"
+#include "moc_kfinddialog.cpp"
diff --git a/kdeui/findreplace/kreplace.cpp b/kdeui/findreplace/kreplace.cpp
index 61b33fd..dd73510 100644
--- a/kdeui/findreplace/kreplace.cpp
+++ b/kdeui/findreplace/kreplace.cpp
@@ -371,4 +371,4 @@ void KReplace::closeReplaceNextDialog()
     closeFindNextDialog();
 }
 
-#include "kreplace.moc"
+#include "moc_kreplace.cpp"
diff --git a/kdeui/findreplace/kreplacedialog.cpp \
b/kdeui/findreplace/kreplacedialog.cpp index 590eaf7..abf0717 100644
--- a/kdeui/findreplace/kreplacedialog.cpp
+++ b/kdeui/findreplace/kreplacedialog.cpp
@@ -169,4 +169,4 @@ void KReplaceDialogPrivate::_k_slotOk()
 }
 
 // kate: space-indent on; indent-width 4; replace-tabs on;
-#include "kreplacedialog.moc"
+#include "moc_kreplacedialog.cpp"
diff --git a/kdeui/fonts/kfontchooser.cpp b/kdeui/fonts/kfontchooser.cpp
index c8dbc33..478ae7b 100644
--- a/kdeui/fonts/kfontchooser.cpp
+++ b/kdeui/fonts/kfontchooser.cpp
@@ -1054,5 +1054,5 @@ void KFontChooser::Private::_k_showXLFDArea(bool show)
     }
 }
 
-#include "kfontchooser.moc"
+#include "moc_kfontchooser.cpp"
 #include "sampleedit_p.moc"
diff --git a/kdeui/fonts/kfontdialog.cpp b/kdeui/fonts/kfontdialog.cpp
index efd6a35..9a7d9e8 100644
--- a/kdeui/fonts/kfontdialog.cpp
+++ b/kdeui/fonts/kfontdialog.cpp
@@ -177,4 +177,3 @@ int KFontDialog::getFontAndText( QFont &theFont, QString \
&theString,  }
 
 
-#include "kfontdialog.moc"
diff --git a/kdeui/fonts/kfontrequester.cpp b/kdeui/fonts/kfontrequester.cpp
index 260ac9c..11366fe 100644
--- a/kdeui/fonts/kfontrequester.cpp
+++ b/kdeui/fonts/kfontrequester.cpp
@@ -231,7 +231,7 @@ void KFontRequester::KFontRequesterPrivate::setToolTip()
   }
 }
 
-#include "kfontrequester.moc"
+#include "moc_kfontrequester.cpp"
 
 /* vim: et sw=2 ts=2
 */
diff --git a/kdeui/icons/kiconbutton.cpp b/kdeui/icons/kiconbutton.cpp
index 442ced5..895a31e 100644
--- a/kdeui/icons/kiconbutton.cpp
+++ b/kdeui/icons/kiconbutton.cpp
@@ -186,4 +186,4 @@ void KIconButton::KIconButtonPrivate::_k_newIconName(const \
QString& name)  emit q->iconChanged(name);
 }
 
-#include "kiconbutton.moc"
+#include "moc_kiconbutton.cpp"
diff --git a/kdeui/icons/kicondialog.cpp b/kdeui/icons/kicondialog.cpp
index 42f3636..9c2bcd2 100644
--- a/kdeui/icons/kicondialog.cpp
+++ b/kdeui/icons/kicondialog.cpp
@@ -688,5 +688,5 @@ void KIconDialog::KIconDialogPrivate::_k_slotFinished()
     mpProgress->hide();
 }
 
-#include "kicondialog.moc"
-#include "kicondialog_p.moc"
+#include "moc_kicondialog.cpp"
+#include "moc_kicondialog_p.cpp"
diff --git a/kdeui/icons/kiconloader.cpp b/kdeui/icons/kiconloader.cpp
index d89360c..cbee3b9 100644
--- a/kdeui/icons/kiconloader.cpp
+++ b/kdeui/icons/kiconloader.cpp
@@ -1718,5 +1718,4 @@ void KIconLoader::newIconLoader()
     emit iconLoaderSettingsChanged();
 }
 
-#include "kiconloader.moc"
 
diff --git a/kdeui/itemviews/kcategorizedview.cpp \
b/kdeui/itemviews/kcategorizedview.cpp index 010bcbc..47068b1 100644
--- a/kdeui/itemviews/kcategorizedview.cpp
+++ b/kdeui/itemviews/kcategorizedview.cpp
@@ -1530,4 +1530,4 @@ void KCategorizedView::slotLayoutChanged()
 
 //END: Public part
 
-#include "kcategorizedview.moc"
+#include "moc_kcategorizedview.cpp"
diff --git a/kdeui/itemviews/kcategorydrawer.cpp \
b/kdeui/itemviews/kcategorydrawer.cpp index 2747e5b..53dec47 100644
--- a/kdeui/itemviews/kcategorydrawer.cpp
+++ b/kdeui/itemviews/kcategorydrawer.cpp
@@ -281,4 +281,3 @@ void KCategoryDrawerV3::mouseLeft(const QModelIndex&, const \
QRect&)  {
 }
 
-#include "kcategorydrawer.moc"
diff --git a/kdeui/itemviews/kextendableitemdelegate.cpp \
b/kdeui/itemviews/kextendableitemdelegate.cpp index ceeca4a..7daaa2e 100644
--- a/kdeui/itemviews/kextendableitemdelegate.cpp
+++ b/kdeui/itemviews/kextendableitemdelegate.cpp
@@ -448,4 +448,4 @@ QPixmap KExtendableItemDelegate::contractPixmap()
     return d->contractPixmap;
 }
 
-#include "kextendableitemdelegate.moc"
+#include "moc_kextendableitemdelegate.cpp"
diff --git a/kdeui/itemviews/kfilterproxysearchline.cpp \
b/kdeui/itemviews/kfilterproxysearchline.cpp index e1873e6..54bee29 100644
--- a/kdeui/itemviews/kfilterproxysearchline.cpp
+++ b/kdeui/itemviews/kfilterproxysearchline.cpp
@@ -100,4 +100,4 @@ KLineEdit* KFilterProxySearchLine::lineEdit() const
     return d->searchLine;
 }
 
-#include "kfilterproxysearchline.moc"
+#include "moc_kfilterproxysearchline.cpp"
diff --git a/kdeui/itemviews/klistwidget.cpp b/kdeui/itemviews/klistwidget.cpp
index 5b6c3c6..27c0d7b 100644
--- a/kdeui/itemviews/klistwidget.cpp
+++ b/kdeui/itemviews/klistwidget.cpp
@@ -268,4 +268,4 @@ void KListWidget::mouseDoubleClickEvent ( QMouseEvent * e )
   }
 }
 
-#include "klistwidget.moc"
+#include "moc_klistwidget.cpp"
diff --git a/kdeui/itemviews/klistwidgetsearchline.cpp \
b/kdeui/itemviews/klistwidgetsearchline.cpp index 1478e86..570bd8a 100644
--- a/kdeui/itemviews/klistwidgetsearchline.cpp
+++ b/kdeui/itemviews/klistwidgetsearchline.cpp
@@ -272,4 +272,4 @@ void \
KListWidgetSearchLine::KListWidgetSearchLinePrivate::_k_dataChanged( const  
 
 
-#include "klistwidgetsearchline.moc"
+#include "moc_klistwidgetsearchline.cpp"
diff --git a/kdeui/itemviews/ktreewidgetsearchline.cpp \
b/kdeui/itemviews/ktreewidgetsearchline.cpp index a019213..56600ed 100644
--- a/kdeui/itemviews/ktreewidgetsearchline.cpp
+++ b/kdeui/itemviews/ktreewidgetsearchline.cpp
@@ -620,4 +620,4 @@ KTreeWidgetSearchLine *KTreeWidgetSearchLineWidget::searchLine() \
const  return d->searchLine;
 }
 
-#include "ktreewidgetsearchline.moc"
+#include "moc_ktreewidgetsearchline.cpp"
diff --git a/kdeui/itemviews/kwidgetitemdelegate.cpp \
b/kdeui/itemviews/kwidgetitemdelegate.cpp index b4d5c9b..8eb6383 100644
--- a/kdeui/itemviews/kwidgetitemdelegate.cpp
+++ b/kdeui/itemviews/kwidgetitemdelegate.cpp
@@ -282,5 +282,5 @@ QList<QEvent::Type> \
                KWidgetItemDelegate::blockedEventTypes(QWidget *widget) cons
     return widget->property("goya:blockedEventTypes").value<QList<QEvent::Type> >();
 }
 
-#include "kwidgetitemdelegate.moc"
-#include "kwidgetitemdelegate_p.moc"
+#include "moc_kwidgetitemdelegate.cpp"
+#include "moc_kwidgetitemdelegate_p.cpp"
diff --git a/kdeui/jobs/kabstractwidgetjobtracker.cpp \
b/kdeui/jobs/kabstractwidgetjobtracker.cpp index b4432fe..0b9e829 100644
--- a/kdeui/jobs/kabstractwidgetjobtracker.cpp
+++ b/kdeui/jobs/kabstractwidgetjobtracker.cpp
@@ -104,4 +104,3 @@ void KAbstractWidgetJobTracker::slotClean(KJob *job)
     Q_UNUSED(job);
 }
 
-#include "kabstractwidgetjobtracker.moc"
diff --git a/kdeui/jobs/kdialogjobuidelegate.cpp \
b/kdeui/jobs/kdialogjobuidelegate.cpp index fe48f87..cd68a08 100644
--- a/kdeui/jobs/kdialogjobuidelegate.cpp
+++ b/kdeui/jobs/kdialogjobuidelegate.cpp
@@ -100,4 +100,3 @@ void KDialogJobUiDelegate::slotWarning(KJob* /*job*/, const \
QString &plain, cons  }
 }
 
-#include "kdialogjobuidelegate.moc"
diff --git a/kdeui/jobs/kstatusbarjobtracker.cpp \
b/kdeui/jobs/kstatusbarjobtracker.cpp index 5d7c6b9..45a0ef6 100644
--- a/kdeui/jobs/kstatusbarjobtracker.cpp
+++ b/kdeui/jobs/kstatusbarjobtracker.cpp
@@ -280,5 +280,5 @@ bool \
KStatusBarJobTracker::Private::ProgressWidget::eventFilter(QObject *obj, QE  return \
QWidget::eventFilter(obj, event);  }
 
-#include "kstatusbarjobtracker.moc"
-#include "kstatusbarjobtracker_p.moc"
+#include "moc_kstatusbarjobtracker.cpp"
+#include "moc_kstatusbarjobtracker_p.cpp"
diff --git a/kdeui/jobs/kuiserverjobtracker.cpp b/kdeui/jobs/kuiserverjobtracker.cpp
index b02c1b6..dfcdc96 100644
--- a/kdeui/jobs/kuiserverjobtracker.cpp
+++ b/kdeui/jobs/kuiserverjobtracker.cpp
@@ -327,5 +327,5 @@ org::kde::JobViewServer &KSharedUiServerProxy::uiserver()
     return m_uiserver;
 }
 
-#include "kuiserverjobtracker.moc"
-#include "kuiserverjobtracker_p.moc"
+#include "moc_kuiserverjobtracker.cpp"
+#include "moc_kuiserverjobtracker_p.cpp"
diff --git a/kdeui/jobs/kwidgetjobtracker.cpp b/kdeui/jobs/kwidgetjobtracker.cpp
index c238f50..6c12ada 100644
--- a/kdeui/jobs/kwidgetjobtracker.cpp
+++ b/kdeui/jobs/kwidgetjobtracker.cpp
@@ -663,5 +663,5 @@ void \
KWidgetJobTracker::Private::ProgressWidget::_k_arrowToggled()  \
setMaximumHeight(sizeHint().height());  }
 
-#include "kwidgetjobtracker.moc"
-#include "kwidgetjobtracker_p.moc"
+#include "moc_kwidgetjobtracker.cpp"
+#include "moc_kwidgetjobtracker_p.cpp"
diff --git a/kdeui/kernel/kapplication.cpp b/kdeui/kernel/kapplication.cpp
index cc82e98..fa10c3c 100644
--- a/kdeui/kernel/kapplication.cpp
+++ b/kdeui/kernel/kapplication.cpp
@@ -1155,5 +1155,5 @@ void KApplication::setSynchronizeClipboard(bool synchronize)
     KClipboardSynchronizer::self()->setReverseSynchronizing(synchronize);
 }
 
-#include "kapplication.moc"
+#include "moc_kapplication.cpp"
 
diff --git a/kdeui/kernel/kclipboard.cpp b/kdeui/kernel/kclipboard.cpp
index 0d97567..7662744 100644
--- a/kdeui/kernel/kclipboard.cpp
+++ b/kdeui/kernel/kclipboard.cpp
@@ -179,4 +179,4 @@ bool KClipboardSynchronizer::isReverseSynchronizing()
     return Private::s_reverse_sync;
 }
 
-#include "kclipboard.moc"
+#include "moc_kclipboard.cpp"
diff --git a/kdeui/kernel/kglobalsettings.cpp b/kdeui/kernel/kglobalsettings.cpp
index e21a130..4594c57 100644
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
@@ -1155,4 +1155,4 @@ void KGlobalSettings::Private::propagateQtSettings()
     emit q->settingsChanged(SETTINGS_QT);
 }
 
-#include "kglobalsettings.moc"
+#include "moc_kglobalsettings.cpp"
diff --git a/kdeui/kernel/kstartupinfo.cpp b/kdeui/kernel/kstartupinfo.cpp
index e4968ab..74cf914 100644
--- a/kdeui/kernel/kstartupinfo.cpp
+++ b/kdeui/kernel/kstartupinfo.cpp
@@ -1617,4 +1617,4 @@ static QString escape_str( const QString& str_P )
     return ret;
     }
 
-#include "kstartupinfo.moc"
+#include "moc_kstartupinfo.cpp"
diff --git a/kdeui/kernel/kstyle.cpp b/kdeui/kernel/kstyle.cpp
index 95a71c2..1a09938 100644
--- a/kdeui/kernel/kstyle.cpp
+++ b/kdeui/kernel/kstyle.cpp
@@ -44,7 +44,6 @@
  */
 
 #include "kstyle.h"
-#include "kstyle.moc"
 
 #include <QtCore/qalgorithms.h>
 #include <QtCore/QCache>
diff --git a/kdeui/kernel/kuniqueapplication.cpp \
b/kdeui/kernel/kuniqueapplication.cpp index 7519bb5..7dd18d3 100644
--- a/kdeui/kernel/kuniqueapplication.cpp
+++ b/kdeui/kernel/kuniqueapplication.cpp
@@ -446,5 +446,5 @@ int KUniqueApplicationAdaptor::newInstance(const QByteArray \
&asn_id, const QByte  return ret;
 }
 
-#include "kuniqueapplication.moc"
-#include "kuniqueapplication_p.moc"
+#include "moc_kuniqueapplication.cpp"
+#include "moc_kuniqueapplication_p.cpp"
diff --git a/kdeui/notifications/knotification.cpp \
b/kdeui/notifications/knotification.cpp index 55462b8..de3cf61 100644
--- a/kdeui/notifications/knotification.cpp
+++ b/kdeui/notifications/knotification.cpp
@@ -440,4 +440,3 @@ bool KNotification::eventFilter( QObject * watched, QEvent * \
event )  }
 
 
-#include "knotification.moc"
diff --git a/kdeui/notifications/knotificationmanager.cpp \
b/kdeui/notifications/knotificationmanager.cpp index 4d5d549..7dae281 100644
--- a/kdeui/notifications/knotificationmanager.cpp
+++ b/kdeui/notifications/knotificationmanager.cpp
@@ -177,4 +177,4 @@ void KNotificationManager::reemit(KNotification * n, int id)
 }
 
 
-#include "knotificationmanager_p.moc"
+#include "moc_knotificationmanager_p.cpp"
diff --git a/kdeui/notifications/knotificationrestrictions.cpp \
b/kdeui/notifications/knotificationrestrictions.cpp index 818edea..c4ea1e4 100644
--- a/kdeui/notifications/knotificationrestrictions.cpp
+++ b/kdeui/notifications/knotificationrestrictions.cpp
@@ -183,4 +183,4 @@ QString \
KNotificationRestrictions::Private::determineProgramName()  return appName;
 }
 
-#include "knotificationrestrictions.moc"
+#include "moc_knotificationrestrictions.cpp"
diff --git a/kdeui/notifications/kstatusnotifieritem.cpp \
b/kdeui/notifications/kstatusnotifieritem.cpp index ba94411..36a7a8e 100644
--- a/kdeui/notifications/kstatusnotifieritem.cpp
+++ b/kdeui/notifications/kstatusnotifieritem.cpp
@@ -1035,5 +1035,5 @@ KDbusImageVector KStatusNotifierItemPrivate::iconToVector(const \
QIcon &icon)  return iconVector;
 }
 
-#include "kstatusnotifieritem.moc"
+#include "moc_kstatusnotifieritem.cpp"
 #include "kstatusnotifieritemprivate_p.moc"
diff --git a/kdeui/notifications/kstatusnotifieritemdbus_p.cpp \
b/kdeui/notifications/kstatusnotifieritemdbus_p.cpp index b8864a6..24fe4ce 100644
--- a/kdeui/notifications/kstatusnotifieritemdbus_p.cpp
+++ b/kdeui/notifications/kstatusnotifieritemdbus_p.cpp
@@ -332,4 +332,3 @@ void KStatusNotifierItemDBus::Scroll(int delta, const QString \
&orientation)  
 
 
-#include "kstatusnotifieritemdbus_p.moc"
diff --git a/kdeui/notifications/ksystemtrayicon.cpp \
b/kdeui/notifications/ksystemtrayicon.cpp index 6ed337a..2490d90 100644
--- a/kdeui/notifications/ksystemtrayicon.cpp
+++ b/kdeui/notifications/ksystemtrayicon.cpp
@@ -405,4 +405,4 @@ const QMovie* KSystemTrayIcon::movie() const
     return d->movie;
 }
 
-#include "ksystemtrayicon.moc"
+#include "moc_ksystemtrayicon.cpp"
diff --git a/kdeui/paged/kpagedialog.cpp b/kdeui/paged/kpagedialog.cpp
index 05b0c32..7536ddc 100644
--- a/kdeui/paged/kpagedialog.cpp
+++ b/kdeui/paged/kpagedialog.cpp
@@ -132,4 +132,3 @@ const KPageWidget* KPageDialog::pageWidget() const
     return d_func()->mPageWidget;
 }
 
-#include "kpagedialog.moc"
diff --git a/kdeui/paged/kpagemodel.cpp b/kdeui/paged/kpagemodel.cpp
index dce76d6..5e5cfa7 100644
--- a/kdeui/paged/kpagemodel.cpp
+++ b/kdeui/paged/kpagemodel.cpp
@@ -42,4 +42,3 @@ KPageModel::~KPageModel()
     delete d_ptr;
 }
 
-#include "kpagemodel.moc"
diff --git a/kdeui/paged/kpageview.cpp b/kdeui/paged/kpageview.cpp
index b26f081..daa8a5e 100644
--- a/kdeui/paged/kpageview.cpp
+++ b/kdeui/paged/kpageview.cpp
@@ -474,4 +474,4 @@ Qt::Alignment KPageView::viewPosition() const
     return Qt::AlignLeft;
 }
 
-#include "kpageview.moc"
+#include "moc_kpageview.cpp"
diff --git a/kdeui/paged/kpageview_p.cpp b/kdeui/paged/kpageview_p.cpp
index 5bc3fb2..2032eaf 100644
--- a/kdeui/paged/kpageview_p.cpp
+++ b/kdeui/paged/kpageview_p.cpp
@@ -619,4 +619,3 @@ void SelectionModel::select( const QItemSelection &selection, \
QItemSelectionMode  QItemSelectionModel::select( selection, command );
 }
 
-#include "kpageview_p.moc"
diff --git a/kdeui/paged/kpagewidget.cpp b/kdeui/paged/kpagewidget.cpp
index 1a7c0ed..0bd5503 100644
--- a/kdeui/paged/kpagewidget.cpp
+++ b/kdeui/paged/kpagewidget.cpp
@@ -132,4 +132,4 @@ KPageWidgetItem* KPageWidget::currentPage() const
     return d_func()->model()->item(index);
 }
 
-#include "kpagewidget.moc"
+#include "moc_kpagewidget.cpp"
diff --git a/kdeui/paged/kpagewidgetmodel.cpp b/kdeui/paged/kpagewidgetmodel.cpp
index 677f75b..e065888 100644
--- a/kdeui/paged/kpagewidgetmodel.cpp
+++ b/kdeui/paged/kpagewidgetmodel.cpp
@@ -542,4 +542,4 @@ QModelIndex KPageWidgetModel::index( const KPageWidgetItem *item \
) const  return createIndex( pageItem->row(), 0, (void*)pageItem );
 }
 
-#include "kpagewidgetmodel.moc"
+#include "moc_kpagewidgetmodel.cpp"
diff --git a/kdeui/shortcuts/kcheckaccelerators.cpp \
b/kdeui/shortcuts/kcheckaccelerators.cpp index 0d181b7..7c5d591 100644
--- a/kdeui/shortcuts/kcheckaccelerators.cpp
+++ b/kdeui/shortcuts/kcheckaccelerators.cpp
@@ -276,4 +276,3 @@ void KCheckAccelerators::checkAccelerators( bool automatic )
     // dlg will be destroyed before returning
 }
 
-#include "kcheckaccelerators.moc"
diff --git a/kdeui/shortcuts/kgesturemap.cpp b/kdeui/shortcuts/kgesturemap.cpp
index 6bdd8e3..4e1d668 100644
--- a/kdeui/shortcuts/kgesturemap.cpp
+++ b/kdeui/shortcuts/kgesturemap.cpp
@@ -271,4 +271,3 @@ bool KGestureMap::eventFilter(QObject *obj, QEvent *e)
     return false;
 }
 
-#include "kgesturemap.moc"
diff --git a/kdeui/shortcuts/kglobalaccel.cpp b/kdeui/shortcuts/kglobalaccel.cpp
index 13eb1d3..1c69d30 100644
--- a/kdeui/shortcuts/kglobalaccel.cpp
+++ b/kdeui/shortcuts/kglobalaccel.cpp
@@ -606,5 +606,5 @@ void KGlobalAccel::stealShortcutSystemwide(const QKeySequence \
&seq)  self()->d->iface.setForeignShortcut(actionId, sc);
 }
 
-#include "kglobalaccel.moc"
+#include "moc_kglobalaccel.cpp"
 
diff --git a/kdeui/shortcuts/kglobalshortcutinfo.cpp \
b/kdeui/shortcuts/kglobalshortcutinfo.cpp index 42f2e38..d2ca948 100644
--- a/kdeui/shortcuts/kglobalshortcutinfo.cpp
+++ b/kdeui/shortcuts/kglobalshortcutinfo.cpp
@@ -107,4 +107,3 @@ QString KGlobalShortcutInfo::uniqueName() const
     }
 
 
-#include "moc_kglobalshortcutinfo.cpp"
diff --git a/kdeui/sonnet/configdialog.cpp b/kdeui/sonnet/configdialog.cpp
index a63f2ac..0d96a1b 100644
--- a/kdeui/sonnet/configdialog.cpp
+++ b/kdeui/sonnet/configdialog.cpp
@@ -91,4 +91,4 @@ void ConfigDialog::setLanguage( const QString &language )
     d->ui->setLanguage( language );
 }
 
-#include "configdialog.moc"
+#include "moc_configdialog.cpp"
diff --git a/kdeui/sonnet/configwidget.cpp b/kdeui/sonnet/configwidget.cpp
index 867e298..a6a6f70 100644
--- a/kdeui/sonnet/configwidget.cpp
+++ b/kdeui/sonnet/configwidget.cpp
@@ -154,4 +154,3 @@ QString ConfigWidget::language() const
     }
 }
 
-#include "configwidget.moc"
diff --git a/kdeui/sonnet/dialog.cpp b/kdeui/sonnet/dialog.cpp
index 90679c1..9b501ea 100644
--- a/kdeui/sonnet/dialog.cpp
+++ b/kdeui/sonnet/dialog.cpp
@@ -449,4 +449,3 @@ void Dialog::slotDone()
 
 }
 
-#include "dialog.moc"
diff --git a/kdeui/sonnet/dictionarycombobox.cpp \
b/kdeui/sonnet/dictionarycombobox.cpp index 8e3b547..9e913b2 100644
--- a/kdeui/sonnet/dictionarycombobox.cpp
+++ b/kdeui/sonnet/dictionarycombobox.cpp
@@ -112,4 +112,4 @@ void DictionaryComboBox::reloadCombo()
 
 }
 
-#include "dictionarycombobox.moc"
+#include "moc_dictionarycombobox.cpp"
diff --git a/kdeui/sonnet/highlighter.cpp b/kdeui/sonnet/highlighter.cpp
index 3f478f0..4f42fd1 100644
--- a/kdeui/sonnet/highlighter.cpp
+++ b/kdeui/sonnet/highlighter.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "highlighter.h"
-#include "highlighter.moc"
 
 #include "speller.h"
 #include "loader_p.h"
diff --git a/kdeui/sonnet/tests/backgroundtest.cpp \
b/kdeui/sonnet/tests/backgroundtest.cpp index 3ea9b4f..175ac41 100644
--- a/kdeui/sonnet/tests/backgroundtest.cpp
+++ b/kdeui/sonnet/tests/backgroundtest.cpp
@@ -19,7 +19,6 @@
  * 02110-1301  USA
  */
 #include "backgroundtest.h"
-#include "backgroundtest.moc"
 
 #include "speller.h"
 using namespace Sonnet;
diff --git a/kdeui/sonnet/tests/test_dialog.cpp b/kdeui/sonnet/tests/test_dialog.cpp
index 2f95349..527cd3d 100644
--- a/kdeui/sonnet/tests/test_dialog.cpp
+++ b/kdeui/sonnet/tests/test_dialog.cpp
@@ -19,7 +19,6 @@
  * 02110-1301  USA
  */
 #include "test_dialog.h"
-#include "test_dialog.moc"
 
 #include "backgroundchecker.h"
 
diff --git a/kdeui/sonnet/tests/test_highlighter.cpp \
b/kdeui/sonnet/tests/test_highlighter.cpp index 252039a..77e1ae4 100644
--- a/kdeui/sonnet/tests/test_highlighter.cpp
+++ b/kdeui/sonnet/tests/test_highlighter.cpp
@@ -20,7 +20,6 @@
  */
 #include "highlighter.h"
 #include "test_highlighter.h"
-#include "test_highlighter.moc"
 #include "filter_p.h"
 
 #include <kapplication.h>
diff --git a/kdeui/tests/kactioncategorytest.cpp \
b/kdeui/tests/kactioncategorytest.cpp index 7a92872..3aa1b3c 100644
--- a/kdeui/tests/kactioncategorytest.cpp
+++ b/kdeui/tests/kactioncategorytest.cpp
@@ -158,4 +158,3 @@ void tst_KActionCategory::tstActionCreation()
 
 QTEST_KDEMAIN(tst_KActionCategory, GUI)
 
-#include "moc_kactioncategorytest.cpp"
diff --git a/kdeui/tests/kactioncollectiontest.cpp \
b/kdeui/tests/kactioncollectiontest.cpp index 5b9c92f..d978bae 100644
--- a/kdeui/tests/kactioncollectiontest.cpp
+++ b/kdeui/tests/kactioncollectiontest.cpp
@@ -240,7 +240,6 @@ void tst_KActionCollection::testSetShortcuts()
 
 QTEST_KDEMAIN(tst_KActionCollection, GUI)
 
-#include "kactioncollectiontest.moc"
 
 /* vim: et sw=4 ts=4
  */
diff --git a/kdeui/tests/kanimatedbuttontest.cpp \
b/kdeui/tests/kanimatedbuttontest.cpp index d1aa334..b7b7436 100644
--- a/kdeui/tests/kanimatedbuttontest.cpp
+++ b/kdeui/tests/kanimatedbuttontest.cpp
@@ -92,4 +92,3 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "kanimatedbuttontest.moc"
diff --git a/kdeui/tests/kapplication_unittest.cpp \
b/kdeui/tests/kapplication_unittest.cpp index 9982e34..2c05227 100644
--- a/kdeui/tests/kapplication_unittest.cpp
+++ b/kdeui/tests/kapplication_unittest.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "kapplication_unittest.h"
-#include "kapplication_unittest.moc"
 #include <qtest_kde.h>
 
 QTEST_KDEMAIN( KApplication_UnitTest, GUI )
diff --git a/kdeui/tests/kbuttongrouptest.cpp b/kdeui/tests/kbuttongrouptest.cpp
index cc3fdee..24a2318 100644
--- a/kdeui/tests/kbuttongrouptest.cpp
+++ b/kdeui/tests/kbuttongrouptest.cpp
@@ -183,5 +183,4 @@ void KButtonGroupTest::testSignals()
 
 QTEST_KDEMAIN(KButtonGroupTest, GUI)
 
-#include "kbuttongrouptest.moc"
 
diff --git a/kdeui/tests/kcodecactiontest.cpp b/kdeui/tests/kcodecactiontest.cpp
index e44bccf..1380f5a 100644
--- a/kdeui/tests/kcodecactiontest.cpp
+++ b/kdeui/tests/kcodecactiontest.cpp
@@ -74,5 +74,4 @@ void CodecActionTest::slotActionTriggered(bool state)
     kDebug() << sender() << " state " << state;
 }
 
-#include "kcodecactiontest.moc"
 
diff --git a/kdeui/tests/kcolorcombotest.cpp b/kdeui/tests/kcolorcombotest.cpp
index fac6fd5..7806510 100644
--- a/kdeui/tests/kcolorcombotest.cpp
+++ b/kdeui/tests/kcolorcombotest.cpp
@@ -144,4 +144,3 @@ int main(int argc, char **argv)
     return a.exec();
 }
 
-#include "kcolorcombotest.moc"
diff --git a/kdeui/tests/kcolorutilsdemo.cpp b/kdeui/tests/kcolorutilsdemo.cpp
index 83cc01b..a6bb914 100644
--- a/kdeui/tests/kcolorutilsdemo.cpp
+++ b/kdeui/tests/kcolorutilsdemo.cpp
@@ -216,5 +216,4 @@ int main(int argc, char* argv[]) {
     return app.exec();
 }
 
-#include "kcolorutilsdemo.moc"
 // kate: hl C++; indent-width 4; replace-tabs on;
diff --git a/kdeui/tests/kcolorutilstest.cpp b/kdeui/tests/kcolorutilstest.cpp
index e4ea025..8743ab2 100644
--- a/kdeui/tests/kcolorutilstest.cpp
+++ b/kdeui/tests/kcolorutilstest.cpp
@@ -130,4 +130,3 @@ void tst_KColorUtils::testShading()
 }
 
 QTEST_MAIN(tst_KColorUtils)
-#include "kcolorutilstest.moc"
diff --git a/kdeui/tests/kcomboboxtest.cpp b/kdeui/tests/kcomboboxtest.cpp
index 39fc942..490fceb 100644
--- a/kdeui/tests/kcomboboxtest.cpp
+++ b/kdeui/tests/kcomboboxtest.cpp
@@ -237,4 +237,3 @@ int main ( int argc, char **argv)
   return a.exec();
 }
 
-#include "kcomboboxtest.moc"
diff --git a/kdeui/tests/kcompletioncoretest.cpp \
b/kdeui/tests/kcompletioncoretest.cpp index 49f8e42..a2c6508 100644
--- a/kdeui/tests/kcompletioncoretest.cpp
+++ b/kdeui/tests/kcompletioncoretest.cpp
@@ -17,7 +17,6 @@
 */
 
 #include "kcompletioncoretest.h"
-#include "kcompletioncoretest.moc"
 #include "QtTest/QSignalSpy"
 
 #define clampet strings[0]
diff --git a/kdeui/tests/kcompletionuitest.cpp b/kdeui/tests/kcompletionuitest.cpp
index 3d011ba..dd8260a 100644
--- a/kdeui/tests/kcompletionuitest.cpp
+++ b/kdeui/tests/kcompletionuitest.cpp
@@ -205,4 +205,3 @@ int main(int argc, char **argv )
 }
 
 
-#include "kcompletionuitest.moc"
diff --git a/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp \
b/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp index 1ab5c16..4ebd6f3 100644
--- a/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp
+++ b/kdeui/tests/kconfig_compiler/kconfigcompiler_test.cpp
@@ -22,7 +22,6 @@
 #include <qstandardpaths.h>
 #include <qtest.h>
 #include "kconfigcompiler_test.h"
-#include "kconfigcompiler_test.moc"
 
 // QT5 TODO QTEST_GUILESS_MAIN(KConfigCompiler_Test)
 QTEST_MAIN(KConfigCompiler_Test)
diff --git a/kdeui/tests/kconfigguitest.cpp b/kdeui/tests/kconfigguitest.cpp
index 398dfc6..0ae32b0 100644
--- a/kdeui/tests/kconfigguitest.cpp
+++ b/kdeui/tests/kconfigguitest.cpp
@@ -19,7 +19,6 @@
 
 #include <qtest_kde.h>
 #include "kconfigguitest.h"
-#include "kconfigguitest.moc"
 
 #include <kconfig.h>
 #include <kdebug.h>
diff --git a/kdeui/tests/kconfigskeletontest.cpp \
b/kdeui/tests/kconfigskeletontest.cpp index a170389..5e31fd5 100644
--- a/kdeui/tests/kconfigskeletontest.cpp
+++ b/kdeui/tests/kconfigskeletontest.cpp
@@ -19,7 +19,6 @@
 
 #include <qtest_kde.h>
 #include "kconfigskeletontest.h"
-#include "kconfigskeletontest.moc"
 
 #include <kconfig.h>
 #include <kdebug.h>
diff --git a/kdeui/tests/kdatecomboboxtest.cpp b/kdeui/tests/kdatecomboboxtest.cpp
index a820fcd..6e684a2 100644
--- a/kdeui/tests/kdatecomboboxtest.cpp
+++ b/kdeui/tests/kdatecomboboxtest.cpp
@@ -29,7 +29,6 @@
 
 QTEST_KDEMAIN(KDateComboBoxTest, GUI)
 
-#include "kdatecomboboxtest.moc"
 
 void KDateComboBoxTest::testDefaults()
 {
diff --git a/kdeui/tests/kdatetimeedittest.cpp b/kdeui/tests/kdatetimeedittest.cpp
index 2741cc7..50d1b2f 100644
--- a/kdeui/tests/kdatetimeedittest.cpp
+++ b/kdeui/tests/kdatetimeedittest.cpp
@@ -29,7 +29,6 @@
 
 QTEST_KDEMAIN(KDateTimeEditTest, GUI)
 
-#include "kdatetimeedittest.moc"
 
 void KDateTimeEditTest::testDefaults()
 {
diff --git a/kdeui/tests/kfindtest.cpp b/kdeui/tests/kfindtest.cpp
index fdd112f..cb781fc 100644
--- a/kdeui/tests/kfindtest.cpp
+++ b/kdeui/tests/kfindtest.cpp
@@ -371,4 +371,3 @@ void TestKFind::testFindIncrementalDynamic()
 
 QTEST_KDEMAIN(TestKFind, GUI)
 
-#include "kfindtest.moc"
diff --git a/kdeui/tests/kglobalsettingstest.cpp \
b/kdeui/tests/kglobalsettingstest.cpp index 9ee8e05..b688bbc 100644
--- a/kdeui/tests/kglobalsettingstest.cpp
+++ b/kdeui/tests/kglobalsettingstest.cpp
@@ -19,7 +19,6 @@
 
 #include "qtest_kde.h"
 #include "kglobalsettingstest.h"
-#include "kglobalsettingstest.moc"
 
 QTEST_KDEMAIN( KGlobalSettingsTest, GUI )
 
diff --git a/kdeui/tests/kglobalshortcuttest.cpp \
b/kdeui/tests/kglobalshortcuttest.cpp index aa8c81c..9ae924f 100644
--- a/kdeui/tests/kglobalshortcuttest.cpp
+++ b/kdeui/tests/kglobalshortcuttest.cpp
@@ -427,4 +427,3 @@ void KGlobalShortcutTest::testForgetGlobalShortcut()
 }
 
 
-#include "kglobalshortcuttest.moc"
diff --git a/kdeui/tests/khboxtest.cpp b/kdeui/tests/khboxtest.cpp
index b52b977..6d1a98f 100644
--- a/kdeui/tests/khboxtest.cpp
+++ b/kdeui/tests/khboxtest.cpp
@@ -40,4 +40,3 @@ int main( int argc, char ** argv )
     app.exec();
 }
 
-#include "khboxtest.moc"
diff --git a/kdeui/tests/kiconeffecttest.cpp b/kdeui/tests/kiconeffecttest.cpp
index 61949d0..a9557e8 100644
--- a/kdeui/tests/kiconeffecttest.cpp
+++ b/kdeui/tests/kiconeffecttest.cpp
@@ -150,5 +150,4 @@ int main( int argc, char **argv )
     return app.exec();
 }
 
-#include "kiconeffecttest.moc"
 
diff --git a/kdeui/tests/kimageframe.cpp b/kdeui/tests/kimageframe.cpp
index e5066a3..0344bef 100644
--- a/kdeui/tests/kimageframe.cpp
+++ b/kdeui/tests/kimageframe.cpp
@@ -49,5 +49,4 @@ void KImageFrame::paintEvent(QPaintEvent*)
     p.end();
 }
 
-#include "kimageframe.moc"
 // kate: hl C++; indent-width 4; replace-tabs on;
diff --git a/kdeui/tests/kjobtrackerstest.cpp b/kdeui/tests/kjobtrackerstest.cpp
index 1b611b8..c02109c 100644
--- a/kdeui/tests/kjobtrackerstest.cpp
+++ b/kdeui/tests/kjobtrackerstest.cpp
@@ -179,4 +179,3 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "kjobtrackerstest.moc"
diff --git a/kdeui/tests/kledtest.cpp b/kdeui/tests/kledtest.cpp
index d41fdb34..bc6a5c9 100644
--- a/kdeui/tests/kledtest.cpp
+++ b/kdeui/tests/kledtest.cpp
@@ -160,5 +160,4 @@ int main( int argc, char **argv )
     return a.exec();				// go
 }
 
-#include "kledtest.moc"
 
diff --git a/kdeui/tests/klineedittest.cpp b/kdeui/tests/klineedittest.cpp
index 6a445df..017c781 100644
--- a/kdeui/tests/klineedittest.cpp
+++ b/kdeui/tests/klineedittest.cpp
@@ -183,4 +183,3 @@ int main ( int argc, char **argv)
     return a.exec();
 }
 
-#include "klineedittest.moc"
diff --git a/kdeui/tests/kmainwindow_unittest.cpp \
b/kdeui/tests/kmainwindow_unittest.cpp index 93598ef..a161bd4 100644
--- a/kdeui/tests/kmainwindow_unittest.cpp
+++ b/kdeui/tests/kmainwindow_unittest.cpp
@@ -19,7 +19,6 @@
 
 #include "qtest_kde.h"
 #include "kmainwindow_unittest.h"
-#include "kmainwindow_unittest.moc"
 #include <kmainwindow.h>
 #include <kstatusbar.h>
 #include <kglobal.h>
diff --git a/kdeui/tests/kmainwindowrestoretest.cpp \
b/kdeui/tests/kmainwindowrestoretest.cpp index df8d9e4..b8f87a4 100644
--- a/kdeui/tests/kmainwindowrestoretest.cpp
+++ b/kdeui/tests/kmainwindowrestoretest.cpp
@@ -40,4 +40,3 @@ int main( int argc, char * argv[] ) {
   return app.exec();
 }
 
-#include "kmainwindowrestoretest.moc"
diff --git a/kdeui/tests/kmainwindowtest.cpp b/kdeui/tests/kmainwindowtest.cpp
index da7e10b..a783099 100644
--- a/kdeui/tests/kmainwindowtest.cpp
+++ b/kdeui/tests/kmainwindowtest.cpp
@@ -54,7 +54,6 @@ int main( int argc, char **argv )
     return app.exec();
 }
 
-#include "kmainwindowtest.moc"
 
 /* vim: et sw=4 ts=4
  */
diff --git a/kdeui/tests/kmessagetest.cpp b/kdeui/tests/kmessagetest.cpp
index 5e66138..3b8242d 100644
--- a/kdeui/tests/kmessagetest.cpp
+++ b/kdeui/tests/kmessagetest.cpp
@@ -109,5 +109,4 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "kmessagetest.moc"
 // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on;
diff --git a/kdeui/tests/knuminputtest.cpp b/kdeui/tests/knuminputtest.cpp
index 2d3000e..bd46849 100644
--- a/kdeui/tests/knuminputtest.cpp
+++ b/kdeui/tests/knuminputtest.cpp
@@ -179,5 +179,4 @@ int main( int argc, char ** argv )
     a.exec();
 }
 
-#include "knuminputtest.moc"
 
diff --git a/kdeui/tests/kpagedialogtest.cpp b/kdeui/tests/kpagedialogtest.cpp
index 3d58d8b..31552a4 100644
--- a/kdeui/tests/kpagedialogtest.cpp
+++ b/kdeui/tests/kpagedialogtest.cpp
@@ -68,4 +68,3 @@ int main( int argc, char **argv )
   return 0;
 }
 
-#include "kpagedialogtest.moc"
diff --git a/kdeui/tests/kpagewidgettest.cpp b/kdeui/tests/kpagewidgettest.cpp
index 6f9bb14..6d300d0 100644
--- a/kdeui/tests/kpagewidgettest.cpp
+++ b/kdeui/tests/kpagewidgettest.cpp
@@ -209,4 +209,3 @@ int main( int argc, char **argv )
   return app.exec();
 }
 
-#include "kpagewidgettest.moc"
diff --git a/kdeui/tests/kpassivepopuptest.cpp b/kdeui/tests/kpassivepopuptest.cpp
index c6bfa6a..2112a07 100644
--- a/kdeui/tests/kpassivepopuptest.cpp
+++ b/kdeui/tests/kpassivepopuptest.cpp
@@ -1,5 +1,4 @@
 #include "kpassivepopuptest.h"
-#include "kpassivepopuptest.moc"
 #include <kapplication.h>
 #include <kcmdlineargs.h>
 #include <kpassivepopup.h>
diff --git a/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp \
b/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp index 7ca6572..c664330 100644
--- a/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp
+++ b/kdeui/tests/kpixmapsequenceoverlaypaintertest.cpp
@@ -102,4 +102,3 @@ int main(int argc, char **argv)
   return testapp.exec();
 }
 
-#include "kpixmapsequenceoverlaypaintertest.moc"
diff --git a/kdeui/tests/kreplacetest.cpp b/kdeui/tests/kreplacetest.cpp
index 3eec8bb..16c0f87 100644
--- a/kdeui/tests/kreplacetest.cpp
+++ b/kdeui/tests/kreplacetest.cpp
@@ -382,4 +382,3 @@ int main( int argc, char **argv )
     //return app.exec();
     return 0;
 }
-#include "kreplacetest.moc"
diff --git a/kdeui/tests/krulertest.cpp b/kdeui/tests/krulertest.cpp
index db2909a..7be726e 100644
--- a/kdeui/tests/krulertest.cpp
+++ b/kdeui/tests/krulertest.cpp
@@ -387,5 +387,4 @@ int main(int argc, char **argv)
   return testapp->exec();
 }
 
-#include "krulertest.moc"
 
diff --git a/kdeui/tests/kselectaction_unittest.cpp \
b/kdeui/tests/kselectaction_unittest.cpp index 0e509d6..de70ce8 100644
--- a/kdeui/tests/kselectaction_unittest.cpp
+++ b/kdeui/tests/kselectaction_unittest.cpp
@@ -19,7 +19,6 @@
 
 #include "kselectaction_unittest.h"
 #include <QStandardItemModel>
-#include "kselectaction_unittest.moc"
 #include "qtest_kde.h"
 #include <kselectaction.h>
 #include <kcombobox.h>
diff --git a/kdeui/tests/kselectactiontest.cpp b/kdeui/tests/kselectactiontest.cpp
index 7443942..5a8b7cc 100644
--- a/kdeui/tests/kselectactiontest.cpp
+++ b/kdeui/tests/kselectactiontest.cpp
@@ -114,5 +114,4 @@ void SelectActionTest::slotActionTriggered(bool state)
     kDebug() << sender() << " state " << state;
 }
 
-#include "kselectactiontest.moc"
 
diff --git a/kdeui/tests/kstandardactiontest.cpp \
b/kdeui/tests/kstandardactiontest.cpp index 28dada4..00b1080 100644
--- a/kdeui/tests/kstandardactiontest.cpp
+++ b/kdeui/tests/kstandardactiontest.cpp
@@ -60,4 +60,3 @@ void tst_KStandardAction::shortcutForActionId()
 }
 
 QTEST_KDEMAIN(tst_KStandardAction, GUI)
-#include "kstandardactiontest.moc"
diff --git a/kdeui/tests/kstandardshortcuttest.cpp \
b/kdeui/tests/kstandardshortcuttest.cpp index fa50099..82f9462 100644
--- a/kdeui/tests/kstandardshortcuttest.cpp
+++ b/kdeui/tests/kstandardshortcuttest.cpp
@@ -19,7 +19,6 @@
 
 #include <qtest_kde.h>
 #include "kstandardshortcuttest.h"
-#include "kstandardshortcuttest.moc"
 
 QTEST_KDEMAIN( KStandardShortcutTest, GUI ) // GUI needed by KAccel
 
diff --git a/kdeui/tests/kstatusbartest.cpp b/kdeui/tests/kstatusbartest.cpp
index 0ec1d9c..e55cedc 100644
--- a/kdeui/tests/kstatusbartest.cpp
+++ b/kdeui/tests/kstatusbartest.cpp
@@ -123,5 +123,4 @@ int main( int argc, char *argv[] )
         return ret;
 }
 
-#include "kstatusbartest.moc"
 
diff --git a/kdeui/tests/ktabwidgettest.cpp b/kdeui/tests/ktabwidgettest.cpp
index 5efe7f9..f39549c 100644
--- a/kdeui/tests/ktabwidgettest.cpp
+++ b/kdeui/tests/ktabwidgettest.cpp
@@ -392,4 +392,3 @@ int main(int argc, char** argv )
     app.exec();
 }
 
-#include "ktabwidgettest.moc"
diff --git a/kdeui/tests/ktimecomboboxtest.cpp b/kdeui/tests/ktimecomboboxtest.cpp
index 053375a..d92b8f3 100644
--- a/kdeui/tests/ktimecomboboxtest.cpp
+++ b/kdeui/tests/ktimecomboboxtest.cpp
@@ -28,7 +28,6 @@
 
 QTEST_KDEMAIN(KTimeComboBoxTest, GUI)
 
-#include "ktimecomboboxtest.moc"
 
 void KTimeComboBoxTest::testDefaults()
 {
diff --git a/kdeui/tests/ktreewidgetsearchlinetest.cpp \
b/kdeui/tests/ktreewidgetsearchlinetest.cpp index 297b858..c0fbec6 100644
--- a/kdeui/tests/ktreewidgetsearchlinetest.cpp
+++ b/kdeui/tests/ktreewidgetsearchlinetest.cpp
@@ -116,4 +116,3 @@ int main( int argc, char **argv )
     return 0;
 }
 
-#include "ktreewidgetsearchlinetest.moc"
diff --git a/kdeui/tests/kwindowtest.cpp b/kdeui/tests/kwindowtest.cpp
index 08603c9..76b04cf 100644
--- a/kdeui/tests/kwindowtest.cpp
+++ b/kdeui/tests/kwindowtest.cpp
@@ -438,5 +438,4 @@ int main( int argc, char *argv[] )
     return ret;
 }
 
-#include "kwindowtest.moc"
 
diff --git a/kdeui/tests/kxmlgui_unittest.cpp b/kdeui/tests/kxmlgui_unittest.cpp
index fe376a6..86b95a3 100644
--- a/kdeui/tests/kxmlgui_unittest.cpp
+++ b/kdeui/tests/kxmlgui_unittest.cpp
@@ -29,7 +29,6 @@
 #include <kxmlguiclient.h>
 #include "testxmlguiwindow.h"
 #include "testguiclient.h"
-#include "kxmlgui_unittest.moc"
 #include <kxmlguiversionhandler_p.h>
 #include <kxmlguiversionhandler.cpp> // it's not exported, so we need to include the \
code here  
diff --git a/kdeui/tests/kxmlguitest.cpp b/kdeui/tests/kxmlguitest.cpp
index 7809b12..f2cd583 100644
--- a/kdeui/tests/kxmlguitest.cpp
+++ b/kdeui/tests/kxmlguitest.cpp
@@ -71,4 +71,3 @@ int main( int argc, char **argv )
 
     return app.exec();
 }
-#include "kxmlguitest.moc"
diff --git a/kdeui/util/kcompletion.cpp b/kdeui/util/kcompletion.cpp
index 340aa92..0ab2a4f 100644
--- a/kdeui/util/kcompletion.cpp
+++ b/kdeui/util/kcompletion.cpp
@@ -985,4 +985,3 @@ KCompTreeNode *KCompTreeNodeList::at(uint index) const
 
 KZoneAllocator KCompTreeNode::alloc(8192);
 
-#include "kcompletion.moc"
diff --git a/kdeui/util/kcursor.cpp b/kdeui/util/kcursor.cpp
index 087d227..8202bab 100644
--- a/kdeui/util/kcursor.cpp
+++ b/kdeui/util/kcursor.cpp
@@ -436,4 +436,4 @@ void KCursorPrivate::slotWidgetDestroyed( QObject* o )
     delete filter;
 }
 
-#include "kcursor_p.moc"
+#include "moc_kcursor_p.cpp"
diff --git a/kdeui/util/kmanagerselection.cpp b/kdeui/util/kmanagerselection.cpp
index a289f47..ac7409d 100644
--- a/kdeui/util/kmanagerselection.cpp
+++ b/kdeui/util/kmanagerselection.cpp
@@ -485,5 +485,4 @@ void KSelectionWatcher::filterEvent( XEvent* ev_P )
 
 Atom KSelectionWatcher::Private::manager_atom = None;
 
-#include "kmanagerselection.moc"
 #endif
diff --git a/kdeui/util/kmodifierkeyinfo.cpp b/kdeui/util/kmodifierkeyinfo.cpp
index 4de09c7..a450143 100644
--- a/kdeui/util/kmodifierkeyinfo.cpp
+++ b/kdeui/util/kmodifierkeyinfo.cpp
@@ -78,4 +78,3 @@ bool KModifierKeyInfo::isButtonPressed(Qt::MouseButton button) \
const  return p->isButtonPressed(button);
 }
 
-#include "kmodifierkeyinfo.moc"
diff --git a/kdeui/util/kmodifierkeyinfoprovider.cpp \
b/kdeui/util/kmodifierkeyinfoprovider.cpp index 6e99433..086afdc 100644
--- a/kdeui/util/kmodifierkeyinfoprovider.cpp
+++ b/kdeui/util/kmodifierkeyinfoprovider.cpp
@@ -64,4 +64,4 @@ const QList<Qt::Key> KModifierKeyInfoProvider::knownKeys() const
     return m_modifierStates.keys();
 }
 
-#include "kmodifierkeyinfoprovider_p.moc"
+#include "moc_kmodifierkeyinfoprovider_p.cpp"
diff --git a/kdeui/util/knumvalidator.cpp b/kdeui/util/knumvalidator.cpp
index d4872a7..1ac5e30 100644
--- a/kdeui/util/knumvalidator.cpp
+++ b/kdeui/util/knumvalidator.cpp
@@ -232,4 +232,3 @@ QValidator::State KDoubleValidator::validate( QString & input, \
int & p ) const {  return base::validate( s, p );
 }
 
-#include "knumvalidator.moc"
diff --git a/kdeui/util/kpassivepopup.cpp b/kdeui/util/kpassivepopup.cpp
index 7e5637c..87f9e2a 100644
--- a/kdeui/util/kpassivepopup.cpp
+++ b/kdeui/util/kpassivepopup.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "kpassivepopup.h"
-#include "kpassivepopup.moc"
 
 // Qt
 #include <QApplication>
diff --git a/kdeui/util/kpassivepopupmessagehandler.cpp \
b/kdeui/util/kpassivepopupmessagehandler.cpp index 80f96fa..2a285c0 100644
--- a/kdeui/util/kpassivepopupmessagehandler.cpp
+++ b/kdeui/util/kpassivepopupmessagehandler.cpp
@@ -64,5 +64,4 @@ QWidget *KPassivePopupMessageHandler::parentWidget()
     return qobject_cast<QWidget*>( parent() );
 }
 
-#include "kpassivepopupmessagehandler.moc"
 // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on;
diff --git a/kdeui/util/kpixmapsequenceoverlaypainter.cpp \
b/kdeui/util/kpixmapsequenceoverlaypainter.cpp index 53bd3b6..cc112dc 100644
--- a/kdeui/util/kpixmapsequenceoverlaypainter.cpp
+++ b/kdeui/util/kpixmapsequenceoverlaypainter.cpp
@@ -275,4 +275,4 @@ bool KPixmapSequenceOverlayPainter::eventFilter(QObject *obj, \
QEvent *event)  return false;
 }
 
-#include "kpixmapsequenceoverlaypainter.moc"
+#include "moc_kpixmapsequenceoverlaypainter.cpp"
diff --git a/kdeui/util/kpixmapsequencewidget.cpp \
b/kdeui/util/kpixmapsequencewidget.cpp index c130d8b..37c4918 100644
--- a/kdeui/util/kpixmapsequencewidget.cpp
+++ b/kdeui/util/kpixmapsequencewidget.cpp
@@ -85,4 +85,3 @@ void KPixmapSequenceWidget::setInterval(int msecs)
     d->m_painter.setInterval(msecs);
 }
 
-#include "kpixmapsequencewidget.moc"
diff --git a/kdeui/util/kundostack.cpp b/kdeui/util/kundostack.cpp
index 20cb5ac..8716b00 100644
--- a/kdeui/util/kundostack.cpp
+++ b/kdeui/util/kundostack.cpp
@@ -72,4 +72,3 @@ QAction* KUndoStack::createUndoAction(KActionCollection* \
actionCollection, const  return action;
 }
 
-#include "kundostack.moc"
diff --git a/kdeui/util/kwallet.cpp b/kdeui/util/kwallet.cpp
index 51c741a..e48c451 100644
--- a/kdeui/util/kwallet.cpp
+++ b/kdeui/util/kwallet.cpp
@@ -1726,4 +1726,4 @@ org::kde::KWallet &KWalletDLauncher::getInterface()
 
 } // namespace KWallet
 
-#include "kwallet.moc"
+#include "moc_kwallet.cpp"
diff --git a/kdeui/util/kxmessages.cpp b/kdeui/util/kxmessages.cpp
index 0a79ede..ca431a6 100644
--- a/kdeui/util/kxmessages.cpp
+++ b/kdeui/util/kxmessages.cpp
@@ -220,5 +220,4 @@ bool KXMessages::x11Event( XEvent* ev_P )
     return false; // lets other KXMessages instances get the event too
     }
 
-#include "kxmessages.moc"
 #endif
diff --git a/kdeui/widgets/kactionselector.cpp b/kdeui/widgets/kactionselector.cpp
index a898a3c..f74e673 100644
--- a/kdeui/widgets/kactionselector.cpp
+++ b/kdeui/widgets/kactionselector.cpp
@@ -562,4 +562,4 @@ int KActionSelectorPrivate::selectedRowIndex( QListWidget *lb )
 }
 
 //END Private Methods
-#include "kactionselector.moc"
+#include "moc_kactionselector.cpp"
diff --git a/kdeui/widgets/kanimatedbutton.cpp b/kdeui/widgets/kanimatedbutton.cpp
index e4789b9..6c7d20a 100644
--- a/kdeui/widgets/kanimatedbutton.cpp
+++ b/kdeui/widgets/kanimatedbutton.cpp
@@ -201,4 +201,4 @@ int KAnimatedButton::iconDimensions() const
   return qMin(iconSize().width(), iconSize().height());
 }
 
-#include "kanimatedbutton.moc"
+#include "moc_kanimatedbutton.cpp"
diff --git a/kdeui/widgets/karrowbutton.cpp b/kdeui/widgets/karrowbutton.cpp
index 5c9c924..c0893f6 100644
--- a/kdeui/widgets/karrowbutton.cpp
+++ b/kdeui/widgets/karrowbutton.cpp
@@ -116,4 +116,3 @@ void KArrowButton::paintEvent(QPaintEvent*)
 	style()->drawPrimitive( e, &opt, &p, this );
 }
 
-#include "karrowbutton.moc"
diff --git a/kdeui/widgets/kbuttongroup.cpp b/kdeui/widgets/kbuttongroup.cpp
index 6d57c71..be0bd3f 100644
--- a/kdeui/widgets/kbuttongroup.cpp
+++ b/kdeui/widgets/kbuttongroup.cpp
@@ -160,5 +160,5 @@ void KButtonGroup::Private::slotClicked( int id )
   emit q->changed( id );
 }
 
-#include "kbuttongroup.moc"
+#include "moc_kbuttongroup.cpp"
 
diff --git a/kdeui/widgets/kcapacitybar.cpp b/kdeui/widgets/kcapacitybar.cpp
index ba20eea..4651a0e 100644
--- a/kdeui/widgets/kcapacitybar.cpp
+++ b/kdeui/widgets/kcapacitybar.cpp
@@ -375,4 +375,3 @@ void KCapacityBar::paintEvent(QPaintEvent *event)
     p.end();
 }
 
-#include "kcapacitybar.moc"
diff --git a/kdeui/widgets/kcharselect.cpp b/kdeui/widgets/kcharselect.cpp
index 905343a..36ad65c 100644
--- a/kdeui/widgets/kcharselect.cpp
+++ b/kdeui/widgets/kcharselect.cpp
@@ -895,5 +895,5 @@ QVariant KCharSelectItemModel::data(const QModelIndex &index, int \
role) const  return QVariant();
 }
 
-#include "kcharselect.moc"
-#include "kcharselect_p.moc"
+#include "moc_kcharselect.cpp"
+#include "moc_kcharselect_p.cpp"
diff --git a/kdeui/widgets/kcmodule.cpp b/kdeui/widgets/kcmodule.cpp
index 486716a..ac2365d 100644
--- a/kdeui/widgets/kcmodule.cpp
+++ b/kdeui/widgets/kcmodule.cpp
@@ -313,5 +313,4 @@ QList<KConfigDialogManager*> KCModule::configs() const
     return d->managers;
 }
 
-#include "kcmodule.moc"
 // vim: sw=4 et sts=4
diff --git a/kdeui/widgets/kcombobox.cpp b/kdeui/widgets/kcombobox.cpp
index 4bde2d5..611ba86 100644
--- a/kdeui/widgets/kcombobox.cpp
+++ b/kdeui/widgets/kcombobox.cpp
@@ -397,4 +397,3 @@ void KComboBox::setEditable(bool editable)
     }
 }
 
-#include "kcombobox.moc"
diff --git a/kdeui/widgets/kcompletionbox.cpp b/kdeui/widgets/kcompletionbox.cpp
index 6b9b050..b229be4 100644
--- a/kdeui/widgets/kcompletionbox.cpp
+++ b/kdeui/widgets/kcompletionbox.cpp
@@ -579,4 +579,3 @@ bool KCompletionBox::activateOnSelect() const
     return d->emitSelected;
 }
 
-#include "kcompletionbox.moc"
diff --git a/kdeui/widgets/kdatecombobox.cpp b/kdeui/widgets/kdatecombobox.cpp
index 647afbc..7300e60 100644
--- a/kdeui/widgets/kdatecombobox.cpp
+++ b/kdeui/widgets/kdatecombobox.cpp
@@ -544,4 +544,4 @@ void KDateComboBox::resizeEvent(QResizeEvent *event)
     KComboBox::resizeEvent(event);
 }
 
-#include "kdatecombobox.moc"
+#include "moc_kdatecombobox.cpp"
diff --git a/kdeui/widgets/kdatepicker.cpp b/kdeui/widgets/kdatepicker.cpp
index 7682949..08a51d9 100644
--- a/kdeui/widgets/kdatepicker.cpp
+++ b/kdeui/widgets/kdatepicker.cpp
@@ -44,8 +44,8 @@
 #include <klineedit.h>
 #include <knotification.h>
 
-#include "kdatepicker.moc"
-#include "kdatepicker_p.moc"
+#include "moc_kdatepicker.cpp"
+#include "moc_kdatepicker_p.cpp"
 
 // Week numbers are defined by ISO 8601
 // See http://www.merlyn.demon.co.uk/weekinfo.htm for details
diff --git a/kdeui/widgets/kdatetable.cpp b/kdeui/widgets/kdatetable.cpp
index ccfc230..d2a5226 100644
--- a/kdeui/widgets/kdatetable.cpp
+++ b/kdeui/widgets/kdatetable.cpp
@@ -959,4 +959,4 @@ int KPopupFrame::exec( int x, int y )
     return exec( QPoint( x, y ) );
 }
 
-#include "kdatetable.moc"
+#include "moc_kdatetable.cpp"
diff --git a/kdeui/widgets/kdatetimeedit.cpp b/kdeui/widgets/kdatetimeedit.cpp
index f86d37f..0c2d623 100644
--- a/kdeui/widgets/kdatetimeedit.cpp
+++ b/kdeui/widgets/kdatetimeedit.cpp
@@ -598,4 +598,4 @@ void KDateTimeEdit::resizeEvent(QResizeEvent *event)
     QWidget::resizeEvent(event);
 }
 
-#include "kdatetimeedit.moc"
+#include "moc_kdatetimeedit.cpp"
diff --git a/kdeui/widgets/kdatetimewidget.cpp b/kdeui/widgets/kdatetimewidget.cpp
index b1dcd58..1745e56 100644
--- a/kdeui/widgets/kdatetimewidget.cpp
+++ b/kdeui/widgets/kdatetimewidget.cpp
@@ -94,4 +94,3 @@ void KDateTimeWidget::slotValueChanged()
   emit valueChanged(datetime);
 }
 
-#include "kdatetimewidget.moc"
diff --git a/kdeui/widgets/kdatewidget.cpp b/kdeui/widgets/kdatewidget.cpp
index 07ba2df..61b7856 100644
--- a/kdeui/widgets/kdatewidget.cpp
+++ b/kdeui/widgets/kdatewidget.cpp
@@ -182,4 +182,3 @@ bool KDateWidget::setCalendarSystem( KLocale::CalendarSystem \
newCalendarSystem )  return true;
 }
 
-#include "kdatewidget.moc"
diff --git a/kdeui/widgets/kdialogbuttonbox.cpp b/kdeui/widgets/kdialogbuttonbox.cpp
index 372329f..fcf45ac 100644
--- a/kdeui/widgets/kdialogbuttonbox.cpp
+++ b/kdeui/widgets/kdialogbuttonbox.cpp
@@ -54,4 +54,3 @@ KPushButton *KDialogButtonBox::addButton(  const KGuiItem& guiitem, \
ButtonRole r  return pb;
 }
 
-#include "kdialogbuttonbox.moc"
diff --git a/kdeui/widgets/keditlistbox.cpp b/kdeui/widgets/keditlistbox.cpp
index 576dba6..756d221 100644
--- a/kdeui/widgets/keditlistbox.cpp
+++ b/kdeui/widgets/keditlistbox.cpp
@@ -684,4 +684,3 @@ bool KEditListBox::eventFilter( QObject* o, QEvent* e )
     return false;
 }
 
-#include "keditlistbox.moc"
diff --git a/kdeui/widgets/keditlistwidget.cpp b/kdeui/widgets/keditlistwidget.cpp
index 39b56f3..e61e6bf 100644
--- a/kdeui/widgets/keditlistwidget.cpp
+++ b/kdeui/widgets/keditlistwidget.cpp
@@ -663,4 +663,3 @@ bool KEditListWidget::eventFilter( QObject* o, QEvent* e )
     return false;
 }
 
-#include "keditlistwidget.moc"
diff --git a/kdeui/widgets/khbox.cpp b/kdeui/widgets/khbox.cpp
index fcf6e29..7379d97 100644
--- a/kdeui/widgets/khbox.cpp
+++ b/kdeui/widgets/khbox.cpp
@@ -110,4 +110,3 @@ void KHBox::setMargin( int margin )
 	layout()->setMargin( margin );
 }
 
-#include "khbox.moc"
diff --git a/kdeui/widgets/khelpmenu.cpp b/kdeui/widgets/khelpmenu.cpp
index e3917e5..bf5b8a4 100644
--- a/kdeui/widgets/khelpmenu.cpp
+++ b/kdeui/widgets/khelpmenu.cpp
@@ -397,4 +397,3 @@ void KHelpMenu::contextHelpActivated()
 }
 
 
-#include "khelpmenu.moc"
diff --git a/kdeui/widgets/khistorycombobox.cpp b/kdeui/widgets/khistorycombobox.cpp
index 47c9828..672a77a 100644
--- a/kdeui/widgets/khistorycombobox.cpp
+++ b/kdeui/widgets/khistorycombobox.cpp
@@ -445,4 +445,3 @@ void KHistoryComboBox::reset()
   slotReset();
 }
 
-#include "khistorycombobox.moc"
diff --git a/kdeui/widgets/kkeysequencewidget.cpp \
b/kdeui/widgets/kkeysequencewidget.cpp index 8aa696a..54ffcc4 100644
--- a/kdeui/widgets/kkeysequencewidget.cpp
+++ b/kdeui/widgets/kkeysequencewidget.cpp
@@ -844,5 +844,5 @@ bool KKeySequenceWidgetPrivate::isOkWhenModifierless(int keyQt)
     }
 }
 
-#include "kkeysequencewidget.moc"
-#include "kkeysequencewidget_p.moc"
+#include "moc_kkeysequencewidget.cpp"
+#include "moc_kkeysequencewidget_p.cpp"
diff --git a/kdeui/widgets/klanguagebutton.cpp b/kdeui/widgets/klanguagebutton.cpp
index d3c7531..692f6de 100644
--- a/kdeui/widgets/klanguagebutton.cpp
+++ b/kdeui/widgets/klanguagebutton.cpp
@@ -18,13 +18,14 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include "klanguagebutton.moc"
 
 #include <QtGui/QMenu>
 #include <QtGui/QLayout>
 #include <QtGui/QPushButton>
 #include <QtGui/QMenuItem>
 
+#include "klanguagebutton.h"
+
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/kdeui/widgets/kled.cpp b/kdeui/widgets/kled.cpp
index bb618d9..e50cdcf 100644
--- a/kdeui/widgets/kled.cpp
+++ b/kdeui/widgets/kled.cpp
@@ -325,4 +325,3 @@ void KLed::paintLed(Shape shape, Look look)
     painter.end();
 }
 
-#include "kled.moc"
diff --git a/kdeui/widgets/klineedit.cpp b/kdeui/widgets/klineedit.cpp
index 7df6ff44..1ebd45d 100644
--- a/kdeui/widgets/klineedit.cpp
+++ b/kdeui/widgets/klineedit.cpp
@@ -1878,5 +1878,5 @@ void KLineEdit::doCompletion(const QString& txt)
     d->completionRunning = false;
 }
 
-#include "klineedit.moc"
-#include "klineedit_p.moc"
+#include "moc_klineedit.cpp"
+#include "moc_klineedit_p.cpp"
diff --git a/kdeui/widgets/kmainwindow.cpp b/kdeui/widgets/kmainwindow.cpp
index 41cef48..018a90e 100644
--- a/kdeui/widgets/kmainwindow.cpp
+++ b/kdeui/widgets/kmainwindow.cpp
@@ -1180,5 +1180,5 @@ QString KMainWindow::dbusName() const
     return k_func()->dbusName;
 }
 
-#include "kmainwindow.moc"
+#include "moc_kmainwindow.cpp"
 
diff --git a/kdeui/widgets/kmenu.cpp b/kdeui/widgets/kmenu.cpp
index 7dab149..b81b241 100644
--- a/kdeui/widgets/kmenu.cpp
+++ b/kdeui/widgets/kmenu.cpp
@@ -627,4 +627,4 @@ KMenuContext::KMenuContext(QPointer<KMenu> menu,QPointer<QAction> \
action)  {
 }
 
-#include "kmenu.moc"
+#include "moc_kmenu.cpp"
diff --git a/kdeui/widgets/kmenubar.cpp b/kdeui/widgets/kmenubar.cpp
index 948c229..f8240ca 100644
--- a/kdeui/widgets/kmenubar.cpp
+++ b/kdeui/widgets/kmenubar.cpp
@@ -562,4 +562,3 @@ void KMenuBar::paintEvent( QPaintEvent* pe )
 #endif
 }
 
-#include "kmenubar.moc"
diff --git a/kdeui/widgets/kmessagewidget.cpp b/kdeui/widgets/kmessagewidget.cpp
index ec222fb..a6c3255 100644
--- a/kdeui/widgets/kmessagewidget.cpp
+++ b/kdeui/widgets/kmessagewidget.cpp
@@ -395,4 +395,4 @@ void KMessageWidget::animatedHide()
     }
 }
 
-#include "kmessagewidget.moc"
+#include "moc_kmessagewidget.cpp"
diff --git a/kdeui/widgets/kmultitabbar.cpp b/kdeui/widgets/kmultitabbar.cpp
index 8de08bc..a95d0a4 100644
--- a/kdeui/widgets/kmultitabbar.cpp
+++ b/kdeui/widgets/kmultitabbar.cpp
@@ -24,8 +24,8 @@
 
 #include "kmultitabbar.h"
 #include "kmultitabbar_p.h"
-#include "kmultitabbar.moc"
-#include "kmultitabbar_p.moc"
+#include "moc_kmultitabbar.cpp"
+#include "moc_kmultitabbar_p.cpp"
 
 #include <QtGui/QActionEvent>
 #include <QtGui/QLayout>
diff --git a/kdeui/widgets/knuminput.cpp b/kdeui/widgets/knuminput.cpp
index cc44558..519ee9a 100644
--- a/kdeui/widgets/knuminput.cpp
+++ b/kdeui/widgets/knuminput.cpp
@@ -1085,4 +1085,4 @@ void KDoubleNumInput::setExponentRatio(double dbl)
 }
 
 
-#include "knuminput.moc"
+#include "moc_knuminput.cpp"
diff --git a/kdeui/widgets/kpixmapregionselectorwidget.cpp \
b/kdeui/widgets/kpixmapregionselectorwidget.cpp index 4e322a8..834d9c3 100644
--- a/kdeui/widgets/kpixmapregionselectorwidget.cpp
+++ b/kdeui/widgets/kpixmapregionselectorwidget.cpp
@@ -525,4 +525,3 @@ void KPixmapRegionSelectorWidget::setMaximumWidgetSize(int width, \
int height)  resize(d->m_label->width(), d->m_label->height());
 }
 
-#include "kpixmapregionselectorwidget.moc"
diff --git a/kdeui/widgets/kpushbutton.cpp b/kdeui/widgets/kpushbutton.cpp
index 6cae04f..2bfc251 100644
--- a/kdeui/widgets/kpushbutton.cpp
+++ b/kdeui/widgets/kpushbutton.cpp
@@ -382,4 +382,4 @@ void KPushButton::paintEvent( QPaintEvent * )
     p.drawControl(QStyle::CE_PushButton, option);
 }
 
-#include "kpushbutton.moc"
+#include "moc_kpushbutton.cpp"
diff --git a/kdeui/widgets/kratingwidget.cpp b/kdeui/widgets/kratingwidget.cpp
index 811ca0a..f3765d0 100644
--- a/kdeui/widgets/kratingwidget.cpp
+++ b/kdeui/widgets/kratingwidget.cpp
@@ -261,4 +261,3 @@ void KRatingWidget::resizeEvent( QResizeEvent* e )
     QFrame::resizeEvent( e );
 }
 
-#include "kratingwidget.moc"
diff --git a/kdeui/widgets/krestrictedline.cpp b/kdeui/widgets/krestrictedline.cpp
index 6a03b4f..39c7b3d 100644
--- a/kdeui/widgets/krestrictedline.cpp
+++ b/kdeui/widgets/krestrictedline.cpp
@@ -101,4 +101,3 @@ QString KRestrictedLine::validChars() const
   return d->qsValidChars;
 }
 
-#include "krestrictedline.moc"
diff --git a/kdeui/widgets/krichtextedit.cpp b/kdeui/widgets/krichtextedit.cpp
index ab7c1d5..e28cd71 100644
--- a/kdeui/widgets/krichtextedit.cpp
+++ b/kdeui/widgets/krichtextedit.cpp
@@ -575,4 +575,3 @@ QString KRichTextEdit::toCleanHtml() const
   return result;
 }
 
-#include "krichtextedit.moc"
diff --git a/kdeui/widgets/krichtextwidget.cpp b/kdeui/widgets/krichtextwidget.cpp
index cf1e6c9..c3d51b7 100644
--- a/kdeui/widgets/krichtextwidget.cpp
+++ b/kdeui/widgets/krichtextwidget.cpp
@@ -709,4 +709,4 @@ void KRichTextWidget::updateActionStates()
 }
 
 // kate: space-indent on; indent-width 4; encoding utf-8; replace-tabs on;
-#include "krichtextwidget.moc"
+#include "moc_krichtextwidget.cpp"
diff --git a/kdeui/widgets/kruler.cpp b/kdeui/widgets/kruler.cpp
index ba8559f..76da85b 100644
--- a/kdeui/widgets/kruler.cpp
+++ b/kdeui/widgets/kruler.cpp
@@ -772,4 +772,3 @@ KRuler::paintEvent(QPaintEvent * /*e*/)
 
 }
 
-#include "kruler.moc"
diff --git a/kdeui/widgets/kselector.cpp b/kdeui/widgets/kselector.cpp
index bceda6a..b9d88de 100644
--- a/kdeui/widgets/kselector.cpp
+++ b/kdeui/widgets/kselector.cpp
@@ -442,4 +442,3 @@ QString KGradientSelector::secondText() const
   return d->text2;
 }
 
-#include "kselector.moc"
diff --git a/kdeui/widgets/kseparator.cpp b/kdeui/widgets/kseparator.cpp
index a97396d..5f53ea6 100644
--- a/kdeui/widgets/kseparator.cpp
+++ b/kdeui/widgets/kseparator.cpp
@@ -59,4 +59,3 @@ Qt::Orientation KSeparator::orientation() const
    return ((frameStyle() & VLine) == VLine) ? Qt::Vertical : Qt::Horizontal;
 }
 
-#include "kseparator.moc"
diff --git a/kdeui/widgets/kshortcutwidget.cpp b/kdeui/widgets/kshortcutwidget.cpp
index f8d93f2..1bfd2a9 100644
--- a/kdeui/widgets/kshortcutwidget.cpp
+++ b/kdeui/widgets/kshortcutwidget.cpp
@@ -146,4 +146,4 @@ void KShortcutWidgetPrivate::altKeySequenceChanged(const \
QKeySequence &seq)  emit q->shortcutChanged(cut);
 }
 
-#include "kshortcutwidget.moc"
+#include "moc_kshortcutwidget.cpp"
diff --git a/kdeui/widgets/ksqueezedtextlabel.cpp \
b/kdeui/widgets/ksqueezedtextlabel.cpp index 99745d5..16ed153 100644
--- a/kdeui/widgets/ksqueezedtextlabel.cpp
+++ b/kdeui/widgets/ksqueezedtextlabel.cpp
@@ -202,4 +202,4 @@ void KSqueezedTextLabel::mouseReleaseEvent(QMouseEvent* ev)
     }
 }
 
-#include "ksqueezedtextlabel.moc"
+#include "moc_ksqueezedtextlabel.cpp"
diff --git a/kdeui/widgets/kstatusbar.cpp b/kdeui/widgets/kstatusbar.cpp
index c9930bb..0fcbb23 100644
--- a/kdeui/widgets/kstatusbar.cpp
+++ b/kdeui/widgets/kstatusbar.cpp
@@ -201,5 +201,4 @@ void KStatusBar::setItemFixed(int id, int w)
     }
 }
 
-#include "kstatusbar.moc"
 
diff --git a/kdeui/widgets/kstringvalidator.cpp b/kdeui/widgets/kstringvalidator.cpp
index 70fec28..c4fcc21 100644
--- a/kdeui/widgets/kstringvalidator.cpp
+++ b/kdeui/widgets/kstringvalidator.cpp
@@ -111,4 +111,3 @@ QStringList KStringListValidator::stringList() const
   return d->mStringList;
 }
 
-#include "kstringvalidator.moc"
diff --git a/kdeui/widgets/ktabbar.cpp b/kdeui/widgets/ktabbar.cpp
index 675fc3e..b4b853b 100644
--- a/kdeui/widgets/ktabbar.cpp
+++ b/kdeui/widgets/ktabbar.cpp
@@ -447,4 +447,3 @@ QRect KTabBar::closeButtonRect( int tabIndex ) const
   return QRect();
 }
 
-#include "ktabbar.moc"
diff --git a/kdeui/widgets/ktabwidget.cpp b/kdeui/widgets/ktabwidget.cpp
index fc82bfa..a28c6ec 100644
--- a/kdeui/widgets/ktabwidget.cpp
+++ b/kdeui/widgets/ktabwidget.cpp
@@ -721,4 +721,4 @@ void KTabWidget::currentChanged( int )
 }
 #endif
 
-#include "ktabwidget.moc"
+#include "moc_ktabwidget.cpp"
diff --git a/kdeui/widgets/ktextbrowser.cpp b/kdeui/widgets/ktextbrowser.cpp
index 07d09bd..7371295 100644
--- a/kdeui/widgets/ktextbrowser.cpp
+++ b/kdeui/widgets/ktextbrowser.cpp
@@ -128,4 +128,3 @@ void KTextBrowser::contextMenuEvent( QContextMenuEvent *event )
   }
 }
 
-#include "ktextbrowser.moc"
diff --git a/kdeui/widgets/ktextedit.cpp b/kdeui/widgets/ktextedit.cpp
index 9987707..57cce76 100644
--- a/kdeui/widgets/ktextedit.cpp
+++ b/kdeui/widgets/ktextedit.cpp
@@ -1128,4 +1128,4 @@ void KTextEdit::focusOutEvent(QFocusEvent *ev)
     QTextEdit::focusOutEvent(ev);
 }
 
-#include "ktextedit.moc"
+#include "moc_ktextedit.cpp"
diff --git a/kdeui/widgets/ktimecombobox.cpp b/kdeui/widgets/ktimecombobox.cpp
index 779c9ff..b8e290d 100644
--- a/kdeui/widgets/ktimecombobox.cpp
+++ b/kdeui/widgets/ktimecombobox.cpp
@@ -538,4 +538,4 @@ void KTimeComboBox::resizeEvent(QResizeEvent *event)
     KComboBox::resizeEvent(event);
 }
 
-#include "ktimecombobox.moc"
+#include "moc_ktimecombobox.cpp"
diff --git a/kdeui/widgets/ktimezonewidget.cpp b/kdeui/widgets/ktimezonewidget.cpp
index 13dd064..880ed00 100644
--- a/kdeui/widgets/ktimezonewidget.cpp
+++ b/kdeui/widgets/ktimezonewidget.cpp
@@ -247,4 +247,3 @@ QAbstractItemView::SelectionMode KTimeZoneWidget::selectionMode() \
const  }
 }
 
-#include "ktimezonewidget.moc"
diff --git a/kdeui/widgets/ktitlewidget.cpp b/kdeui/widgets/ktitlewidget.cpp
index 8464d7e..cb81c83 100644
--- a/kdeui/widgets/ktitlewidget.cpp
+++ b/kdeui/widgets/ktitlewidget.cpp
@@ -294,4 +294,4 @@ void KTitleWidget::showEvent(QShowEvent *event)
     }
 }
 
-#include "ktitlewidget.moc"
+#include "moc_ktitlewidget.cpp"
diff --git a/kdeui/widgets/ktoolbar.cpp b/kdeui/widgets/ktoolbar.cpp
index cce242b..8803d66 100644
--- a/kdeui/widgets/ktoolbar.cpp
+++ b/kdeui/widgets/ktoolbar.cpp
@@ -1395,4 +1395,4 @@ bool KToolBar::toolBarsLocked()
     return KToolBar::Private::s_locked;
 }
 
-#include "ktoolbar.moc"
+#include "moc_ktoolbar.cpp"
diff --git a/kdeui/widgets/kurllabel.cpp b/kdeui/widgets/kurllabel.cpp
index 43b64cc..c23795a 100644
--- a/kdeui/widgets/kurllabel.cpp
+++ b/kdeui/widgets/kurllabel.cpp
@@ -329,4 +329,4 @@ bool KUrlLabel::event( QEvent *event )
     return QLabel::event( event );
 }
 
-#include "kurllabel.moc"
+#include "moc_kurllabel.cpp"
diff --git a/kdeui/widgets/kvbox.cpp b/kdeui/widgets/kvbox.cpp
index dcc97b7..3f8662f 100644
--- a/kdeui/widgets/kvbox.cpp
+++ b/kdeui/widgets/kvbox.cpp
@@ -28,4 +28,3 @@ KVBox::~KVBox()
 {
 }
 
-#include "kvbox.moc"
diff --git a/kdeui/widgets/kxyselector.cpp b/kdeui/widgets/kxyselector.cpp
index a6f66d2..0e366d6 100644
--- a/kdeui/widgets/kxyselector.cpp
+++ b/kdeui/widgets/kxyselector.cpp
@@ -258,4 +258,3 @@ void KXYSelector::drawMarker( QPainter *p, int xp, int yp )
 
 
 
-#include "kxyselector.moc"
diff --git a/kdeui/xmlgui/kmainwindowiface.cpp b/kdeui/xmlgui/kmainwindowiface.cpp
index e432bbe..87badf0 100644
--- a/kdeui/xmlgui/kmainwindowiface.cpp
+++ b/kdeui/xmlgui/kmainwindowiface.cpp
@@ -117,4 +117,4 @@ void KMainWindowInterface::grabWindowToClipBoard()
 	clipboard->setPixmap(QPixmap::grabWidget(m_MainWindow));
 }
 
-#include "kmainwindowiface_p.moc"
+#include "moc_kmainwindowiface_p.cpp"
diff --git a/kdeui/xmlgui/kmenumenuhandler_p.cpp \
b/kdeui/xmlgui/kmenumenuhandler_p.cpp index cc3499e..a17f55e 100644
--- a/kdeui/xmlgui/kmenumenuhandler_p.cpp
+++ b/kdeui/xmlgui/kmenumenuhandler_p.cpp
@@ -194,4 +194,3 @@ void KMenuMenuHandler::slotAddToToolBar(int tb)
 
 } //END namespace KDEPrivate
 
-#include "kmenumenuhandler_p.moc"
diff --git a/kdeui/xmlgui/ktoolbarhandler.cpp b/kdeui/xmlgui/ktoolbarhandler.cpp
index 73a6a4e..207fa1e 100644
--- a/kdeui/xmlgui/ktoolbarhandler.cpp
+++ b/kdeui/xmlgui/ktoolbarhandler.cpp
@@ -257,4 +257,4 @@ void ToolBarHandler::setupActions()
   d->connectToActionContainers();
 }
 
-#include "ktoolbarhandler_p.moc"
+#include "moc_ktoolbarhandler_p.cpp"
diff --git a/kdeui/xmlgui/kxmlguifactory.cpp b/kdeui/xmlgui/kxmlguifactory.cpp
index 8ad7629..b9364f8 100644
--- a/kdeui/xmlgui/kxmlguifactory.cpp
+++ b/kdeui/xmlgui/kxmlguifactory.cpp
@@ -798,7 +798,6 @@ QDomElement KXMLGUIFactory::findActionByName( QDomElement& elem, \
const QString&  return QDomElement();
 }
 
-#include "kxmlguifactory.moc"
 
 /* vim: et sw=4
  */
diff --git a/kdeui/xmlgui/kxmlguiwindow.cpp b/kdeui/xmlgui/kxmlguiwindow.cpp
index 760b5d1..b4e3d0b 100644
--- a/kdeui/xmlgui/kxmlguiwindow.cpp
+++ b/kdeui/xmlgui/kxmlguiwindow.cpp
@@ -358,5 +358,5 @@ void KXmlGuiWindow::applyMainWindowSettings(const KConfigGroup \
&config, bool for  void KXmlGuiWindow::finalizeGUI( KXMLGUIClient *client )
 { KXMLGUIBuilder::finalizeGUI( client ); }
 
-#include "kxmlguiwindow.moc"
+#include "moc_kxmlguiwindow.cpp"
 
diff --git a/kdewebkit/kgraphicswebview.cpp b/kdewebkit/kgraphicswebview.cpp
index 6f83898..e74b1fd 100644
--- a/kdewebkit/kgraphicswebview.cpp
+++ b/kdewebkit/kgraphicswebview.cpp
@@ -82,4 +82,3 @@ void KGraphicsWebView::mouseReleaseEvent(QGraphicsSceneMouseEvent \
*event)  QGraphicsWebView::mouseReleaseEvent(event);
 }
 
-#include "kgraphicswebview.moc"
diff --git a/kdewebkit/kwebpage.cpp b/kdewebkit/kwebpage.cpp
index b30297d..1c925cc 100644
--- a/kdewebkit/kwebpage.cpp
+++ b/kdewebkit/kwebpage.cpp
@@ -558,5 +558,5 @@ bool KWebPage::handleReply(QNetworkReply* reply, QString* \
contentType, KIO::Meta  return false;
 }
 
-#include "kwebpage.moc"
+#include "moc_kwebpage.cpp"
 
diff --git a/kdewebkit/kwebpluginfactory.cpp b/kdewebkit/kwebpluginfactory.cpp
index 6840a98..d73b822 100644
--- a/kdewebkit/kwebpluginfactory.cpp
+++ b/kdewebkit/kwebpluginfactory.cpp
@@ -142,4 +142,3 @@ QList<KWebPluginFactory::Plugin> KWebPluginFactory::plugins() \
const  return plugins;
 }
 
-#include "kwebpluginfactory.moc"
diff --git a/kdewebkit/kwebview.cpp b/kdewebkit/kwebview.cpp
index a06aac0..f2051bb 100644
--- a/kdewebkit/kwebview.cpp
+++ b/kdewebkit/kwebview.cpp
@@ -80,4 +80,3 @@ void KWebView::mouseReleaseEvent(QMouseEvent *event)
     QWebView::mouseReleaseEvent(event);
 }
 
-#include "kwebview.moc"
diff --git a/kdewebkit/kwebwallet.cpp b/kdewebkit/kwebwallet.cpp
index 51d0686..8d9396e 100644
--- a/kdewebkit/kwebwallet.cpp
+++ b/kdewebkit/kwebwallet.cpp
@@ -582,4 +582,4 @@ void KWebWallet::removeFormDataFromCache(const WebFormList \
&forms)  d->openWallet();
 }
 
-#include "kwebwallet.moc"
+#include "moc_kwebwallet.cpp"
diff --git a/kfile/kdiroperator.cpp b/kfile/kdiroperator.cpp
index 4def102..da65bd5 100644
--- a/kfile/kdiroperator.cpp
+++ b/kfile/kdiroperator.cpp
@@ -2659,4 +2659,4 @@ void KDirOperator::Private::_k_slotDirectoryCreated(const KUrl& \
url)  parent->setUrl(url, true);
 }
 
-#include "kdiroperator.moc"
+#include "moc_kdiroperator.cpp"
diff --git a/kfile/kdirselectdialog.cpp b/kfile/kdirselectdialog.cpp
index 4bc3f6f..6d7d790 100644
--- a/kfile/kdirselectdialog.cpp
+++ b/kfile/kdirselectdialog.cpp
@@ -500,4 +500,4 @@ KUrl KDirSelectDialog::selectDirectory( const KUrl& startDir,
         return KUrl();
 }
 
-#include "kdirselectdialog.moc"
+#include "moc_kdirselectdialog.cpp"
diff --git a/kfile/kdirsortfilterproxymodel.cpp b/kfile/kdirsortfilterproxymodel.cpp
index 34ddcd2..820d9e3 100644
--- a/kfile/kdirsortfilterproxymodel.cpp
+++ b/kfile/kdirsortfilterproxymodel.cpp
@@ -285,4 +285,4 @@ bool KDirSortFilterProxyModel::subSortLessThan(const QModelIndex& \
                left,
     return KCategorizedSortFilterProxyModel::subSortLessThan(left, right);
 }
 
-#include "kdirsortfilterproxymodel.moc"
+#include "moc_kdirsortfilterproxymodel.cpp"
diff --git a/kfile/kfilebookmarkhandler.cpp b/kfile/kfilebookmarkhandler.cpp
index b70bd6a..14a4254 100644
--- a/kfile/kfilebookmarkhandler.cpp
+++ b/kfile/kfilebookmarkhandler.cpp
@@ -68,4 +68,4 @@ QString KFileBookmarkHandler::currentTitle() const
     return m_widget->baseUrl().prettyUrl();
 }
 
-#include "kfilebookmarkhandler_p.moc"
+#include "moc_kfilebookmarkhandler_p.cpp"
diff --git a/kfile/kfilefiltercombo.cpp b/kfile/kfilefiltercombo.cpp
index deb57c8..f8e0459 100644
--- a/kfile/kfilefiltercombo.cpp
+++ b/kfile/kfilefiltercombo.cpp
@@ -229,4 +229,4 @@ bool KFileFilterCombo::isMimeFilter() const
     return d->isMimeFilter;
 }
 
-#include "kfilefiltercombo.moc"
+#include "moc_kfilefiltercombo.cpp"
diff --git a/kfile/kfilemodule.cpp b/kfile/kfilemodule.cpp
index 5805756..acb6371 100644
--- a/kfile/kfilemodule.cpp
+++ b/kfile/kfilemodule.cpp
@@ -53,4 +53,3 @@ KUrl KFileModule::selectDirectory( const KUrl& startDir,
     return KDirSelectDialog::selectDirectory(startDir, localOnly, parent, caption);
 }
 
-#include "kfilemodule.moc"
diff --git a/kfile/kfileplaceeditdialog.cpp b/kfile/kfileplaceeditdialog.cpp
index 484bcbf..68b2fe2 100644
--- a/kfile/kfileplaceeditdialog.cpp
+++ b/kfile/kfileplaceeditdialog.cpp
@@ -211,4 +211,3 @@ bool KFilePlaceEditDialog::applicationLocal() const
 }
 
 
-#include "kfileplaceeditdialog.moc"
diff --git a/kfile/kfileplacesitem.cpp b/kfile/kfileplacesitem.cpp
index a06d340..c1b5773 100644
--- a/kfile/kfileplacesitem.cpp
+++ b/kfile/kfileplacesitem.cpp
@@ -316,4 +316,4 @@ void KFilePlacesItem::onListerCompleted()
     emit itemChanged(id());
 }
 
-#include "kfileplacesitem_p.moc"
+#include "moc_kfileplacesitem_p.cpp"
diff --git a/kfile/kfileplacesmodel.cpp b/kfile/kfileplacesmodel.cpp
index f0550f6..e9996ee 100644
--- a/kfile/kfileplacesmodel.cpp
+++ b/kfile/kfileplacesmodel.cpp
@@ -875,4 +875,4 @@ void \
KFilePlacesModel::Private::_k_storageTeardownDone(Solid::ErrorType error, Q  }
 }
 
-#include "kfileplacesmodel.moc"
+#include "moc_kfileplacesmodel.cpp"
diff --git a/kfile/kfileplacessharedbookmarks.cpp \
b/kfile/kfileplacessharedbookmarks.cpp index 9cbdcf4..82aa2e9 100644
--- a/kfile/kfileplacessharedbookmarks.cpp
+++ b/kfile/kfileplacessharedbookmarks.cpp
@@ -278,4 +278,4 @@ void KFilePlacesSharedBookmarks::slotBookmarksChanged()
     if (dirty) m_sharedBookmarkManager->emitChanged();
 }
 
-#include "kfileplacessharedbookmarks_p.moc"
+#include "moc_kfileplacessharedbookmarks_p.cpp"
diff --git a/kfile/kfileplacesview.cpp b/kfile/kfileplacesview.cpp
index 6a343b3..1e047ad 100644
--- a/kfile/kfileplacesview.cpp
+++ b/kfile/kfileplacesview.cpp
@@ -1190,5 +1190,5 @@ void KFilePlacesView::dataChanged(const QModelIndex &topLeft, \
const QModelIndex  d->adaptItemSize();
 }
 
-#include "kfileplacesview.moc"
-#include "kfileplacesview_p.moc"
+#include "moc_kfileplacesview.cpp"
+#include "moc_kfileplacesview_p.cpp"
diff --git a/kfile/kfilepreviewgenerator.cpp b/kfile/kfilepreviewgenerator.cpp
index 9c71ff8..4c71c50 100644
--- a/kfile/kfilepreviewgenerator.cpp
+++ b/kfile/kfilepreviewgenerator.cpp
@@ -1292,4 +1292,4 @@ QStringList KFilePreviewGenerator::enabledPlugins() const
     return d->m_enabledPlugins;
 }
 
-#include "kfilepreviewgenerator.moc"
+#include "moc_kfilepreviewgenerator.cpp"
diff --git a/kfile/kfiletreeview.cpp b/kfile/kfiletreeview.cpp
index d96263c..c1f2493 100644
--- a/kfile/kfiletreeview.cpp
+++ b/kfile/kfiletreeview.cpp
@@ -203,4 +203,4 @@ QSize KFileTreeView::sizeHint() const
     return QSize(680, 500);
 }
 
-#include "kfiletreeview.moc"
+#include "moc_kfiletreeview.cpp"
diff --git a/kfile/kfilewidget.cpp b/kfile/kfilewidget.cpp
index 7b8bdf2..2369340 100644
--- a/kfile/kfilewidget.cpp
+++ b/kfile/kfilewidget.cpp
@@ -2754,4 +2754,4 @@ void KFileWidgetPrivate::setInlinePreviewShown(bool show)
 }
 
 
-#include "kfilewidget.moc"
+#include "moc_kfilewidget.cpp"
diff --git a/kfile/knameandurlinputdialog.cpp b/kfile/knameandurlinputdialog.cpp
index 5fab72b..24c1087 100644
--- a/kfile/knameandurlinputdialog.cpp
+++ b/kfile/knameandurlinputdialog.cpp
@@ -138,4 +138,4 @@ void KNameAndUrlInputDialog::setSuggestedUrl(const KUrl& url)
     d->m_urlRequester->setUrl(url);
 }
 
-#include "knameandurlinputdialog.moc"
+#include "moc_knameandurlinputdialog.cpp"
diff --git a/kfile/knewfilemenu.cpp b/kfile/knewfilemenu.cpp
index 8c0f9f7..31486b4 100644
--- a/kfile/knewfilemenu.cpp
+++ b/kfile/knewfilemenu.cpp
@@ -1143,5 +1143,5 @@ QStringList KNewFileMenu::supportedMimeTypes() const
 }
 
 
-#include "knewfilemenu.moc"
+#include "moc_knewfilemenu.cpp"
 
diff --git a/kfile/kurlnavigator.cpp b/kfile/kurlnavigator.cpp
index 55ce91f..76a6b56 100644
--- a/kfile/kurlnavigator.cpp
+++ b/kfile/kurlnavigator.cpp
@@ -1254,4 +1254,4 @@ void KUrlNavigator::setHomeUrl(const QString& homeUrl)
 }
 #endif
 
-#include "kurlnavigator.moc"
+#include "moc_kurlnavigator.cpp"
diff --git a/kfile/kurlnavigatorbutton.cpp b/kfile/kurlnavigatorbutton.cpp
index 536e976..23d79ae 100644
--- a/kfile/kurlnavigatorbutton.cpp
+++ b/kfile/kurlnavigatorbutton.cpp
@@ -680,4 +680,4 @@ void KUrlNavigatorButton::initMenu(KUrlNavigatorMenu* menu, int \
startIndex)  
 } // namespace KDEPrivate
 
-#include "kurlnavigatorbutton_p.moc"
+#include "moc_kurlnavigatorbutton_p.cpp"
diff --git a/kfile/kurlnavigatorbuttonbase.cpp b/kfile/kurlnavigatorbuttonbase.cpp
index 938ef6b..96d4028 100644
--- a/kfile/kurlnavigatorbuttonbase.cpp
+++ b/kfile/kurlnavigatorbuttonbase.cpp
@@ -151,4 +151,4 @@ void KUrlNavigatorButtonBase::activate()
 
 } // namespace KDEPrivate
 
-#include "kurlnavigatorbuttonbase_p.moc"
+#include "moc_kurlnavigatorbuttonbase_p.cpp"
diff --git a/kfile/kurlnavigatordropdownbutton.cpp \
b/kfile/kurlnavigatordropdownbutton.cpp index b296c1b..e8432d6 100644
--- a/kfile/kurlnavigatordropdownbutton.cpp
+++ b/kfile/kurlnavigatordropdownbutton.cpp
@@ -84,4 +84,4 @@ void KUrlNavigatorDropDownButton::keyPressEvent(QKeyEvent* event)
 
 } // namespace KDEPrivate
 
-#include "kurlnavigatordropdownbutton_p.moc"
+#include "moc_kurlnavigatordropdownbutton_p.cpp"
diff --git a/kfile/kurlnavigatormenu.cpp b/kfile/kurlnavigatormenu.cpp
index c9b6c77..7b4d2fe 100644
--- a/kfile/kurlnavigatormenu.cpp
+++ b/kfile/kurlnavigatormenu.cpp
@@ -71,4 +71,4 @@ void KUrlNavigatorMenu::mouseReleaseEvent(QMouseEvent* event)
 
 } // namespace KDEPrivate
 
-#include "kurlnavigatormenu_p.moc"
+#include "moc_kurlnavigatormenu_p.cpp"
diff --git a/kfile/kurlnavigatorplacesselector.cpp \
b/kfile/kurlnavigatorplacesselector.cpp index 28ee9c3..16abc13 100644
--- a/kfile/kurlnavigatorplacesselector.cpp
+++ b/kfile/kurlnavigatorplacesselector.cpp
@@ -238,5 +238,5 @@ void KUrlNavigatorPlacesSelector::onStorageSetupDone(const \
QModelIndex &index, b  
 } // namespace KDEPrivate
 
-#include "kurlnavigatorplacesselector_p.moc"
+#include "moc_kurlnavigatorplacesselector_p.cpp"
 
diff --git a/kfile/kurlnavigatorprotocolcombo.cpp \
b/kfile/kurlnavigatorprotocolcombo.cpp index 1a8b790..7bba603 100644
--- a/kfile/kurlnavigatorprotocolcombo.cpp
+++ b/kfile/kurlnavigatorprotocolcombo.cpp
@@ -230,4 +230,4 @@ void KUrlNavigatorProtocolCombo::initializeCategories()
 
 } // namespace KDEPrivate
 
-#include "kurlnavigatorprotocolcombo_p.moc"
+#include "moc_kurlnavigatorprotocolcombo_p.cpp"
diff --git a/kfile/kurlnavigatortogglebutton.cpp \
b/kfile/kurlnavigatortogglebutton.cpp index 15f95a9..a624110 100644
--- a/kfile/kurlnavigatortogglebutton.cpp
+++ b/kfile/kurlnavigatortogglebutton.cpp
@@ -106,4 +106,4 @@ void KUrlNavigatorToggleButton::updateCursor()
 
 } // namespace KDEPrivate
 
-#include "kurlnavigatortogglebutton_p.moc"
+#include "moc_kurlnavigatortogglebutton_p.cpp"
diff --git a/kfile/tests/kfiletreeviewtest.cpp b/kfile/tests/kfiletreeviewtest.cpp
index ece93bb..81959d5 100644
--- a/kfile/tests/kfiletreeviewtest.cpp
+++ b/kfile/tests/kfiletreeviewtest.cpp
@@ -82,4 +82,3 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "kfiletreeviewtest.moc"
diff --git a/kfile/tests/kurlnavigatortest.cpp b/kfile/tests/kurlnavigatortest.cpp
index 5233b07..57115aa 100644
--- a/kfile/tests/kurlnavigatortest.cpp
+++ b/kfile/tests/kurlnavigatortest.cpp
@@ -189,4 +189,3 @@ void KUrlNavigatorTest::bug251553_goUpFromArchive()
     QCOMPARE(m_navigator->locationUrl().protocol(), QLatin1String("file"));
 }
 
-#include "kurlnavigatortest.moc"
diff --git a/khtml/ecma/debugger/breakpointsdock.cpp \
b/khtml/ecma/debugger/breakpointsdock.cpp index a247186..f12e5ad 100644
--- a/khtml/ecma/debugger/breakpointsdock.cpp
+++ b/khtml/ecma/debugger/breakpointsdock.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "breakpointsdock.h"
-#include "breakpointsdock.moc"
 
 #include <QVBoxLayout>
 #include <QListWidget>
diff --git a/khtml/ecma/debugger/callstackdock.cpp \
b/khtml/ecma/debugger/callstackdock.cpp index fdd9af4..e30dc68 100644
--- a/khtml/ecma/debugger/callstackdock.cpp
+++ b/khtml/ecma/debugger/callstackdock.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "callstackdock.h"
-#include "callstackdock.moc"
 
 #include <QVBoxLayout>
 #include <QTableWidget>
diff --git a/khtml/ecma/debugger/consoledock.cpp \
b/khtml/ecma/debugger/consoledock.cpp index 80a1425..ffb2abf 100644
--- a/khtml/ecma/debugger/consoledock.cpp
+++ b/khtml/ecma/debugger/consoledock.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "consoledock.h"
-#include "consoledock.moc"
 
 #include <QVBoxLayout>
 #include <QPushButton>
diff --git a/khtml/ecma/debugger/debugwindow.cpp \
b/khtml/ecma/debugger/debugwindow.cpp index 4438a1a..975700b 100644
--- a/khtml/ecma/debugger/debugwindow.cpp
+++ b/khtml/ecma/debugger/debugwindow.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "debugwindow.h"
-#include "debugwindow.moc"
 
 #include <QSharedData>
 #include <QDebug>
diff --git a/khtml/ecma/debugger/localvariabledock.cpp \
b/khtml/ecma/debugger/localvariabledock.cpp index 289c910..1d6d2fc8 100644
--- a/khtml/ecma/debugger/localvariabledock.cpp
+++ b/khtml/ecma/debugger/localvariabledock.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "localvariabledock.h"
-#include "localvariabledock.moc"
 
 #include <QVBoxLayout>
 #include <QTreeWidget>
diff --git a/khtml/ecma/debugger/scriptsdock.cpp \
b/khtml/ecma/debugger/scriptsdock.cpp index be50629..bc88d99 100644
--- a/khtml/ecma/debugger/scriptsdock.cpp
+++ b/khtml/ecma/debugger/scriptsdock.cpp
@@ -19,7 +19,6 @@
  */
 
 #include "scriptsdock.h"
-#include "scriptsdock.moc"
 
 #include <QVBoxLayout>
 #include <QTreeWidget>
diff --git a/khtml/ecma/debugger/watchesdock.cpp \
b/khtml/ecma/debugger/watchesdock.cpp index a99d309..4cc6157 100644
--- a/khtml/ecma/debugger/watchesdock.cpp
+++ b/khtml/ecma/debugger/watchesdock.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "watchesdock.h"
-#include "watchesdock.moc"
 
 #include <QVBoxLayout>
 #include <QListWidget>
diff --git a/khtml/ecma/kjs_audio.cpp b/khtml/ecma/kjs_audio.cpp
index f67cdc9..5ff1803 100644
--- a/khtml/ecma/kjs_audio.cpp
+++ b/khtml/ecma/kjs_audio.cpp
@@ -323,4 +323,3 @@ void AudioQObject::loop(int n)
 
 } // namespace KJS
 
-#include "kjs_audio.moc"
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 92f3fcd..b1efada 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -2998,5 +2998,4 @@ JSValue *HistoryFunc::callAsFunction(ExecState *exec, JSObject \
*thisObj, const L  } // namespace KJS
 
 
-#include "kjs_window.moc"
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
index d441e8d..7ac8092 100644
--- a/khtml/ecma/xmlhttprequest.cpp
+++ b/khtml/ecma/xmlhttprequest.cpp
@@ -988,5 +988,4 @@ JSValue *XMLHttpRequestProtoFunc::callAsFunction(ExecState *exec, \
JSObject *this  
 } // end namespace
 
-#include "xmlhttprequest.moc"
 // kate: indent-width 2; replace-tabs on; tab-width 4; space-indent on;
diff --git a/khtml/editing/editor.cpp b/khtml/editing/editor.cpp
index 69f0b04..9cadcc2 100644
--- a/khtml/editing/editor.cpp
+++ b/khtml/editing/editor.cpp
@@ -592,5 +592,4 @@ bool Editor::handleKeyEvent(QKeyEvent *_ke)
 }
 
 
-#include "editor.moc"
 
diff --git a/khtml/html/html_documentimpl.cpp b/khtml/html/html_documentimpl.cpp
index 5d60a21..7446e4c 100644
--- a/khtml/html/html_documentimpl.cpp
+++ b/khtml/html/html_documentimpl.cpp
@@ -386,4 +386,3 @@ khtml::Tokenizer* HTMLTextDocumentImpl::createTokenizer()
     return new HTMLTextTokenizer(this);
 }
 
-#include "html_documentimpl.moc"
diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp
index 1ee642e..fc22418 100644
--- a/khtml/html/html_objectimpl.cpp
+++ b/khtml/html/html_objectimpl.cpp
@@ -856,5 +856,4 @@ void HTMLParamElementImpl::parseAttribute(AttributeImpl *attr)
     }
 }
 
-#include "html_objectimpl.moc"
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/khtml/imload/animtimer.cpp b/khtml/imload/animtimer.cpp
index 45c3145..11d3420 100644
--- a/khtml/imload/animtimer.cpp
+++ b/khtml/imload/animtimer.cpp
@@ -87,5 +87,4 @@ void AnimTimer::destroyed(AnimProvider* provider)
 
 }
 
-#include "animtimer.moc"
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/khtml/imload/updater.cpp b/khtml/imload/updater.cpp
index c64b9e3..a61d87e 100644
--- a/khtml/imload/updater.cpp
+++ b/khtml/imload/updater.cpp
@@ -99,5 +99,4 @@ void Updater::pushUpdates()
 
 }
 
-#include "updater.moc"
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/khtml/java/kjavaapplet.cpp b/khtml/java/kjavaapplet.cpp
index 6a5498b..1dadd0e 100644
--- a/khtml/java/kjavaapplet.cpp
+++ b/khtml/java/kjavaapplet.cpp
@@ -284,4 +284,3 @@ bool KJavaApplet::failed() const {
     return d->failed;
 }
 
-#include "kjavaapplet.moc"
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 52e1790..eddeae6 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -843,4 +843,3 @@ void PermissionDialog::clicked()
     static_cast<const QWidget*>(sender())->parentWidget()->close();
 }
 
-#include "kjavaappletserver.moc"
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index 92c33e3..323c166 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -659,4 +659,3 @@ int KJavaAppletViewerLiveConnectExtension::m_jssessions = 0;
 
 //-----------------------------------------------------------------------------
 
-#include "kjavaappletviewer.moc"
diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp
index 7d433d4..fcd4412 100644
--- a/khtml/java/kjavaappletwidget.cpp
+++ b/khtml/java/kjavaappletwidget.cpp
@@ -145,4 +145,3 @@ void KJavaAppletWidget::showEvent (QShowEvent * e) {
     }
 }
 
-#include "kjavaappletwidget.moc"
diff --git a/khtml/java/kjavadownloader.cpp b/khtml/java/kjavadownloader.cpp
index eb5260e..5cbbb5b 100644
--- a/khtml/java/kjavadownloader.cpp
+++ b/khtml/java/kjavadownloader.cpp
@@ -295,4 +295,3 @@ void KJavaUploader::jobCommand( int cmd )
     }
 }
 
-#include "kjavadownloader.moc"
diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp
index ae06579..9fb25b7 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/khtml/java/kjavaprocess.cpp
@@ -290,4 +290,3 @@ void KJavaProcess::slotExited()
     emit exited(status);
 }
 
-#include "kjavaprocess.moc"
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 66a2748..956abc9 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -1211,4 +1211,3 @@ KHTMLPart* KHTMLHtmlExtension::part() const
     return static_cast<KHTMLPart*>(parent());
 }
 
-#include "khtml_ext.moc"
diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp
index d5a909d..1fc5091 100644
--- a/khtml/khtml_factory.cpp
+++ b/khtml/khtml_factory.cpp
@@ -53,4 +53,3 @@ QObject * KHTMLFactory::create( const char *iface,
 
 K_EXPORT_PLUGIN( KHTMLFactory )
 
-#include "khtml_factory.moc"
diff --git a/khtml/khtml_pagecache.cpp b/khtml/khtml_pagecache.cpp
index f3b37e0..d7f4f78 100644
--- a/khtml/khtml_pagecache.cpp
+++ b/khtml/khtml_pagecache.cpp
@@ -292,4 +292,3 @@ KHTMLPageCacheDelivery::~KHTMLPageCacheDelivery()
   delete file;
 }
 
-#include "khtml_pagecache.moc"
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index 35a5785..46bf386 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -7437,7 +7437,6 @@ bool KHTMLPart::inProgress() const
 }
 
 using namespace KParts;
-#include "khtml_part.moc"
 #include "khtmlpart_p.moc"
 #ifndef KHTML_NO_WALLET
 #include "khtml_wallet_p.moc"
diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp
index 37cdb38..5e6c724 100644
--- a/khtml/khtml_printsettings.cpp
+++ b/khtml/khtml_printsettings.cpp
@@ -107,4 +107,3 @@ bool KHTMLPrintSettings::printHeader()
 }
 
 
-#include "khtml_printsettings.moc"
diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp
index fc99dc1..71eec98 100644
--- a/khtml/khtml_run.cpp
+++ b/khtml/khtml_run.cpp
@@ -104,4 +104,3 @@ void KHTMLRun::save( const KUrl & url, const QString & \
                suggestedFilename )
     KHTMLPopupGUIClient::saveURL( part()->widget(), i18n( "Save As" ), url, \
arguments().metaData(), QString(), 0, suggestedFilename );  }
 
-#include "khtml_run.moc"
diff --git a/khtml/khtmladaptorpart.cpp b/khtml/khtmladaptorpart.cpp
index bffb908..47a2c46 100644
--- a/khtml/khtmladaptorpart.cpp
+++ b/khtml/khtmladaptorpart.cpp
@@ -68,4 +68,3 @@ QObject* KHTMLAdaptorPartFactory::create(const char* /*iface*/,
     return new AdaptorView(wparent, parent, QStringList());
 }
 
-#include "moc_khtmladaptorpart.cpp"
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 5738d85..94cbe61 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -343,4 +343,3 @@ void KHTMLImage::slotPopupMenu( const QPoint &global, const KUrl \
                &url, mode_t mo
     m_ext->popupMenu(global, url, mode, args, browserArgs, flags, actionGroups);
 }
 
-#include "khtmlimage.moc"
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index c15578d..8912acd 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -28,7 +28,6 @@
 
 #include "khtmlview.h"
 
-#include "khtmlview.moc"
 
 #include "khtml_part.h"
 #include "khtml_events.h"
diff --git a/khtml/kjserrordlg.cpp b/khtml/kjserrordlg.cpp
index e59b382..0cda37f 100644
--- a/khtml/kjserrordlg.cpp
+++ b/khtml/kjserrordlg.cpp
@@ -1,5 +1,4 @@
 #include "kjserrordlg.h"
-#include "kjserrordlg.moc"
 
 KJSErrorDlg::KJSErrorDlg( QWidget *parent )
   : QDialog( parent )
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index a943806..86c760e 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -615,4 +615,3 @@ void KMultiPartBrowserExtension::reparseConfiguration()
 }
 #endif
 
-#include "kmultipart.moc"
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index b862abe..3fb04e0 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -1709,4 +1709,3 @@ void CachedObjectClient::error(int /*err*/, const QString \
&/*text*/) {}  
 #undef CDEBUG
 
-#include "loader.moc"
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index aa59d3d..3375476 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -2404,5 +2404,4 @@ void RenderTextArea::setSelectionRange(long start, long end) {
 }
 // ---------------------------------------------------------------------------
 
-#include "render_form.moc"
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp
index c4046f3..fd00302 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/khtml/rendering/render_frames.cpp
@@ -772,4 +772,3 @@ void RenderPartObject::slotViewCleared()
   }
 }
 
-#include "render_frames.moc"
diff --git a/khtml/rendering/render_layer.cpp b/khtml/rendering/render_layer.cpp
index ac1f4dc..ffb2c6e 100644
--- a/khtml/rendering/render_layer.cpp
+++ b/khtml/rendering/render_layer.cpp
@@ -2036,5 +2036,4 @@ void Marquee::timerEvent(QTimerEvent* /*evt*/)
     }
 }
 
-#include "render_layer.moc"
 // kate: indent-width 4; replace-tabs on; tab-width 8; space-indent on;
diff --git a/khtml/rendering/render_replaced.cpp \
b/khtml/rendering/render_replaced.cpp index 9831cdb..de2059c 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -1279,5 +1279,4 @@ KHTMLWidget::KHTMLWidget()
 KHTMLWidget::~KHTMLWidget() 
     { delete m_kwp; }
 
-#include "render_replaced.moc"
 
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index d4d43da..360d302 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -1883,4 +1883,3 @@ void RegressionTest::resizeTopLevelWidget( int w, int h )
     QApplication::sendPostedEvents( 0, QEvent::Resize );
 }
 
-#include "test_regression.moc"
diff --git a/khtml/test_regression_gui_window.cpp \
b/khtml/test_regression_gui_window.cpp index 4a6022c..b3c00e4 100644
--- a/khtml/test_regression_gui_window.cpp
+++ b/khtml/test_regression_gui_window.cpp
@@ -35,7 +35,6 @@
 #include <kconfig.h>
 #include <kfiledialog.h>
 
-#include "test_regression_gui_window.moc"
 
 // Taken from QUrl
 #define Q_HAS_FLAG(a, b)	( ((a) & (b)) == (b) )
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index 6be32c8..7688b0b 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -1,7 +1,6 @@
 // program to test the new khtml implementation
 
 #include "testkhtml.h"
-#include "testkhtml.moc"
 
 #include <stdlib.h>
 #include "kapplication.h"
diff --git a/khtml/tests/testkhtmlnew.cpp b/khtml/tests/testkhtmlnew.cpp
index 0ea8c71..b4cd08b 100644
--- a/khtml/tests/testkhtmlnew.cpp
+++ b/khtml/tests/testkhtmlnew.cpp
@@ -1,7 +1,6 @@
 // program to test the new khtml implementation
 
 #include "testkhtmlnew.h"
-#include "testkhtmlnew.moc"
 
 #include <QtGui/QCursor>
 #include <QtGui/QBoxLayout>
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index b1f940e..942fe8c 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -3250,6 +3250,5 @@ void XMLDocumentImpl::close()
     }
 }
 
-#include "dom_docimpl.moc"
 
 // kate: indent-width 4; replace-tabs on; tab-width 8; space-indent on;
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index 2dd2626..3a0c6bc 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -657,5 +657,4 @@ void XMLTokenizer::executeScript(NodeImpl* node)
     }
 }
 
-#include "xml_tokenizer.moc"
 
diff --git a/kinit/klauncher.cpp b/kinit/klauncher.cpp
index 6c9ba73..21f99f0 100644
--- a/kinit/klauncher.cpp
+++ b/kinit/klauncher.cpp
@@ -1346,4 +1346,3 @@ void KLauncher::terminate_kdeinit()
 #endif
 }
 
-#include "klauncher.moc"
diff --git a/kinit/klauncher_adaptor.cpp b/kinit/klauncher_adaptor.cpp
index 985612d..4a04e63 100644
--- a/kinit/klauncher_adaptor.cpp
+++ b/kinit/klauncher_adaptor.cpp
@@ -163,4 +163,3 @@ void KLauncherAdaptor::terminate_kdeinit()
     p->terminate_kdeinit();
 }
 
-#include "klauncher_adaptor.moc"
diff --git a/kio/kfile/kabstractfilemodule.cpp b/kio/kfile/kabstractfilemodule.cpp
index 82dacd6..3978118 100644
--- a/kio/kfile/kabstractfilemodule.cpp
+++ b/kio/kfile/kabstractfilemodule.cpp
@@ -25,4 +25,4 @@ KAbstractFileModule::KAbstractFileModule(QObject* parent)
 
 }
 
-#include "kabstractfilemodule.moc"
+#include "moc_kabstractfilemodule.cpp"
diff --git a/kio/kfile/kacleditwidget.cpp b/kio/kfile/kacleditwidget.cpp
index f42a36f..0a3f916 100644
--- a/kio/kfile/kacleditwidget.cpp
+++ b/kio/kfile/kacleditwidget.cpp
@@ -1118,7 +1118,7 @@ bool KACLListView::defaultMaskCanBeDeleted() const
     return !findDefaultItemByType( NamedUser ) && !findDefaultItemByType( NamedGroup \
);  }
 
-#include "kacleditwidget.moc"
-#include "kacleditwidget_p.moc"
+#include "moc_kacleditwidget.cpp"
+#include "moc_kacleditwidget_p.cpp"
 #endif
 // vim:set ts=8 sw=4:
diff --git a/kio/kfile/kcommentwidget.cpp b/kio/kfile/kcommentwidget.cpp
index a2ff7f8..bbb4cbe 100644
--- a/kio/kfile/kcommentwidget.cpp
+++ b/kio/kfile/kcommentwidget.cpp
@@ -147,4 +147,4 @@ void KCommentWidget::slotLinkActivated(const QString& link)
     }
 }
 
-#include "kcommentwidget_p.moc"
+#include "moc_kcommentwidget_p.cpp"
diff --git a/kio/kfile/kdevicelistmodel.cpp b/kio/kfile/kdevicelistmodel.cpp
index 1844bad..8b004b7 100644
--- a/kio/kfile/kdevicelistmodel.cpp
+++ b/kio/kfile/kdevicelistmodel.cpp
@@ -284,4 +284,4 @@ QModelIndex \
KDeviceListModel::Private::indexForItem(KDeviceListItem *item) const  }
 }
 
-#include "kdevicelistmodel.moc"
+#include "moc_kdevicelistmodel.cpp"
diff --git a/kio/kfile/kdiskfreespace.cpp b/kio/kfile/kdiskfreespace.cpp
index a90547b..5f9991a 100644
--- a/kio/kfile/kdiskfreespace.cpp
+++ b/kio/kfile/kdiskfreespace.cpp
@@ -84,5 +84,5 @@ KDiskFreeSpace * KDiskFreeSpace::findUsageInfo( const QString & \
path )  return job;
 }
 
-#include "kdiskfreespace.moc"
+#include "moc_kdiskfreespace.cpp"
 
diff --git a/kio/kfile/kencodingfiledialog.cpp b/kio/kfile/kencodingfiledialog.cpp
index b5be1a6..238aaa1 100644
--- a/kio/kfile/kencodingfiledialog.cpp
+++ b/kio/kfile/kencodingfiledialog.cpp
@@ -210,4 +210,4 @@ KEncodingFileDialog::Result  \
KEncodingFileDialog::getSaveUrlAndEncoding(const QS  return res;
 }
 
-#include "kencodingfiledialog.moc"
+#include "moc_kencodingfiledialog.cpp"
diff --git a/kio/kfile/kfile.cpp b/kio/kfile/kfile.cpp
index 1bdf0f0..623f59d 100644
--- a/kio/kfile/kfile.cpp
+++ b/kio/kfile/kfile.cpp
@@ -90,4 +90,4 @@ bool KFile::isDetailTreeView( const FileView& view )
     return (view & DetailTree) == DetailTree;
 }
 
-#include "kfile.moc"
+#include "moc_kfile.cpp"
diff --git a/kio/kfile/kfiledialog.cpp b/kio/kfile/kfiledialog.cpp
index 8a937ca..2dca65a 100644
--- a/kio/kfile/kfiledialog.cpp
+++ b/kio/kfile/kfiledialog.cpp
@@ -1267,4 +1267,4 @@ public:
 
 static KFileDialogQtOverride qtOverride;
 
-#include "kfiledialog.moc"
+#include "moc_kfiledialog.cpp"
diff --git a/kio/kfile/kfilemetadataconfigurationwidget.cpp \
b/kio/kfile/kfilemetadataconfigurationwidget.cpp index c7d0740..e4cd474 100644
--- a/kio/kfile/kfilemetadataconfigurationwidget.cpp
+++ b/kio/kfile/kfilemetadataconfigurationwidget.cpp
@@ -216,4 +216,4 @@ QSize KFileMetaDataConfigurationWidget::sizeHint() const
 }
 
 
-#include "kfilemetadataconfigurationwidget.moc"
+#include "moc_kfilemetadataconfigurationwidget.cpp"
diff --git a/kio/kfile/kfilemetadataprovider.cpp \
b/kio/kfile/kfilemetadataprovider.cpp index f88a411..f4e567a 100644
--- a/kio/kfile/kfilemetadataprovider.cpp
+++ b/kio/kfile/kfilemetadataprovider.cpp
@@ -555,4 +555,4 @@ int KFileMetaDataProvider::Private::subDirectoriesCount(const \
QString& path)  #endif
 }
 
-#include "kfilemetadataprovider_p.moc"
+#include "moc_kfilemetadataprovider_p.cpp"
diff --git a/kio/kfile/kfilemetadatareader.cpp b/kio/kfile/kfilemetadatareader.cpp
index f5631d5..c495888 100644
--- a/kio/kfile/kfilemetadatareader.cpp
+++ b/kio/kfile/kfilemetadatareader.cpp
@@ -145,4 +145,4 @@ QHash<KUrl, Nepomuk::Variant> KFileMetaDataReader::metaData() \
const  return d->m_metaData;
 }
 
-#include "kfilemetadatareader_p.moc"
+#include "moc_kfilemetadatareader_p.cpp"
diff --git a/kio/kfile/kfilemetadatawidget.cpp b/kio/kfile/kfilemetadatawidget.cpp
index 241e3f3..f0f0d5e 100644
--- a/kio/kfile/kfilemetadatawidget.cpp
+++ b/kio/kfile/kfilemetadatawidget.cpp
@@ -418,4 +418,4 @@ bool KFileMetaDataWidget::event(QEvent* event)
     return QWidget::event(event);
 }
 
-#include "kfilemetadatawidget.moc"
+#include "moc_kfilemetadatawidget.cpp"
diff --git a/kio/kfile/kfilemetainfowidget.cpp b/kio/kfile/kfilemetainfowidget.cpp
index ce01dda..f3db006 100644
--- a/kio/kfile/kfilemetainfowidget.cpp
+++ b/kio/kfile/kfilemetainfowidget.cpp
@@ -433,4 +433,4 @@ void KFileMetaInfoWidget::slotDateTimeChanged(const QDateTime& \
value)  d->m_dirty = true;
 }
 
-#include "kfilemetainfowidget.moc"
+#include "moc_kfilemetainfowidget.cpp"
diff --git a/kio/kfile/kfilemetapreview.cpp b/kio/kfile/kfilemetapreview.cpp
index b5791df..817eccc 100644
--- a/kio/kfile/kfilemetapreview.cpp
+++ b/kio/kfile/kfilemetapreview.cpp
@@ -197,4 +197,4 @@ KPreviewWidgetBase * KFileMetaPreview::createAudioPreview( \
QWidget *parent )  return w;
 }
 
-#include "kfilemetapreview.moc"
+#include "moc_kfilemetapreview.cpp"
diff --git a/kio/kfile/kfilesharedialog.cpp b/kio/kfile/kfilesharedialog.cpp
index eaba910..b5378ce 100644
--- a/kio/kfile/kfilesharedialog.cpp
+++ b/kio/kfile/kfilesharedialog.cpp
@@ -278,7 +278,7 @@ QWidget* KFileSharePropsPlugin::page() const
     return d->m_vBox;
 }
 
-#include "kfilesharedialog.moc"
+#include "moc_kfilesharedialog.cpp"
 
 //TODO: do we need to monitor /etc/security/fileshare.conf ?
 // if the user is added to the 'fileshare' group, we wouldn't be notified
diff --git a/kio/kfile/kfsprocess.cpp b/kio/kfile/kfsprocess.cpp
index aba59a5..914afe3 100644
--- a/kio/kfile/kfsprocess.cpp
+++ b/kio/kfile/kfsprocess.cpp
@@ -346,4 +346,4 @@ void KfsProcess::processHasExited()
     emit processExited();
 }
 
-#include "kfsprocess.moc"
+#include "moc_kfsprocess.cpp"
diff --git a/kio/kfile/kimagefilepreview.cpp b/kio/kfile/kimagefilepreview.cpp
index 8cee866..27736f5 100644
--- a/kio/kfile/kimagefilepreview.cpp
+++ b/kio/kfile/kimagefilepreview.cpp
@@ -283,4 +283,4 @@ void KImageFilePreview::clearPreview()
     }
 }
 
-#include "kimagefilepreview.moc"
+#include "moc_kimagefilepreview.cpp"
diff --git a/kio/kfile/kmetaprops.cpp b/kio/kfile/kmetaprops.cpp
index 65c8dee..29e8770 100644
--- a/kio/kfile/kmetaprops.cpp
+++ b/kio/kfile/kmetaprops.cpp
@@ -145,4 +145,4 @@ void KFileMetaPropsPlugin::applyChanges()
 {
 }
 
-#include "kmetaprops.moc"
+#include "moc_kmetaprops.cpp"
diff --git a/kio/kfile/kopenwithdialog.cpp b/kio/kfile/kopenwithdialog.cpp
index e6bda88..1b7b7b8 100644
--- a/kio/kfile/kopenwithdialog.cpp
+++ b/kio/kfile/kopenwithdialog.cpp
@@ -973,5 +973,5 @@ void KOpenWithDialogPrivate::saveComboboxHistory()
     }
 }
 
-#include "kopenwithdialog.moc"
-#include "kopenwithdialog_p.moc"
+#include "moc_kopenwithdialog.cpp"
+#include "moc_kopenwithdialog_p.cpp"
diff --git a/kio/kfile/kpreviewprops.cpp b/kio/kfile/kpreviewprops.cpp
index 2aacc9e..fa22b17 100644
--- a/kio/kfile/kpreviewprops.cpp
+++ b/kio/kfile/kpreviewprops.cpp
@@ -89,4 +89,4 @@ void KPreviewPropsPlugin::currentPageChanged( KPageWidgetItem \
*current, KPageWid  preview->showPreview(properties->item().url());
 }
 
-#include "kpreviewprops.moc"
+#include "moc_kpreviewprops.cpp"
diff --git a/kio/kfile/kpreviewwidgetbase.cpp b/kio/kfile/kpreviewwidgetbase.cpp
index 1a8234d..fa80c3c 100644
--- a/kio/kfile/kpreviewwidgetbase.cpp
+++ b/kio/kfile/kpreviewwidgetbase.cpp
@@ -34,4 +34,4 @@ QStringList KPreviewWidgetBase::supportedMimeTypes() const
     return d->supportedMimeTypes;
 }
 
-#include "kpreviewwidgetbase.moc"
+#include "moc_kpreviewwidgetbase.cpp"
diff --git a/kio/kfile/kpropertiesdialog.cpp b/kio/kfile/kpropertiesdialog.cpp
index 42e9fd1..9842790 100644
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
@@ -3424,6 +3424,6 @@ bool KDesktopPropsPlugin::supports( const KFileItemList& _items \
)  KAuthorized::authorize("shell_access");
 }
 
-#include "kpropertiesdialog.moc"
-#include "kpropertiesdialog_p.moc"
+#include "moc_kpropertiesdialog.cpp"
+#include "moc_kpropertiesdialog_p.cpp"
 
diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp
index 8d980fe..e899d60 100644
--- a/kio/kfile/kurlcombobox.cpp
+++ b/kio/kfile/kurlcombobox.cpp
@@ -444,4 +444,4 @@ void KUrlComboBox::KUrlComboBoxPrivate::updateItem( const \
KUrlComboBoxPrivate::K  }
 
 
-#include "kurlcombobox.moc"
+#include "moc_kurlcombobox.cpp"
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index 444ba7f..dc1aa6a 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -528,4 +528,4 @@ KUrlComboRequester::KUrlComboRequester( QWidget *parent)
 {
 }
 
-#include "kurlrequester.moc"
+#include "moc_kurlrequester.cpp"
diff --git a/kio/kfile/kurlrequesterdialog.cpp b/kio/kfile/kurlrequesterdialog.cpp
index 8ee29e1..ee3048e 100644
--- a/kio/kfile/kurlrequesterdialog.cpp
+++ b/kio/kfile/kurlrequesterdialog.cpp
@@ -146,6 +146,6 @@ KUrlRequester * KUrlRequesterDialog::urlRequester()
     return d->urlRequester;
 }
 
-#include "kurlrequesterdialog.moc"
+#include "moc_kurlrequesterdialog.cpp"
 
 // vim:ts=4:sw=4:tw=78
diff --git a/kio/kio/accessmanager.cpp b/kio/kio/accessmanager.cpp
index 62ae437..95fb6e4 100644
--- a/kio/kio/accessmanager.cpp
+++ b/kio/kio/accessmanager.cpp
@@ -543,5 +543,4 @@ void CookieJar::reparseConfiguration()
     d->isEnabled = cfg.readEntry("Cookies", true);
 }
 
-#include "accessmanager.moc"
 
diff --git a/kio/kio/accessmanagerreply_p.cpp b/kio/kio/accessmanagerreply_p.cpp
index 942f0e5..af107c1 100644
--- a/kio/kio/accessmanagerreply_p.cpp
+++ b/kio/kio/accessmanagerreply_p.cpp
@@ -434,4 +434,3 @@ void AccessManagerReply::slotPercent(KJob *job, unsigned long \
percent)  }
 }
 
-#include "accessmanagerreply_p.moc"
diff --git a/kio/kio/chmodjob.cpp b/kio/kio/chmodjob.cpp
index 939de2c..486b8f8 100644
--- a/kio/kio/chmodjob.cpp
+++ b/kio/kio/chmodjob.cpp
@@ -291,4 +291,4 @@ ChmodJob *KIO::chmod( const KFileItemList& lstItems, int \
permissions, int mask,  newGroupID, recursive, flags);
 }
 
-#include "chmodjob.moc"
+#include "moc_chmodjob.cpp"
diff --git a/kio/kio/connection.cpp b/kio/kio/connection.cpp
index 438368d..a5b02e6 100644
--- a/kio/kio/connection.cpp
+++ b/kio/kio/connection.cpp
@@ -616,5 +616,5 @@ void ConnectionServer::setNextPendingConnection(Connection *conn)
     conn->d->dequeue();
 }
 
-#include "connection_p.moc"
-#include "connection.moc"
+#include "moc_connection_p.cpp"
+#include "moc_connection.cpp"
diff --git a/kio/kio/copyjob.cpp b/kio/kio/copyjob.cpp
index 2c13dd0..ccb2d84 100644
--- a/kio/kio/copyjob.cpp
+++ b/kio/kio/copyjob.cpp
@@ -2208,4 +2208,4 @@ CopyJob *KIO::trash(const KUrl::List& srcList, JobFlags flags)
     return CopyJobPrivate::newJob(srcList, KUrl( "trash:/" ), CopyJob::Move, false, \
flags);  }
 
-#include "copyjob.moc"
+#include "moc_copyjob.cpp"
diff --git a/kio/kio/dataslave.cpp b/kio/kio/dataslave.cpp
index a3709bd..16b1497 100644
--- a/kio/kio/dataslave.cpp
+++ b/kio/kio/dataslave.cpp
@@ -178,4 +178,3 @@ DISPATCH_IMPL1(data, const QByteArray &, ba)
 #undef DISPATCH_IMPL
 #undef DISPATCH_IMPL1
 
-#include "dataslave.moc"
diff --git a/kio/kio/davjob.cpp b/kio/kio/davjob.cpp
index 6dc486b..7a4dea6 100644
--- a/kio/kio/davjob.cpp
+++ b/kio/kio/davjob.cpp
@@ -174,4 +174,3 @@ DavJob* KIO::davReport( const KUrl& url, const QString& report, \
const QString &d  return job;
 }
 
-#include "davjob.moc"
diff --git a/kio/kio/delegateanimationhandler.cpp \
b/kio/kio/delegateanimationhandler.cpp index bf5ee2b..b244161 100644
--- a/kio/kio/delegateanimationhandler.cpp
+++ b/kio/kio/delegateanimationhandler.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <qabstractproxymodel.h>
 
-#include "delegateanimationhandler_p.moc"
+#include "moc_delegateanimationhandler_p.cpp"
 
 namespace KIO
 {
diff --git a/kio/kio/deletejob.cpp b/kio/kio/deletejob.cpp
index 6722b43..7b860e8 100644
--- a/kio/kio/deletejob.cpp
+++ b/kio/kio/deletejob.cpp
@@ -493,4 +493,4 @@ DeleteJob *KIO::del( const KUrl::List& src, JobFlags flags )
     return DeleteJobPrivate::newJob(src, flags);
 }
 
-#include "deletejob.moc"
+#include "moc_deletejob.cpp"
diff --git a/kio/kio/directorysizejob.cpp b/kio/kio/directorysizejob.cpp
index 3ca8599..f3b6a48 100644
--- a/kio/kio/directorysizejob.cpp
+++ b/kio/kio/directorysizejob.cpp
@@ -210,4 +210,4 @@ DirectorySizeJob * KIO::directorySize( const KFileItemList & \
lstItems )  return DirectorySizeJobPrivate::newJob(lstItems);
 }
 
-#include "directorysizejob.moc"
+#include "moc_directorysizejob.cpp"
diff --git a/kio/kio/filejob.cpp b/kio/kio/filejob.cpp
index 98a9d06..de537a5 100644
--- a/kio/kio/filejob.cpp
+++ b/kio/kio/filejob.cpp
@@ -215,5 +215,5 @@ FileJob *KIO::open(const KUrl &url, QIODevice::OpenMode mode)
     return FileJobPrivate::newJob(url, packedArgs);
 }
 
-#include "filejob.moc"
+#include "moc_filejob.cpp"
 
diff --git a/kio/kio/fileundomanager.cpp b/kio/kio/fileundomanager.cpp
index f580c29..86fde2f 100644
--- a/kio/kio/fileundomanager.cpp
+++ b/kio/kio/fileundomanager.cpp
@@ -810,5 +810,5 @@ void FileUndoManager::UiInterface::virtual_hook(int, void*)
 {
 }
 
-#include "fileundomanager_p.moc"
-#include "fileundomanager.moc"
+#include "moc_fileundomanager_p.cpp"
+#include "moc_fileundomanager.cpp"
diff --git a/kio/kio/forwardingslavebase.cpp b/kio/kio/forwardingslavebase.cpp
index 573fad2..b22b2cf 100644
--- a/kio/kio/forwardingslavebase.cpp
+++ b/kio/kio/forwardingslavebase.cpp
@@ -561,5 +561,5 @@ void ForwardingSlaveBasePrivate::_k_slotCanResume (KIO::Job* \
/*job*/, KIO::files  
 }
 
-#include "forwardingslavebase.moc"
+#include "moc_forwardingslavebase.cpp"
 
diff --git a/kio/kio/job.cpp b/kio/kio/job.cpp
index e8191c6..d9d383f 100644
--- a/kio/kio/job.cpp
+++ b/kio/kio/job.cpp
@@ -3154,4 +3154,4 @@ int CacheInfo::expireTimeout();
 #endif
 
 #include "jobclasses.moc"
-#include "job_p.moc"
+#include "moc_job_p.cpp"
diff --git a/kio/kio/jobuidelegate.cpp b/kio/kio/jobuidelegate.cpp
index 85679c2..acb3f39 100644
--- a/kio/kio/jobuidelegate.cpp
+++ b/kio/kio/jobuidelegate.cpp
@@ -191,4 +191,3 @@ bool KIO::JobUiDelegate::askDeleteConfirmation(const KUrl::List& \
urls,  return true;
 }
 
-#include "jobuidelegate.moc"
diff --git a/kio/kio/joburlcache.cpp b/kio/kio/joburlcache.cpp
index bdc8f04..02bccba 100644
--- a/kio/kio/joburlcache.cpp
+++ b/kio/kio/joburlcache.cpp
@@ -64,4 +64,4 @@ void JobUrlCache::requestJobUrlsChanged()
     emit jobUrlsChanged(m_destUrls);
 }
 
-#include "joburlcache_p.moc"
+#include "moc_joburlcache_p.cpp"
diff --git a/kio/kio/kabstractfileitemactionplugin.cpp \
b/kio/kio/kabstractfileitemactionplugin.cpp index 07f15f6..7d441cf 100644
--- a/kio/kio/kabstractfileitemactionplugin.cpp
+++ b/kio/kio/kabstractfileitemactionplugin.cpp
@@ -29,4 +29,3 @@ KAbstractFileItemActionPlugin::~KAbstractFileItemActionPlugin()
 {
 }
 
-#include "kabstractfileitemactionplugin.moc"
diff --git a/kio/kio/kautomount.cpp b/kio/kio/kautomount.cpp
index 80f860f..f2059ea 100644
--- a/kio/kio/kautomount.cpp
+++ b/kio/kio/kautomount.cpp
@@ -147,4 +147,4 @@ KAutoUnmount::~KAutoUnmount()
     delete d;
 }
 
-#include "kautomount.moc"
+#include "moc_kautomount.cpp"
diff --git a/kio/kio/kbuildsycocaprogressdialog.cpp \
b/kio/kio/kbuildsycocaprogressdialog.cpp index 14ab776..d37ad13 100644
--- a/kio/kio/kbuildsycocaprogressdialog.cpp
+++ b/kio/kio/kbuildsycocaprogressdialog.cpp
@@ -102,4 +102,4 @@ void KBuildSycocaProgressDialogPrivate::_k_slotFinished()
 }
 
 
-#include "kbuildsycocaprogressdialog.moc"
+#include "moc_kbuildsycocaprogressdialog.cpp"
diff --git a/kio/kio/kdatatool.cpp b/kio/kio/kdatatool.cpp
index ddd2698..bf71195 100644
--- a/kio/kio/kdatatool.cpp
+++ b/kio/kio/kdatatool.cpp
@@ -340,4 +340,3 @@ const KComponentData &KDataTool::componentData() const
    return d->componentData;
 }
 
-#include "kdatatool.moc"
diff --git a/kio/kio/kdirlister.cpp b/kio/kio/kdirlister.cpp
index ec3d622..c2e8dd7 100644
--- a/kio/kio/kdirlister.cpp
+++ b/kio/kio/kdirlister.cpp
@@ -2755,5 +2755,5 @@ KFileItem KDirLister::cachedItemForUrl(const KUrl& url)
     return kDirListerCache->itemForUrl(url);
 }
 
-#include "kdirlister.moc"
-#include "kdirlister_p.moc"
+#include "moc_kdirlister.cpp"
+#include "moc_kdirlister_p.cpp"
diff --git a/kio/kio/kdirmodel.cpp b/kio/kio/kdirmodel.cpp
index c8de5a3..ab3cc3a 100644
--- a/kio/kio/kdirmodel.cpp
+++ b/kio/kio/kdirmodel.cpp
@@ -1167,4 +1167,4 @@ bool KDirModel::removeColumns(int, int, const QModelIndex&)
     return false;
 }
 
-#include "kdirmodel.moc"
+#include "moc_kdirmodel.cpp"
diff --git a/kio/kio/kdirnotify.cpp b/kio/kio/kdirnotify.cpp
index 748e698..5f06b38 100644
--- a/kio/kio/kdirnotify.cpp
+++ b/kio/kio/kdirnotify.cpp
@@ -67,4 +67,3 @@ void OrgKdeKDirNotifyInterface::emitLeftDirectory(const QString \
&url)  emitSignal(QLatin1String("leftDirectory"), QVariantList() << url);
 }
 
-#include "kdirnotify.moc"
diff --git a/kio/kio/kdynamicjobtracker.cpp b/kio/kio/kdynamicjobtracker.cpp
index 64844fa..aa7a0fe 100644
--- a/kio/kio/kdynamicjobtracker.cpp
+++ b/kio/kio/kdynamicjobtracker.cpp
@@ -108,4 +108,4 @@ void KDynamicJobTracker::unregisterJob(KJob *job)
         widgetTracker->unregisterJob(job);
 }
 
-#include "kdynamicjobtracker_p.moc"
+#include "moc_kdynamicjobtracker_p.cpp"
diff --git a/kio/kio/kfileitemactionplugin.cpp b/kio/kio/kfileitemactionplugin.cpp
index e9b074d..8011ce9 100644
--- a/kio/kio/kfileitemactionplugin.cpp
+++ b/kio/kio/kfileitemactionplugin.cpp
@@ -29,4 +29,3 @@ KFileItemActionPlugin::~KFileItemActionPlugin()
 {
 }
 
-#include "kfileitemactionplugin.moc"
diff --git a/kio/kio/kfileitemdelegate.cpp b/kio/kio/kfileitemdelegate.cpp
index 50cc3b6..7adcff3 100644
--- a/kio/kio/kfileitemdelegate.cpp
+++ b/kio/kio/kfileitemdelegate.cpp
@@ -1686,7 +1686,6 @@ bool KFileItemDelegate::eventFilter(QObject *object, QEvent \
*event)  
 
 
-#include "kfileitemdelegate.moc"
 
 
 // kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/kio/kio/kfileshare.cpp b/kio/kio/kfileshare.cpp
index 740c3ca..fb70c3d 100644
--- a/kio/kio/kfileshare.cpp
+++ b/kio/kio/kfileshare.cpp
@@ -287,6 +287,5 @@ bool KFileShare::setShared( const QString& path, bool shared )
     return ok;
 }
 
-//#include "kfileshare.moc"
-#include "kfileshare_p.moc"
+#include "moc_kfileshare_p.cpp"
 
diff --git a/kio/kio/kfilewriteplugin.cpp b/kio/kio/kfilewriteplugin.cpp
index e304050..64ea260 100644
--- a/kio/kio/kfilewriteplugin.cpp
+++ b/kio/kio/kfilewriteplugin.cpp
@@ -57,5 +57,4 @@ KFileWriterProvider::loadPlugin(const QString& key) {
     return offers.first()->createInstance<KFileWritePlugin>();
 }
 
-#include "kfilewriteplugin.moc"
 
diff --git a/kio/kio/kmimetypechooser.cpp b/kio/kio/kmimetypechooser.cpp
index 241fd51..2e97811 100644
--- a/kio/kio/kmimetypechooser.cpp
+++ b/kio/kio/kmimetypechooser.cpp
@@ -352,4 +352,4 @@ KMimeTypeChooserDialog::~KMimeTypeChooserDialog()
 //END KMimeTypeChooserDialog
 
 // kate: space-indent on; indent-width 2; replace-tabs on;
-#include "kmimetypechooser.moc"
+#include "moc_kmimetypechooser.cpp"
diff --git a/kio/kio/kmimetyperesolver.cpp b/kio/kio/kmimetyperesolver.cpp
index 2145b59..d6f7f09 100644
--- a/kio/kio/kmimetyperesolver.cpp
+++ b/kio/kio/kmimetyperesolver.cpp
@@ -192,4 +192,4 @@ void KMimeTypeResolverPrivate::_k_slotViewportAdjusted()
     m_timer.start(0);
 }
 
-#include "kmimetyperesolver.moc"
+#include "moc_kmimetyperesolver.cpp"
diff --git a/kio/kio/knfsshare.cpp b/kio/kio/knfsshare.cpp
index e5bc9ce..953399f 100644
--- a/kio/kio/knfsshare.cpp
+++ b/kio/kio/knfsshare.cpp
@@ -220,5 +220,5 @@ KNFSShare* KNFSShare::instance()
   return _instance;
 }
 
-#include "knfsshare.moc"
+#include "moc_knfsshare.cpp"
 
diff --git a/kio/kio/kpasswdserverloop.cpp b/kio/kio/kpasswdserverloop.cpp
index efbcbb7..b95ba37 100644
--- a/kio/kio/kpasswdserverloop.cpp
+++ b/kio/kio/kpasswdserverloop.cpp
@@ -74,4 +74,4 @@ void KPasswdServerLoop::kdedServiceUnregistered()
 
 }
 
-#include "kpasswdserverloop_p.moc"
+#include "moc_kpasswdserverloop_p.cpp"
diff --git a/kio/kio/krun.cpp b/kio/kio/krun.cpp
index 1ff6979..a1b42a5 100644
--- a/kio/kio/krun.cpp
+++ b/kio/kio/krun.cpp
@@ -1784,5 +1784,5 @@ KProcessRunner::slotProcessExited(int exitCode, \
QProcess::ExitStatus exitStatus)  deleteLater();
 }
 
-#include "krun.moc"
-#include "krun_p.moc"
+#include "moc_krun.cpp"
+#include "moc_krun_p.cpp"
diff --git a/kio/kio/kscan.cpp b/kio/kio/kscan.cpp
index 4f67540..6c2dae9 100644
--- a/kio/kio/kscan.cpp
+++ b/kio/kio/kscan.cpp
@@ -119,4 +119,3 @@ int KOCRDialog::nextId()
 
 
 
-#include "kscan.moc"
diff --git a/kio/kio/kshellcompletion.cpp b/kio/kio/kshellcompletion.cpp
index 8628eaa..cd69908 100644
--- a/kio/kio/kshellcompletion.cpp
+++ b/kio/kio/kshellcompletion.cpp
@@ -317,5 +317,4 @@ QString KShellCompletionPrivate::unquote(const QString &text) \
const  return result;
 }
 
-#include "kshellcompletion.moc"
 
diff --git a/kio/kio/kstatusbarofflineindicator.cpp \
b/kio/kio/kstatusbarofflineindicator.cpp index 5d3ed0d..240a751 100644
--- a/kio/kio/kstatusbarofflineindicator.cpp
+++ b/kio/kio/kstatusbarofflineindicator.cpp
@@ -75,4 +75,4 @@ void KStatusBarOfflineIndicatorPrivate::_k_networkStatusChanged( \
Solid::Networki  }
 }
 
-#include "kstatusbarofflineindicator.moc"
+#include "moc_kstatusbarofflineindicator.cpp"
diff --git a/kio/kio/kurifilter.cpp b/kio/kio/kurifilter.cpp
index 0144a2c..26c19b5 100644
--- a/kio/kio/kurifilter.cpp
+++ b/kio/kio/kurifilter.cpp
@@ -711,4 +711,3 @@ void KUriFilter::loadPlugins()
     }
 }
 
-#include "kurifilter.moc"
diff --git a/kio/kio/kurlcompletion.cpp b/kio/kio/kurlcompletion.cpp
index 8b8c8a7..a1e60b6 100644
--- a/kio/kio/kurlcompletion.cpp
+++ b/kio/kio/kurlcompletion.cpp
@@ -1497,4 +1497,4 @@ static QString unescape(const QString& text)
     return result;
 }
 
-#include "kurlcompletion.moc"
+#include "moc_kurlcompletion.cpp"
diff --git a/kio/kio/metainfojob.cpp b/kio/kio/metainfojob.cpp
index 6fc6712..4052c00 100644
--- a/kio/kio/metainfojob.cpp
+++ b/kio/kio/metainfojob.cpp
@@ -173,4 +173,3 @@ KIO_EXPORT MetaInfoJob *KIO::fileMetaInfo( const KUrl::List \
&items)  return job;
 }
 
-#include "metainfojob.moc"
diff --git a/kio/kio/netaccess.cpp b/kio/kio/netaccess.cpp
index 0e7c0b8..38e0768 100644
--- a/kio/kio/netaccess.cpp
+++ b/kio/kio/netaccess.cpp
@@ -543,4 +543,3 @@ void NetAccess::slotRedirection( KIO::Job*, const KUrl& url )
   d->m_url = url;
 }
 
-#include "netaccess.moc"
diff --git a/kio/kio/passworddialog.cpp b/kio/kio/passworddialog.cpp
index faf0c77..028819b 100644
--- a/kio/kio/passworddialog.cpp
+++ b/kio/kio/passworddialog.cpp
@@ -77,4 +77,3 @@ int PasswordDialog::getNameAndPassword( QString& user, QString& \
pass, bool* keep  }
 
 
-#include "passworddialog.moc"
diff --git a/kio/kio/pastedialog.cpp b/kio/kio/pastedialog.cpp
index 9bd773d..2a20f31 100644
--- a/kio/kio/pastedialog.cpp
+++ b/kio/kio/pastedialog.cpp
@@ -87,4 +87,3 @@ int KIO::PasteDialog::comboItem() const
     return m_comboBox->currentIndex();
 }
 
-#include "pastedialog.moc"
diff --git a/kio/kio/previewjob.cpp b/kio/kio/previewjob.cpp
index 415373c..4966fda 100644
--- a/kio/kio/previewjob.cpp
+++ b/kio/kio/previewjob.cpp
@@ -792,4 +792,4 @@ KIO::filesize_t PreviewJob::maximumFileSize()
 }
 #endif
 
-#include "previewjob.moc"
+#include "moc_previewjob.cpp"
diff --git a/kio/kio/renamedialog.cpp b/kio/kio/renamedialog.cpp
index aa60a94..ca7d050 100644
--- a/kio/kio/renamedialog.cpp
+++ b/kio/kio/renamedialog.cpp
@@ -680,4 +680,3 @@ KSqueezedTextLabel* RenameDialog::createSqueezedLabel(QWidget* \
parent, const QSt  return label;
 }
 
-#include "renamedialog.moc"
diff --git a/kio/kio/renamedialogplugin.cpp b/kio/kio/renamedialogplugin.cpp
index 09f470b..d722d5f 100644
--- a/kio/kio/renamedialogplugin.cpp
+++ b/kio/kio/renamedialogplugin.cpp
@@ -90,4 +90,3 @@ RenameDialogPlugin::RenameDialogPlugin( QDialog* dlg)
     : QWidget( dlg )
 {}
 
-#include "renamedialogplugin.moc"
diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
index 6b36d9d..d9f8863 100644
--- a/kio/kio/scheduler.cpp
+++ b/kio/kio/scheduler.cpp
@@ -1367,5 +1367,5 @@ void SchedulerPrivate::updateInternalMetaData(SimpleJob* job)
 }
 
 
-#include "scheduler.moc"
-#include "scheduler_p.moc"
+#include "moc_scheduler.cpp"
+#include "moc_scheduler_p.cpp"
diff --git a/kio/kio/sessiondata.cpp b/kio/kio/sessiondata.cpp
index 9097d6c..d19b637b 100644
--- a/kio/kio/sessiondata.cpp
+++ b/kio/kio/sessiondata.cpp
@@ -19,7 +19,6 @@
 */
 
 #include "sessiondata.h"
-#include "sessiondata.moc"
 
 #include <QtCore/QList>
 #include <QtCore/QTextCodec>
diff --git a/kio/kio/skipdialog.cpp b/kio/kio/skipdialog.cpp
index e65ea51..28b65d8 100644
--- a/kio/kio/skipdialog.cpp
+++ b/kio/kio/skipdialog.cpp
@@ -74,4 +74,3 @@ void SkipDialog::autoSkipPressed()
   done(S_AUTO_SKIP);
 }
 
-#include "skipdialog.moc"
diff --git a/kio/kio/slave.cpp b/kio/kio/slave.cpp
index f6b95d2..afe45f5 100644
--- a/kio/kio/slave.cpp
+++ b/kio/kio/slave.cpp
@@ -510,4 +510,3 @@ bool Slave::checkForHeldSlave(const KUrl &url)
     return KToolInvocation::klauncher()->checkForHeldSlave(url.url());
 }
 
-#include "slave.moc"
diff --git a/kio/kio/slaveconfig.cpp b/kio/kio/slaveconfig.cpp
index b92fbc7..0192b33 100644
--- a/kio/kio/slaveconfig.cpp
+++ b/kio/kio/slaveconfig.cpp
@@ -217,4 +217,3 @@ void SlaveConfig::reset()
 
 }
 
-#include "slaveconfig.moc"
diff --git a/kio/kio/slaveinterface.cpp b/kio/kio/slaveinterface.cpp
index d2f9f93..b416da3 100644
--- a/kio/kio/slaveinterface.cpp
+++ b/kio/kio/slaveinterface.cpp
@@ -506,4 +506,4 @@ void SlaveInterfacePrivate::slotHostInfo(const QHostInfo& info)
     connection->send(CMD_HOST_INFO, data);
 }
 
-#include "slaveinterface.moc"
+#include "moc_slaveinterface.cpp"
diff --git a/kio/kssl/kcm/cacertificatespage.cpp \
b/kio/kssl/kcm/cacertificatespage.cpp index ed20bf9..38ad1f1 100644
--- a/kio/kssl/kcm/cacertificatespage.cpp
+++ b/kio/kssl/kcm/cacertificatespage.cpp
@@ -377,4 +377,3 @@ bool CaCertificatesPage::addCertificateItem(const \
KSslCaCertificate &caCert)  return true;
 }
 
-#include "cacertificatespage.moc"
diff --git a/kio/kssl/kcm/kcmssl.cpp b/kio/kssl/kcm/kcmssl.cpp
index ad282a8..7b9f124 100644
--- a/kio/kssl/kcm/kcmssl.cpp
+++ b/kio/kssl/kcm/kcmssl.cpp
@@ -79,4 +79,3 @@ void KcmSsl::pageChanged(bool isChanged)
     emit changed(isChanged);
 }
 
-#include "kcmssl.moc"
diff --git a/kio/kssl/ksslcertdialog.cpp b/kio/kssl/ksslcertdialog.cpp
index 98e7a4c..63fde63 100644
--- a/kio/kssl/ksslcertdialog.cpp
+++ b/kio/kssl/ksslcertdialog.cpp
@@ -172,5 +172,4 @@ QDataStream& operator>>(QDataStream& s, KSSLCertDialogRet& r) {
 }
 
 
-#include "ksslcertdialog.moc"
 
diff --git a/kio/kssl/ksslcertificatebox.cpp b/kio/kssl/ksslcertificatebox.cpp
index 094787a..5f2670b 100644
--- a/kio/kssl/ksslcertificatebox.cpp
+++ b/kio/kssl/ksslcertificatebox.cpp
@@ -82,4 +82,3 @@ void KSslCertificateBox::clear()
 }
 
 
-#include "ksslcertificatebox.moc"
diff --git a/kio/kssl/ksslinfodialog.cpp b/kio/kssl/ksslinfodialog.cpp
index b6b1248..2309e06 100644
--- a/kio/kssl/ksslinfodialog.cpp
+++ b/kio/kssl/ksslinfodialog.cpp
@@ -248,4 +248,3 @@ QList<QList<KSslError::Error> > \
KSslInfoDialog::errorsFromString(const QString &  return ret;
 }
 
-#include "ksslinfodialog.moc"
diff --git a/kio/kssl/ksslkeygen.cpp b/kio/kssl/ksslkeygen.cpp
index 15aeb74..0faf114 100644
--- a/kio/kssl/ksslkeygen.cpp
+++ b/kio/kssl/ksslkeygen.cpp
@@ -270,6 +270,6 @@ void KSSLKeyGen::setKeySize(int idx)
      d->idx = idx;
 }
 
-#include "ksslkeygen.moc"
+#include "moc_ksslkeygen.cpp"
 
-#include "ksslkeygen_p.moc"
+#include "moc_ksslkeygen_p.cpp"
diff --git a/kio/misc/kpac/discovery.cpp b/kio/misc/kpac/discovery.cpp
index 9f8c37f..8d09fe5 100644
--- a/kio/misc/kpac/discovery.cpp
+++ b/kio/misc/kpac/discovery.cpp
@@ -52,7 +52,7 @@
 #include <kurl.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include "discovery.moc"
+#include "moc_discovery.cpp"
 
 namespace KPAC
 {
diff --git a/kio/misc/kpac/downloader.cpp b/kio/misc/kpac/downloader.cpp
index e311f10..3c5d0f4 100644
--- a/kio/misc/kpac/downloader.cpp
+++ b/kio/misc/kpac/downloader.cpp
@@ -93,5 +93,4 @@ namespace KPAC
 }
 
 // vim: ts=4 sw=4 et
-#include "downloader.moc"
 
diff --git a/kio/misc/kpac/proxyscout.cpp b/kio/misc/kpac/proxyscout.cpp
index 94be7aa..f879ee6 100644
--- a/kio/misc/kpac/proxyscout.cpp
+++ b/kio/misc/kpac/proxyscout.cpp
@@ -343,6 +343,5 @@ namespace KPAC
     }
 }
 
-#include "proxyscout.moc"
 
 // vim: ts=4 sw=4 et
diff --git a/kio/misc/ksendbugmail/main.cpp b/kio/misc/ksendbugmail/main.cpp
index ec522f5..525e5bf 100644
--- a/kio/misc/ksendbugmail/main.cpp
+++ b/kio/misc/ksendbugmail/main.cpp
@@ -155,4 +155,3 @@ int main(int argc, char **argv) {
     return r;
 }
 
-#include "main.moc"
diff --git a/kio/misc/ksendbugmail/smtp.cpp b/kio/misc/ksendbugmail/smtp.cpp
index 96e1397..be728c1 100644
--- a/kio/misc/ksendbugmail/smtp.cpp
+++ b/kio/misc/ksendbugmail/smtp.cpp
@@ -338,4 +338,3 @@ void SMTP::processLine(QString *line)
     }
 }
 
-#include "smtp.moc"
diff --git a/kio/tests/dummymeta.cpp b/kio/tests/dummymeta.cpp
index 55da9a6..c77828f 100644
--- a/kio/tests/dummymeta.cpp
+++ b/kio/tests/dummymeta.cpp
@@ -17,4 +17,3 @@ bool DummyMeta::readInfo( KFileMetaInfo::Internal & info )
    return 0L;
 }
 
-#include "dummymeta.moc"
diff --git a/kio/tests/fileundomanagertest.cpp b/kio/tests/fileundomanagertest.cpp
index 08db2a1..8533cbe 100644
--- a/kio/tests/fileundomanagertest.cpp
+++ b/kio/tests/fileundomanagertest.cpp
@@ -39,7 +39,6 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include "fileundomanagertest.moc"
 
 QTEST_KDEMAIN( FileUndoManagerTest, NoGUI )
 
diff --git a/kio/tests/jobremotetest.cpp b/kio/tests/jobremotetest.cpp
index 9e0a4ff..31d56c1 100644
--- a/kio/tests/jobremotetest.cpp
+++ b/kio/tests/jobremotetest.cpp
@@ -394,4 +394,3 @@ void JobRemoteTest::slotMimetype(KIO::Job* job, const QString& \
type)  m_mimetype = type;
 }
 
-#include "jobremotetest.moc"
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 29ce641..962b413 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -1565,4 +1565,3 @@ void JobTest::moveOverSymlinkToSelf() // #169547
 #endif
 }
 
-#include "jobtest.moc"
diff --git a/kio/tests/kbookmarktest.cpp b/kio/tests/kbookmarktest.cpp
index fa979d6..4958e0e 100644
--- a/kio/tests/kbookmarktest.cpp
+++ b/kio/tests/kbookmarktest.cpp
@@ -18,7 +18,6 @@
 
 #include <qtest_kde.h>
 #include "kbookmarktest.h"
-#include "kbookmarktest.moc"
 
 QTEST_KDEMAIN( KBookmarkTest, false )
 
diff --git a/kio/tests/kdcopcheck.cpp b/kio/tests/kdcopcheck.cpp
index 9754543..d8d3ed6 100644
--- a/kio/tests/kdcopcheck.cpp
+++ b/kio/tests/kdcopcheck.cpp
@@ -128,4 +128,3 @@ int main(int argc, char *argv[])
    qWarning("%d left after filtering.", i);
 }
 
-#include "kdcopcheck.moc"
diff --git a/kio/tests/kdirlistertest.cpp b/kio/tests/kdirlistertest.cpp
index 33088d2..5a67369 100644
--- a/kio/tests/kdirlistertest.cpp
+++ b/kio/tests/kdirlistertest.cpp
@@ -19,7 +19,6 @@
 
 #include "kdirlistertest.h"
 #include <qtemporaryfile.h>
-#include "kdirlistertest.moc"
 #include <kdirlister.h>
 #include <qtest_kde.h>
 
diff --git a/kio/tests/kdirmodeltest.cpp b/kio/tests/kdirmodeltest.cpp
index 4e1e3c7..29216ed 100644
--- a/kio/tests/kdirmodeltest.cpp
+++ b/kio/tests/kdirmodeltest.cpp
@@ -22,7 +22,6 @@
 #include <kio/copyjob.h>
 #include <kio/chmodjob.h>
 #include <kprotocolinfo.h>
-#include "kdirmodeltest.moc"
 #include <kdirmodel.h>
 #include <kdirlister.h>
 //TODO #include "../../kdeui/tests/proxymodeltestsuite/modelspy.h"
diff --git a/kio/tests/kfdtest.cpp b/kio/tests/kfdtest.cpp
index 225db2d..d5872ae 100644
--- a/kio/tests/kfdtest.cpp
+++ b/kio/tests/kfdtest.cpp
@@ -30,4 +30,3 @@ void KFDTest::doit()
 //     qApp->quit();
 }
 
-#include "kfdtest.moc"
diff --git a/kio/tests/kfileitemtest.cpp b/kio/tests/kfileitemtest.cpp
index 42a2c12..71642ea 100644
--- a/kio/tests/kfileitemtest.cpp
+++ b/kio/tests/kfileitemtest.cpp
@@ -20,7 +20,6 @@
 #include "kfileitemtest.h"
 #include <kfileitemlistproperties.h>
 #include <qtest_kde.h>
-#include "kfileitemtest.moc"
 #include <kfileitem.h>
 
 #include <qtemporarydir.h>
diff --git a/kio/tests/kfilemetainfotest.cpp b/kio/tests/kfilemetainfotest.cpp
index 0eb09c6..1011032 100644
--- a/kio/tests/kfilemetainfotest.cpp
+++ b/kio/tests/kfilemetainfotest.cpp
@@ -98,4 +98,3 @@ void KFileMetaInfoTest::exitLoop()
     }
 }
 
-#include "kfilemetainfotest.moc"
diff --git a/kio/tests/kioslavetest.cpp b/kio/tests/kioslavetest.cpp
index 4634b38..96e7549 100644
--- a/kio/tests/kioslavetest.cpp
+++ b/kio/tests/kioslavetest.cpp
@@ -542,5 +542,4 @@ int main(int argc, char **argv) {
   app.exec();
 }
 
-
 #include "kioslavetest.moc"
diff --git a/kio/tests/kruntest.cpp b/kio/tests/kruntest.cpp
index 7469838..f3c18af 100644
--- a/kio/tests/kruntest.cpp
+++ b/kio/tests/kruntest.cpp
@@ -153,4 +153,3 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "kruntest.moc"
diff --git a/kio/tests/krununittest.cpp b/kio/tests/krununittest.cpp
index 3a0f8fd..68c8799 100644
--- a/kio/tests/krununittest.cpp
+++ b/kio/tests/krununittest.cpp
@@ -22,7 +22,6 @@
 #undef QT_USE_FAST_CONCATENATION
 
 #include "krununittest.h"
-#include "krununittest.moc"
 #include <qtest_kde.h>
 QTEST_KDEMAIN( KRunUnitTest, NoGUI )
 
diff --git a/kio/tests/speed.cpp b/kio/tests/speed.cpp
index 3d9f57f..cd1ecc3 100644
--- a/kio/tests/speed.cpp
+++ b/kio/tests/speed.cpp
@@ -104,4 +104,3 @@ int main(int argc, char **argv) {
         kDebug() << mp->mountPoint() << " is the mount point for path " << url;
 }
 
-#include "speed.moc"
diff --git a/kioslave/file/file.cpp b/kioslave/file/file.cpp
index 28ad935..be17e7d 100644
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
@@ -1359,4 +1359,3 @@ bool FileProtocol::deleteRecursive(const QString& path)
     return true;
 }
 
-#include "file.moc"
diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
index aec7602..a1d3c81 100644
--- a/kioslave/http/http.cpp
+++ b/kioslave/http/http.cpp
@@ -5455,4 +5455,3 @@ void HTTPProtocol::saveProxyAuthenticationForSocket()
     m_socketProxyAuth = 0;
 }
 
-#include "http.moc"
diff --git a/kioslave/http/kcookiejar/kcookieserver.cpp \
b/kioslave/http/kcookiejar/kcookieserver.cpp index c8a61fb..30ad9c7 100644
--- a/kioslave/http/kcookiejar/kcookieserver.cpp
+++ b/kioslave/http/kcookiejar/kcookieserver.cpp
@@ -585,5 +585,4 @@ KCookieServer::shutdown()
    deleteLater();
 }
 
-#include "kcookieserver.moc"
 
diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp \
b/kioslave/http/kcookiejar/kcookiewin.cpp index 0713cdd..ee2df1d 100644
--- a/kioslave/http/kcookiejar/kcookiewin.cpp
+++ b/kioslave/http/kcookiejar/kcookiewin.cpp
@@ -307,4 +307,3 @@ void KCookieDetail::displayCookieDetails()
     m_secure->setText(sec);
 }
 
-#include "kcookiewin.moc"
diff --git a/kioslave/http/tests/httpheaderdispositiontest.cpp \
b/kioslave/http/tests/httpheaderdispositiontest.cpp index 491ef71..b8522b5 100644
--- a/kioslave/http/tests/httpheaderdispositiontest.cpp
+++ b/kioslave/http/tests/httpheaderdispositiontest.cpp
@@ -26,7 +26,6 @@
 
 #include <parsinghelpers.h>
 
-#include "httpheaderdispositiontest.moc"
 
 #include <parsinghelpers.cpp>
 
diff --git a/kioslave/http/tests/httpheadertokenizetest.cpp \
b/kioslave/http/tests/httpheadertokenizetest.cpp index 3e1d035..bd66f17 100644
--- a/kioslave/http/tests/httpheadertokenizetest.cpp
+++ b/kioslave/http/tests/httpheadertokenizetest.cpp
@@ -27,7 +27,6 @@
 
 #include <parsinghelpers.h>
 
-#include "httpheadertokenizetest.moc"
 
 #include <parsinghelpers.cpp>
 
diff --git a/kjsembed/examples/kjsconsole/console.cpp \
b/kjsembed/examples/kjsconsole/console.cpp index 0bb5707..c6d5de9 100644
--- a/kjsembed/examples/kjsconsole/console.cpp
+++ b/kjsembed/examples/kjsconsole/console.cpp
@@ -146,4 +146,3 @@ void Console::on_actionStop_activated()
 }
 
 
-#include "console.moc"
diff --git a/kjsembed/examples/kjsconsole/kjs_object_model.cpp \
b/kjsembed/examples/kjsconsole/kjs_object_model.cpp index 52005f9..f4aa92f 100644
--- a/kjsembed/examples/kjsconsole/kjs_object_model.cpp
+++ b/kjsembed/examples/kjsconsole/kjs_object_model.cpp
@@ -182,4 +182,3 @@ QVariant KJSObjectModel::data(const QModelIndex &index, int role) \
const  return QVariant();
 }
 
-#include "kjs_object_model.moc"
diff --git a/kjsembed/examples/kjsconsole/numberedtextview.cpp \
b/kjsembed/examples/kjsconsole/numberedtextview.cpp index 2742597..64ab741 100644
--- a/kjsembed/examples/kjsconsole/numberedtextview.cpp
+++ b/kjsembed/examples/kjsconsole/numberedtextview.cpp
@@ -281,4 +281,3 @@ bool NumberedTextView::eventFilter( QObject *obj, QEvent *event )
     return false;
 }
 
-#include "numberedtextview.moc"
diff --git a/knewstuff/knewstuff2/core/coreengine.cpp \
b/knewstuff/knewstuff2/core/coreengine.cpp index b8f6589..c505709 100644
--- a/knewstuff/knewstuff2/core/coreengine.cpp
+++ b/knewstuff/knewstuff2/core/coreengine.cpp
@@ -1668,4 +1668,3 @@ QStringList KNS::CoreEngine::archiveEntries(const QString& \
path, const KArchiveD  }
 
 
-#include "coreengine.moc"
diff --git a/knewstuff/knewstuff2/core/entryloader.cpp \
b/knewstuff/knewstuff2/core/entryloader.cpp index 5ae425b..e2be34d 100644
--- a/knewstuff/knewstuff2/core/entryloader.cpp
+++ b/knewstuff/knewstuff2/core/entryloader.cpp
@@ -117,4 +117,3 @@ void EntryLoader::slotJobResult(KJob *job)
     emit signalEntriesLoaded(m_entries);
 }
 
-#include "entryloader.moc"
diff --git a/knewstuff/knewstuff2/core/providerloader.cpp \
b/knewstuff/knewstuff2/core/providerloader.cpp index 8ec0bef..f51b960 100644
--- a/knewstuff/knewstuff2/core/providerloader.cpp
+++ b/knewstuff/knewstuff2/core/providerloader.cpp
@@ -97,4 +97,3 @@ void ProviderLoader::slotJobResult(KJob *job)
     emit signalProvidersLoaded(m_providers);
 }
 
-#include "providerloader.moc"
diff --git a/knewstuff/knewstuff2/core/security.cpp \
b/knewstuff/knewstuff2/core/security.cpp index fba6ec4..244a025 100644
--- a/knewstuff/knewstuff2/core/security.cpp
+++ b/knewstuff/knewstuff2/core/security.cpp
@@ -369,4 +369,3 @@ void Security::slotSignFile()
     }
 }
 
-#include "security.moc"
diff --git a/knewstuff/knewstuff2/dxs/dxs.cpp b/knewstuff/knewstuff2/dxs/dxs.cpp
index 003a447..c454e4a 100644
--- a/knewstuff/knewstuff2/dxs/dxs.cpp
+++ b/knewstuff/knewstuff2/dxs/dxs.cpp
@@ -290,4 +290,3 @@ void Dxs::slotResult(QDomNode node, int jobid)
     }
 }
 
-#include "dxs.moc"
diff --git a/knewstuff/knewstuff2/dxs/dxsengine.cpp \
b/knewstuff/knewstuff2/dxs/dxsengine.cpp index f51be8c..bd1e45f 100644
--- a/knewstuff/knewstuff2/dxs/dxsengine.cpp
+++ b/knewstuff/knewstuff2/dxs/dxsengine.cpp
@@ -116,4 +116,3 @@ void DxsEngine::slotEntriesFailed()
     emit signalEntriesFailed();
 }
 
-#include "dxsengine.moc"
diff --git a/knewstuff/knewstuff2/dxs/soap.cpp b/knewstuff/knewstuff2/dxs/soap.cpp
index 9e3db65..f2b38ba 100644
--- a/knewstuff/knewstuff2/dxs/soap.cpp
+++ b/knewstuff/knewstuff2/dxs/soap.cpp
@@ -355,4 +355,3 @@ QDomDocument Soap::buildtree(QDomDocument doc, QDomElement cur, \
const QString& d  return doc;
 }
 
-#include "soap.moc"
diff --git a/knewstuff/knewstuff2/ui/downloaddialog.cpp \
b/knewstuff/knewstuff2/ui/downloaddialog.cpp index 48ddc7f..c5d8d9b 100644
--- a/knewstuff/knewstuff2/ui/downloaddialog.cpp
+++ b/knewstuff/knewstuff2/ui/downloaddialog.cpp
@@ -596,4 +596,3 @@ void DownloadDialog::slotError()
                        i18n("Desktop Exchange Service"));
 }
 
-#include "downloaddialog.moc"
diff --git a/knewstuff/knewstuff2/ui/itemsview.cpp \
b/knewstuff/knewstuff2/ui/itemsview.cpp index 1cd1120..030b34b 100644
--- a/knewstuff/knewstuff2/ui/itemsview.cpp
+++ b/knewstuff/knewstuff2/ui/itemsview.cpp
@@ -391,5 +391,4 @@ void EntryView::urlSelected(const QString &link)
     }
 }
 
-#include "itemsview.moc"
 
diff --git a/knewstuff/knewstuff2/ui/kdxsbutton.cpp \
b/knewstuff/knewstuff2/ui/kdxsbutton.cpp index 79e0c02..fec1a22 100644
--- a/knewstuff/knewstuff2/ui/kdxsbutton.cpp
+++ b/knewstuff/knewstuff2/ui/kdxsbutton.cpp
@@ -548,4 +548,3 @@ void KDXSButton::slotPayloadFailed(KNS::Entry *)
     //kDebug() << "PAYLOAD: failed";
 }
 
-#include "kdxsbutton.moc"
diff --git a/knewstuff/knewstuff2/ui/kdxschanges.cpp \
b/knewstuff/knewstuff2/ui/kdxschanges.cpp index 7a5dc49..ddb985c 100644
--- a/knewstuff/knewstuff2/ui/kdxschanges.cpp
+++ b/knewstuff/knewstuff2/ui/kdxschanges.cpp
@@ -59,4 +59,3 @@ void KDXSChanges::addChangelog(const QString& version, const \
QString& log)  m_log->setHtml(t);
 }
 
-#include "kdxschanges.moc"
diff --git a/knewstuff/knewstuff2/ui/kdxscomment.cpp \
b/knewstuff/knewstuff2/ui/kdxscomment.cpp index 4c1775f3..17dfa3b 100644
--- a/knewstuff/knewstuff2/ui/kdxscomment.cpp
+++ b/knewstuff/knewstuff2/ui/kdxscomment.cpp
@@ -45,4 +45,3 @@ QString KDXSComment::comment()
     return m_textbox->toPlainText();
 }
 
-#include "kdxscomment.moc"
diff --git a/knewstuff/knewstuff2/ui/kdxscomments.cpp \
b/knewstuff/knewstuff2/ui/kdxscomments.cpp index 9d89bf7..9c781ad 100644
--- a/knewstuff/knewstuff2/ui/kdxscomments.cpp
+++ b/knewstuff/knewstuff2/ui/kdxscomments.cpp
@@ -88,4 +88,3 @@ kapp->invokeMailer( url );
 }
 */
 
-#include "kdxscomments.moc"
diff --git a/knewstuff/knewstuff2/ui/kdxsrating.cpp \
b/knewstuff/knewstuff2/ui/kdxsrating.cpp index 887813f..94e3244 100644
--- a/knewstuff/knewstuff2/ui/kdxsrating.cpp
+++ b/knewstuff/knewstuff2/ui/kdxsrating.cpp
@@ -117,4 +117,3 @@ void KDXSRating::paintEvent(QPaintEvent e)
 }
 */
 
-#include "kdxsrating.moc"
diff --git a/knewstuff/knewstuff2/ui/kdxstranslation.cpp \
b/knewstuff/knewstuff2/ui/kdxstranslation.cpp index 416cf30..947179f 100644
--- a/knewstuff/knewstuff2/ui/kdxstranslation.cpp
+++ b/knewstuff/knewstuff2/ui/kdxstranslation.cpp
@@ -74,4 +74,3 @@ KDXSTranslation::KDXSTranslation(QWidget *parent)
     vbox->addLayout(grid);
 }
 
-#include "kdxstranslation.moc"
diff --git a/knewstuff/knewstuff2/ui/knewstuffbutton.cpp \
b/knewstuff/knewstuff2/ui/knewstuffbutton.cpp index 16d272f..c8e7f07 100644
--- a/knewstuff/knewstuff2/ui/knewstuffbutton.cpp
+++ b/knewstuff/knewstuff2/ui/knewstuffbutton.cpp
@@ -92,4 +92,3 @@ void Button::showDialog()
 
 }
 
-#include "knewstuffbutton.moc"
diff --git a/knewstuff/knewstuff2/ui/providerdialog.cpp \
b/knewstuff/knewstuff2/ui/providerdialog.cpp index 0f0e61f..5c2f9fc 100644
--- a/knewstuff/knewstuff2/ui/providerdialog.cpp
+++ b/knewstuff/knewstuff2/ui/providerdialog.cpp
@@ -108,4 +108,3 @@ KNS::Provider *ProviderDialog::provider() const
     return m_provider;
 }
 
-#include "providerdialog.moc"
diff --git a/knewstuff/knewstuff2/ui/qasyncimage.cpp \
b/knewstuff/knewstuff2/ui/qasyncimage.cpp index 8568e1c..88a4063 100644
--- a/knewstuff/knewstuff2/ui/qasyncimage.cpp
+++ b/knewstuff/knewstuff2/ui/qasyncimage.cpp
@@ -57,4 +57,4 @@ void QAsyncImage::slotDownload(KJob *job)
     emit signalLoaded(m_url, *this);
 }
 
-#include "qasyncimage_p.moc"
+#include "moc_qasyncimage_p.cpp"
diff --git a/knewstuff/knewstuff2/ui/qprogressindicator.cpp \
b/knewstuff/knewstuff2/ui/qprogressindicator.cpp index 8a597b0..a1794c7 100644
--- a/knewstuff/knewstuff2/ui/qprogressindicator.cpp
+++ b/knewstuff/knewstuff2/ui/qprogressindicator.cpp
@@ -146,4 +146,3 @@ void QProgressIndicator::calculateAverage()
     m_pb->setValue(average);
 }
 
-#include "qprogressindicator.moc"
diff --git a/knewstuff/knewstuff2/ui/qstarframe.cpp \
b/knewstuff/knewstuff2/ui/qstarframe.cpp index c4ac694..e7342eb 100644
--- a/knewstuff/knewstuff2/ui/qstarframe.cpp
+++ b/knewstuff/knewstuff2/ui/qstarframe.cpp
@@ -74,4 +74,3 @@ void QStarFrame::paintEvent(QPaintEvent *e)
     drawstars();
 }
 
-#include "qstarframe.moc"
diff --git a/knewstuff/knewstuff2/ui/uploaddialog.cpp \
b/knewstuff/knewstuff2/ui/uploaddialog.cpp index 2e4a7e4..9c20dae 100644
--- a/knewstuff/knewstuff2/ui/uploaddialog.cpp
+++ b/knewstuff/knewstuff2/ui/uploaddialog.cpp
@@ -179,4 +179,3 @@ Entry *UploadDialog::entry() const
     return m_entry;
 }
 
-#include "uploaddialog.moc"
diff --git a/knewstuff/knewstuff3/attica/atticaprovider.cpp \
b/knewstuff/knewstuff3/attica/atticaprovider.cpp index 90ae4db..0f47221 100644
--- a/knewstuff/knewstuff3/attica/atticaprovider.cpp
+++ b/knewstuff/knewstuff3/attica/atticaprovider.cpp
@@ -444,4 +444,3 @@ EntryInternal AtticaProvider::entryFromAtticaContent(const \
Attica::Content& cont  } // namespace
 
 
-#include "atticaprovider.moc"
diff --git a/knewstuff/knewstuff3/core/cache.cpp \
b/knewstuff/knewstuff3/core/cache.cpp index f3221fd..926c665 100644
--- a/knewstuff/knewstuff3/core/cache.cpp
+++ b/knewstuff/knewstuff3/core/cache.cpp
@@ -243,4 +243,3 @@ EntryInternal::List Cache::requestFromCache(const \
KNS3::Provider::SearchRequest&  return requestCache.value(request.hashForRequest());
 }
 
-#include "cache.moc"
diff --git a/knewstuff/knewstuff3/core/engine.cpp \
b/knewstuff/knewstuff3/core/engine.cpp index 85b7abd..f60a7a6 100644
--- a/knewstuff/knewstuff3/core/engine.cpp
+++ b/knewstuff/knewstuff3/core/engine.cpp
@@ -517,4 +517,3 @@ void Engine::checkForUpdates()
     }
 }
 
-#include "engine.moc"
diff --git a/knewstuff/knewstuff3/core/installation.cpp \
b/knewstuff/knewstuff3/core/installation.cpp index 22943cf..cc2e481 100644
--- a/knewstuff/knewstuff3/core/installation.cpp
+++ b/knewstuff/knewstuff3/core/installation.cpp
@@ -598,4 +598,3 @@ QStringList Installation::archiveEntries(const QString& path, \
const KArchiveDire  }
 
 
-#include "installation.moc"
diff --git a/knewstuff/knewstuff3/core/provider.cpp \
b/knewstuff/knewstuff3/core/provider.cpp index 00f0c96..908ea7d 100644
--- a/knewstuff/knewstuff3/core/provider.cpp
+++ b/knewstuff/knewstuff3/core/provider.cpp
@@ -57,4 +57,3 @@ KUrl Provider::icon() const
 
 }
 
-#include "provider.moc"
diff --git a/knewstuff/knewstuff3/core/security.cpp \
b/knewstuff/knewstuff3/core/security.cpp index 86516ed..110e4ca 100644
--- a/knewstuff/knewstuff3/core/security.cpp
+++ b/knewstuff/knewstuff3/core/security.cpp
@@ -380,4 +380,3 @@ void Security::slotSignFile()
     }
 }
 
-#include "security.moc"
diff --git a/knewstuff/knewstuff3/core/xmlloader.cpp \
b/knewstuff/knewstuff3/core/xmlloader.cpp index 8633466..1e2ff47 100644
--- a/knewstuff/knewstuff3/core/xmlloader.cpp
+++ b/knewstuff/knewstuff3/core/xmlloader.cpp
@@ -88,4 +88,3 @@ namespace KNS3
     }
 } // end KNS namespace
 
-#include "xmlloader.moc"
diff --git a/knewstuff/knewstuff3/downloaddialog.cpp \
b/knewstuff/knewstuff3/downloaddialog.cpp index 6d24693..d748b67 100644
--- a/knewstuff/knewstuff3/downloaddialog.cpp
+++ b/knewstuff/knewstuff3/downloaddialog.cpp
@@ -113,4 +113,3 @@ Entry::List DownloadDialog::installedEntries()
 }
 
 
-#include "downloaddialog.moc"
diff --git a/knewstuff/knewstuff3/downloadmanager.cpp \
b/knewstuff/knewstuff3/downloadmanager.cpp index 5cc35bf..c8b2363 100644
--- a/knewstuff/knewstuff3/downloadmanager.cpp
+++ b/knewstuff/knewstuff3/downloadmanager.cpp
@@ -174,4 +174,4 @@ void DownloadManager::setSearchTerm(const QString& searchTerm)
 }
 
 
-#include "downloadmanager.moc"
+#include "moc_downloadmanager.cpp"
diff --git a/knewstuff/knewstuff3/downloadwidget.cpp \
b/knewstuff/knewstuff3/downloadwidget.cpp index 9f4c774..2ae5fad 100644
--- a/knewstuff/knewstuff3/downloadwidget.cpp
+++ b/knewstuff/knewstuff3/downloadwidget.cpp
@@ -391,4 +391,4 @@ void DownloadWidgetPrivate::slotShowOverview()
 }
 
 
-#include "downloadwidget.moc"
+#include "moc_downloadwidget.cpp"
diff --git a/knewstuff/knewstuff3/knewstuffbutton.cpp \
b/knewstuff/knewstuff3/knewstuffbutton.cpp index 9c14e99..9dc4228 100644
--- a/knewstuff/knewstuff3/knewstuffbutton.cpp
+++ b/knewstuff/knewstuff3/knewstuffbutton.cpp
@@ -82,4 +82,3 @@ void Button::showDialog()
 
 }
 
-#include "knewstuffbutton.moc"
diff --git a/knewstuff/knewstuff3/staticxml/staticxmlprovider.cpp \
b/knewstuff/knewstuff3/staticxml/staticxmlprovider.cpp index 4a81f3f..3d410ad 100644
--- a/knewstuff/knewstuff3/staticxml/staticxmlprovider.cpp
+++ b/knewstuff/knewstuff3/staticxml/staticxmlprovider.cpp
@@ -279,4 +279,3 @@ EntryInternal::List StaticXmlProvider::installedEntries() const
 
 }
 
-#include "staticxmlprovider.moc"
diff --git a/knewstuff/knewstuff3/ui/entrydetailsdialog.cpp \
b/knewstuff/knewstuff3/ui/entrydetailsdialog.cpp index 597c917..63055e7 100644
--- a/knewstuff/knewstuff3/ui/entrydetailsdialog.cpp
+++ b/knewstuff/knewstuff3/ui/entrydetailsdialog.cpp
@@ -301,5 +301,4 @@ void EntryDetails::becomeFan()
     m_engine->becomeFan(m_entry);
 }
 
-#include "entrydetailsdialog.moc"
 
diff --git a/knewstuff/knewstuff3/ui/imageloader.cpp \
b/knewstuff/knewstuff3/ui/imageloader.cpp index 3396950..ea8f3a9 100644
--- a/knewstuff/knewstuff3/ui/imageloader.cpp
+++ b/knewstuff/knewstuff3/ui/imageloader.cpp
@@ -85,4 +85,3 @@ void ImageLoader::slotDownload(KJob *job)
     deleteLater();
 }
 
-#include "imageloader.moc"
diff --git a/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp \
b/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp index 56ccb53..d00b72c 100644
--- a/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp
+++ b/knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp
@@ -376,4 +376,3 @@ void ItemsGridViewDelegate::displayOperationBar(const QRect \
&rect,const QModelIn  }
 }
 
-#include "itemsgridviewdelegate.moc"
diff --git a/knewstuff/knewstuff3/ui/itemsmodel.cpp \
b/knewstuff/knewstuff3/ui/itemsmodel.cpp index 0fd3878..1fa213c 100644
--- a/knewstuff/knewstuff3/ui/itemsmodel.cpp
+++ b/knewstuff/knewstuff3/ui/itemsmodel.cpp
@@ -146,4 +146,3 @@ bool ItemsModel::hasPreviewImages() const
 
 } // end KNS namespace
 
-#include "itemsmodel.moc"
diff --git a/knewstuff/knewstuff3/ui/itemsviewdelegate.cpp \
b/knewstuff/knewstuff3/ui/itemsviewdelegate.cpp index 95553e5..2823905 100644
--- a/knewstuff/knewstuff3/ui/itemsviewdelegate.cpp
+++ b/knewstuff/knewstuff3/ui/itemsviewdelegate.cpp
@@ -329,4 +329,3 @@ QSize ItemsViewDelegate::sizeHint(const QStyleOptionViewItem & \
option, const QMo  
 } // namespace
 
-#include "itemsviewdelegate.moc"
diff --git a/knewstuff/knewstuff3/ui/progressindicator.cpp \
b/knewstuff/knewstuff3/ui/progressindicator.cpp index b7cb7bd..6bfb81b 100644
--- a/knewstuff/knewstuff3/ui/progressindicator.cpp
+++ b/knewstuff/knewstuff3/ui/progressindicator.cpp
@@ -73,4 +73,3 @@ void ProgressIndicator::idle(const QString &message)
     busyWidget->setVisible(false);
 }
 
-#include "progressindicator.moc"
diff --git a/knewstuff/knewstuff3/upload/atticahelper.cpp \
b/knewstuff/knewstuff3/upload/atticahelper.cpp index f91d4a6..3dfabbb 100644
--- a/knewstuff/knewstuff3/upload/atticahelper.cpp
+++ b/knewstuff/knewstuff3/upload/atticahelper.cpp
@@ -238,4 +238,3 @@ void AtticaHelper::slotPreviewDownload(KJob *job)
     emit previewLoaded(previewNum, image);
 }
 
-#include "atticahelper.moc"
diff --git a/knewstuff/knewstuff3/uploaddialog.cpp \
b/knewstuff/knewstuff3/uploaddialog.cpp index 44c7ea3..75f81c6 100644
--- a/knewstuff/knewstuff3/uploaddialog.cpp
+++ b/knewstuff/knewstuff3/uploaddialog.cpp
@@ -771,4 +771,4 @@ void UploadDialog::Private::_k_detailsLinkLoaded(const QUrl& url)
     ui.fetchContentLinkImageLabel->setPixmap(KIcon("dialog-ok").pixmap(16));
 }
 
-#include "uploaddialog.moc"
+#include "moc_uploaddialog.cpp"
diff --git a/knewstuff/tests/kdxsview.cpp b/knewstuff/tests/kdxsview.cpp
index 08a8d64..4c764ed 100644
--- a/knewstuff/tests/kdxsview.cpp
+++ b/knewstuff/tests/kdxsview.cpp
@@ -145,4 +145,3 @@ void KDXSView::slotProvidersFailed()
                           i18n("It was not possible to load the providers URL."));
 }
 
-#include "kdxsview.moc"
diff --git a/knewstuff/tests/knewstuff2_download.cpp \
b/knewstuff/tests/knewstuff2_download.cpp index b36b7f1..0d9efd7 100644
--- a/knewstuff/tests/knewstuff2_download.cpp
+++ b/knewstuff/tests/knewstuff2_download.cpp
@@ -355,4 +355,3 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "knewstuff2_download.moc"
diff --git a/knewstuff/tests/knewstuff2_standard.cpp \
b/knewstuff/tests/knewstuff2_standard.cpp index 7edf414..108c821 100644
--- a/knewstuff/tests/knewstuff2_standard.cpp
+++ b/knewstuff/tests/knewstuff2_standard.cpp
@@ -98,4 +98,3 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "knewstuff2_standard.moc"
diff --git a/knewstuff/tests/knewstuff2_test.cpp \
b/knewstuff/tests/knewstuff2_test.cpp index 0e7d234..7511688 100644
--- a/knewstuff/tests/knewstuff2_test.cpp
+++ b/knewstuff/tests/knewstuff2_test.cpp
@@ -279,4 +279,3 @@ int main(int argc, char **argv)
     return app.exec();
 }
 
-#include "moc_knewstuff2_test.cpp"
diff --git a/knotify/config/knotifyconfigactionswidget.cpp \
b/knotify/config/knotifyconfigactionswidget.cpp index 88d18b6..a1c111e 100644
--- a/knotify/config/knotifyconfigactionswidget.cpp
+++ b/knotify/config/knotifyconfigactionswidget.cpp
@@ -146,4 +146,3 @@ void KNotifyConfigActionsWidget::slotKTTSComboChanged()
 	emit changed();
 }
 
-#include "knotifyconfigactionswidget.moc"
diff --git a/knotify/config/knotifyconfigwidget.cpp \
b/knotify/config/knotifyconfigwidget.cpp index 60f3a51..00824d6 100644
--- a/knotify/config/knotifyconfigwidget.cpp
+++ b/knotify/config/knotifyconfigwidget.cpp
@@ -128,4 +128,3 @@ void KNotifyConfigWidget::slotActionChanged()
 }
 
 
-#include "knotifyconfigwidget.moc"
diff --git a/knotify/config/knotifyeventlist.cpp \
b/knotify/config/knotifyeventlist.cpp index c5d0b15..bb4406f 100644
--- a/knotify/config/knotifyeventlist.cpp
+++ b/knotify/config/knotifyeventlist.cpp
@@ -214,4 +214,3 @@ void KNotifyEventListItem::update()
 	setData(0 , Qt::UserRole , m_config.readEntry( "Action" ));
 }
 
-#include "knotifyeventlist.moc"
diff --git a/knotify/tests/knotifytestwindow.cpp \
b/knotify/tests/knotifytestwindow.cpp index 0e0f909..a5385b4 100644
--- a/knotify/tests/knotifytestwindow.cpp
+++ b/knotify/tests/knotifytestwindow.cpp
@@ -106,6 +106,5 @@ void KNotifyTestWindow::slotConfigureC( )
 
 
 
-#include "knotifytestwindow.moc"
 
 
diff --git a/kparts/browserextension.cpp b/kparts/browserextension.cpp
index bd65122..0848867 100644
--- a/kparts/browserextension.cpp
+++ b/kparts/browserextension.cpp
@@ -820,4 +820,3 @@ LiveConnectExtension *LiveConnectExtension::childObject( QObject \
*obj )  return KGlobal::findDirectChild<KParts::LiveConnectExtension *>(obj);
 }
 
-#include "browserextension.moc"
diff --git a/kparts/browserinterface.cpp b/kparts/browserinterface.cpp
index 61a6f3b..1c83fd7 100644
--- a/kparts/browserinterface.cpp
+++ b/kparts/browserinterface.cpp
@@ -72,4 +72,3 @@ void BrowserInterface::callMethod( const char *name, const QVariant \
&argument )  }
 }
 
-#include "browserinterface.moc"
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp
index 0f0ef88..f0de678 100644
--- a/kparts/browserrun.cpp
+++ b/kparts/browserrun.cpp
@@ -583,5 +583,5 @@ KParts::BrowserArguments& KParts::BrowserRun::browserArguments()
     return d->m_browserArgs;
 }
 
-#include "browserrun.moc"
-#include "browserrun_p.moc"
+#include "moc_browserrun.cpp"
+#include "moc_browserrun_p.cpp"
diff --git a/kparts/factory.cpp b/kparts/factory.cpp
index 9e03055..f2f71f0 100644
--- a/kparts/factory.cpp
+++ b/kparts/factory.cpp
@@ -78,4 +78,3 @@ QObject *Factory::createObject( QObject *parent, const char \
*classname, const QS  return createPart( static_cast<QWidget *>( parent ), parent, \
classname, args );  }
 
-#include "factory.moc"
diff --git a/kparts/historyprovider.cpp b/kparts/historyprovider.cpp
index e472f8b..0cff2da 100644
--- a/kparts/historyprovider.cpp
+++ b/kparts/historyprovider.cpp
@@ -95,4 +95,3 @@ void HistoryProvider::clear()
     emit cleared();
 }
 
-#include "historyprovider.moc"
diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp
index bd21a54..51f1575 100644
--- a/kparts/mainwindow.cpp
+++ b/kparts/mainwindow.cpp
@@ -183,4 +183,3 @@ void KParts::MainWindow::configureToolbars()
     KXmlGuiWindow::configureToolbars();
 }
 
-#include "mainwindow.moc"
diff --git a/kparts/part.cpp b/kparts/part.cpp
index 3735072..4f6efdb 100644
--- a/kparts/part.cpp
+++ b/kparts/part.cpp
@@ -1144,4 +1144,4 @@ void KParts::OpenUrlArguments::setActionRequestedByUser(bool \
userRequested)  d->actionRequestedByUser = userRequested;
 }
 
-#include "part.moc"
+#include "moc_part.cpp"
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp
index 2b0e027..807ab3f 100644
--- a/kparts/partmanager.cpp
+++ b/kparts/partmanager.cpp
@@ -587,4 +587,3 @@ int PartManager::reason() const
     return d->m_reason;
 }
 
-#include "partmanager.moc"
diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp
index 358f6c4..d4f06ff 100644
--- a/kparts/plugin.cpp
+++ b/kparts/plugin.cpp
@@ -352,4 +352,3 @@ void Plugin::loadPlugins(QObject *parent, KXMLGUIClient* \
parentGUIClient,  
 // vim:sw=4:et:sts=4
 
-#include "plugin.moc"
diff --git a/kparts/scriptableextension.cpp b/kparts/scriptableextension.cpp
index 38c8201..fe4f607 100644
--- a/kparts/scriptableextension.cpp
+++ b/kparts/scriptableextension.cpp
@@ -447,7 +447,7 @@ unsigned int qHash(const \
KParts::ScriptableExtension::FunctionRef& f)  
 
 
-#include "scriptableextension.moc"
-#include "scriptableextension_p.moc"
+#include "moc_scriptableextension.cpp"
+#include "moc_scriptableextension_p.cpp"
 // kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
 
diff --git a/kparts/statusbarextension.cpp b/kparts/statusbarextension.cpp
index cb9c09e..7537178 100644
--- a/kparts/statusbarextension.cpp
+++ b/kparts/statusbarextension.cpp
@@ -185,6 +185,5 @@ void StatusBarExtension::removeStatusBarItem( QWidget * widget )
     kWarning(1000) << "StatusBarExtension::removeStatusBarItem. Widget not found : " \
<< widget;  }
 
-#include "statusbarextension.moc"
 
 // vim: ts=2 sw=2 et
diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp
index cb79579..bf66993 100644
--- a/kparts/tests/normalktm.cpp
+++ b/kparts/tests/normalktm.cpp
@@ -152,4 +152,3 @@ int main( int argc, char **argv )
     return 0;
 }
 
-#include "normalktm.moc"
diff --git a/kparts/tests/notepad.cpp b/kparts/tests/notepad.cpp
index bc02c82..de1f9c6 100644
--- a/kparts/tests/notepad.cpp
+++ b/kparts/tests/notepad.cpp
@@ -125,4 +125,3 @@ void NotepadPart::slotSearchReplace()
 {
 }
 
-#include "notepad.moc"
diff --git a/kparts/tests/parts.cpp b/kparts/tests/parts.cpp
index 03dd62a..61b5547 100644
--- a/kparts/tests/parts.cpp
+++ b/kparts/tests/parts.cpp
@@ -140,4 +140,3 @@ void Part2::guiActivateEvent( KParts::GUIActivateEvent * event )
         emit setWindowCaption("[part2 activated]");
 }
 
-#include "parts.moc"
diff --git a/kparts/tests/parttest.cpp b/kparts/tests/parttest.cpp
index e48b578..475a99b 100644
--- a/kparts/tests/parttest.cpp
+++ b/kparts/tests/parttest.cpp
@@ -223,4 +223,3 @@ void PartTest::testToolbarVisibility()
     window.testToolbarVisibility();
 }
 
-#include "parttest.moc"
diff --git a/kparts/tests/partviewer.cpp b/kparts/tests/partviewer.cpp
index 184e3b8..1ea8bc9 100644
--- a/kparts/tests/partviewer.cpp
+++ b/kparts/tests/partviewer.cpp
@@ -114,4 +114,3 @@ int main( int argc, char **argv )
     return app.exec();
 }
 
-#include "partviewer.moc"
diff --git a/kparts/tests/testmainwindow.cpp b/kparts/tests/testmainwindow.cpp
index 5d0bdd7..0e7b0a6 100644
--- a/kparts/tests/testmainwindow.cpp
+++ b/kparts/tests/testmainwindow.cpp
@@ -173,4 +173,3 @@ int main( int argc, char **argv )
     return 0;
 }
 
-#include "testmainwindow.moc"
diff --git a/kpty/kptydevice.cpp b/kpty/kptydevice.cpp
index 1579780..cf208a4 100644
--- a/kpty/kptydevice.cpp
+++ b/kpty/kptydevice.cpp
@@ -610,4 +610,4 @@ qint64 KPtyDevice::writeData(const char *data, qint64 len)
     return len;
 }
 
-#include "kptydevice.moc"
+#include "moc_kptydevice.cpp"
diff --git a/kpty/kptyprocess.cpp b/kpty/kptyprocess.cpp
index d782068..015a58c 100644
--- a/kpty/kptyprocess.cpp
+++ b/kpty/kptyprocess.cpp
@@ -137,4 +137,4 @@ void KPtyProcess::setupChildProcess()
     KProcess::setupChildProcess();
 }
 
-#include "kptyprocess.moc"
+#include "moc_kptyprocess.cpp"
diff --git a/kpty/tests/kptyprocesstest.cpp b/kpty/tests/kptyprocesstest.cpp
index e5aea68..72c2aaf 100644
--- a/kpty/tests/kptyprocesstest.cpp
+++ b/kpty/tests/kptyprocesstest.cpp
@@ -193,4 +193,3 @@ void KPtyProcessTest::test_ctty()
 
 QTEST_KDEMAIN_CORE( KPtyProcessTest )
 
-#include "kptyprocesstest.moc"
diff --git a/kross/core/action.cpp b/kross/core/action.cpp
index d8a19d8..07687e9 100644
--- a/kross/core/action.cpp
+++ b/kross/core/action.cpp
@@ -547,4 +547,3 @@ WrapperInterface::~WrapperInterface()
 {
 }
 
-#include "action.moc"
diff --git a/kross/core/actioncollection.cpp b/kross/core/actioncollection.cpp
index 4c10b69..a9f4bdb 100644
--- a/kross/core/actioncollection.cpp
+++ b/kross/core/actioncollection.cpp
@@ -459,4 +459,3 @@ bool ActionCollection::writeXml(QIODevice* device, int indent, \
const QStringList  return device->write( document.toByteArray(indent) ) != -1;
 }
 
-#include "actioncollection.moc"
diff --git a/kross/core/interpreter.cpp b/kross/core/interpreter.cpp
index 8f488c0..937ca60 100644
--- a/kross/core/interpreter.cpp
+++ b/kross/core/interpreter.cpp
@@ -174,4 +174,3 @@ InterpreterInfo* Interpreter::interpreterInfo() const
     return d->interpreterinfo;
 }
 
-#include "interpreter.moc"
diff --git a/kross/core/manager.cpp b/kross/core/manager.cpp
index b7ca5ee..497405c 100644
--- a/kross/core/manager.cpp
+++ b/kross/core/manager.cpp
@@ -427,4 +427,3 @@ bool Manager::hasHandlerAssigned(const QByteArray& typeName) \
const  return d->wrappers.contains(typeName);
 }
 
-#include "manager.moc"
diff --git a/kross/core/script.cpp b/kross/core/script.cpp
index 16f025c..e279d6d 100644
--- a/kross/core/script.cpp
+++ b/kross/core/script.cpp
@@ -63,4 +63,3 @@ Action* Script::action() const
     return d->action;
 }
 
-#include "script.moc"
diff --git a/kross/modules/form.cpp b/kross/modules/form.cpp
index fbb2828..d4aa6b0 100644
--- a/kross/modules/form.cpp
+++ b/kross/modules/form.cpp
@@ -824,4 +824,3 @@ QObject* FormModule::loadPart(QWidget* parent, const QString& \
name, const QUrl&  return part;
 }
 
-#include "form.moc"
diff --git a/kross/modules/translation.cpp b/kross/modules/translation.cpp
index 75cc9c8..debcf87 100644
--- a/kross/modules/translation.cpp
+++ b/kross/modules/translation.cpp
@@ -101,4 +101,3 @@ QString TranslationModule::i18ncp( const QString &context, const \
QString &singul  return substituteArguments( ls, arguments, 98 ).toString();
 }
 
-#include "translation.moc"
diff --git a/kross/qts/script.cpp b/kross/qts/script.cpp
index 41d46b2..fcd311f 100644
--- a/kross/qts/script.cpp
+++ b/kross/qts/script.cpp
@@ -270,4 +270,3 @@ QObject* EcmaScript::engine() const
     return d->m_engine;
 }
 
-#include "script.moc"
diff --git a/kross/ui/model.cpp b/kross/ui/model.cpp
index a66ef29..54e16eb 100644
--- a/kross/ui/model.cpp
+++ b/kross/ui/model.cpp
@@ -538,4 +538,3 @@ bool ActionCollectionProxyModel::filterAcceptsRow(int source_row, \
const QModelIn  return true;
 }
 
-#include "model.moc"
diff --git a/kross/ui/plugin.cpp b/kross/ui/plugin.cpp
index 7b15260..82132a3 100644
--- a/kross/ui/plugin.cpp
+++ b/kross/ui/plugin.cpp
@@ -263,4 +263,3 @@ void ScriptingPlugin::slotResetScriptActions()
     KIO::NetAccess::del(KUrl(d->userActionsFile), 0);
 }
 
-#include "plugin.moc"
diff --git a/kross/ui/view.cpp b/kross/ui/view.cpp
index 4681aff..9604436 100644
--- a/kross/ui/view.cpp
+++ b/kross/ui/view.cpp
@@ -558,4 +558,3 @@ void ActionCollectionView::slotRemove()
     KMessageBox::sorry(0, "TODO");
 }
 
-#include "view.moc"
diff --git a/kunitconversion/converter.cpp b/kunitconversion/converter.cpp
index 7f0136e..aba4be8 100644
--- a/kunitconversion/converter.cpp
+++ b/kunitconversion/converter.cpp
@@ -196,4 +196,3 @@ QList<UnitCategory*> Converter::categories() const
 
 }
 
-#include "converter.moc"
diff --git a/kutils/kcmodulecontainer.cpp b/kutils/kcmodulecontainer.cpp
index 7a72eec..d5919d9 100644
--- a/kutils/kcmodulecontainer.cpp
+++ b/kutils/kcmodulecontainer.cpp
@@ -18,7 +18,6 @@
 */
 
 #include "kcmodulecontainer.h"
-#include "kcmodulecontainer.moc"
 
 #include <QtGui/QLayout>
 #include <QtGui/QPixmap>
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp
index 96348b9..dc7e474 100644
--- a/kutils/kcmoduleproxy.cpp
+++ b/kutils/kcmoduleproxy.cpp
@@ -355,6 +355,6 @@ QSize KCModuleProxy::minimumSizeHint() const
 //X }
 
 /***************************************************************/
-#include "kcmoduleproxy.moc"
+#include "moc_kcmoduleproxy.cpp"
 
 // vim: ts=4
diff --git a/kutils/kcmultidialog.cpp b/kutils/kcmultidialog.cpp
index b68559a..fdcc696 100644
--- a/kutils/kcmultidialog.cpp
+++ b/kutils/kcmultidialog.cpp
@@ -503,4 +503,4 @@ void KCMultiDialog::setButtons(ButtonCodes buttonMask)
 }
 
 
-#include "kcmultidialog.moc"
+#include "moc_kcmultidialog.cpp"
diff --git a/kutils/kemoticons/kemoticons.cpp b/kutils/kemoticons/kemoticons.cpp
index b37b0d8..ca86d59 100644
--- a/kutils/kemoticons/kemoticons.cpp
+++ b/kutils/kemoticons/kemoticons.cpp
@@ -294,6 +294,6 @@ KEmoticonsTheme::ParseMode KEmoticons::parseMode()
     return (KEmoticonsTheme::ParseMode) config.readEntry("parseMode", \
int(KEmoticonsTheme::RelaxedParse));  }
 
-#include "kemoticons.moc"
+#include "moc_kemoticons.cpp"
 
 // kate: space-indent on; indent-width 4; replace-tabs on;
diff --git a/kutils/kemoticons/tests/kemoticontest.cpp \
b/kutils/kemoticons/tests/kemoticontest.cpp index 5faf019..e944f38 100644
--- a/kutils/kemoticons/tests/kemoticontest.cpp
+++ b/kutils/kemoticons/tests/kemoticontest.cpp
@@ -18,7 +18,6 @@
 
 // QTestLib for KDE
 #include "kemoticontest.h"
-#include "kemoticontest.moc"
 #include <qtest_kde.h>
 
 #include <stdlib.h>
diff --git a/kutils/kidletime/abstractsystempoller.cpp \
b/kutils/kidletime/abstractsystempoller.cpp index d2b5d09..7fd05ee 100644
--- a/kutils/kidletime/abstractsystempoller.cpp
+++ b/kutils/kidletime/abstractsystempoller.cpp
@@ -27,4 +27,3 @@ AbstractSystemPoller::~AbstractSystemPoller()
 {
 }
 
-#include "abstractsystempoller.moc"
diff --git a/kutils/kidletime/kidletime.cpp b/kutils/kidletime/kidletime.cpp
index 0b93a91..8625be9 100644
--- a/kutils/kidletime/kidletime.cpp
+++ b/kutils/kidletime/kidletime.cpp
@@ -266,4 +266,4 @@ QHash<int, int> KIdleTime::idleTimeouts() const
     return d->associations;
 }
 
-#include "kidletime.moc"
+#include "moc_kidletime.cpp"
diff --git a/kutils/kidletime/macpoller.cpp b/kutils/kidletime/macpoller.cpp
index c2a0845..9498c45 100644
--- a/kutils/kidletime/macpoller.cpp
+++ b/kutils/kidletime/macpoller.cpp
@@ -219,4 +219,3 @@ void MacPoller::simulateUserActivity()
     // TODO
 }
 
-#include "macpoller.moc"
diff --git a/kutils/kidletime/widgetbasedpoller.cpp \
b/kutils/kidletime/widgetbasedpoller.cpp index 651033e..b9f4878 100644
--- a/kutils/kidletime/widgetbasedpoller.cpp
+++ b/kutils/kidletime/widgetbasedpoller.cpp
@@ -166,4 +166,3 @@ void WidgetBasedPoller::stopCatchingIdleEvents()
     releaseInputLock();
 }
 
-#include "widgetbasedpoller.moc"
diff --git a/kutils/kidletime/windowspoller.cpp b/kutils/kidletime/windowspoller.cpp
index 223cb07..cf7eee4 100644
--- a/kutils/kidletime/windowspoller.cpp
+++ b/kutils/kidletime/windowspoller.cpp
@@ -89,4 +89,3 @@ void WindowsPoller::checkForIdle()
     }
 }
 
-#include "windowspoller.moc"
diff --git a/kutils/kidletime/xscreensaverbasedpoller.cpp \
b/kutils/kidletime/xscreensaverbasedpoller.cpp index 8cedc64..75402e3 100644
--- a/kutils/kidletime/xscreensaverbasedpoller.cpp
+++ b/kutils/kidletime/xscreensaverbasedpoller.cpp
@@ -72,4 +72,3 @@ void XScreensaverBasedPoller::simulateUserActivity()
     emit resumingFromIdle();
 }
 
-#include "xscreensaverbasedpoller.moc"
diff --git a/kutils/kidletime/xsyncbasedpoller.cpp \
b/kutils/kidletime/xsyncbasedpoller.cpp index 476f47e..d98b67f 100644
--- a/kutils/kidletime/xsyncbasedpoller.cpp
+++ b/kutils/kidletime/xsyncbasedpoller.cpp
@@ -279,4 +279,3 @@ void XSyncBasedPoller::simulateUserActivity()
     XResetScreenSaver(QX11Info::display());
 }
 
-#include "xsyncbasedpoller.moc"
diff --git a/kutils/kpluginselector.cpp b/kutils/kpluginselector.cpp
index 96057af..0fa3e1f 100644
--- a/kutils/kpluginselector.cpp
+++ b/kutils/kpluginselector.cpp
@@ -899,5 +899,5 @@ QFont KPluginSelector::Private::PluginDelegate::titleFont(const \
QFont &baseFont)  return retFont;
 }
 
-#include "kpluginselector_p.moc"
-#include "kpluginselector.moc"
+#include "moc_kpluginselector_p.cpp"
+#include "moc_kpluginselector.cpp"
diff --git a/kutils/kprintpreview.cpp b/kutils/kprintpreview.cpp
index fc997f6..dd15a95 100644
--- a/kutils/kprintpreview.cpp
+++ b/kutils/kprintpreview.cpp
@@ -170,7 +170,6 @@ bool KPrintPreview::isAvailable()
     return !KMimeTypeTrader::self()->query("application/pdf", \
"KParts/ReadOnlyPart").isEmpty();  }
 
-#include "kprintpreview.moc"
 
 
 
diff --git a/kutils/ksettings/componentsdialog.cpp \
b/kutils/ksettings/componentsdialog.cpp index 94c4be8..7c0fbe3 100644
--- a/kutils/ksettings/componentsdialog.cpp
+++ b/kutils/ksettings/componentsdialog.cpp
@@ -176,4 +176,4 @@ void ComponentsDialog::slotApply()
 
 } //namespace
 
-#include "componentsdialog_p.moc"
+#include "moc_componentsdialog_p.cpp"
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp
index 03a3104..922bb81 100644
--- a/kutils/ksettings/dialog.cpp
+++ b/kutils/ksettings/dialog.cpp
@@ -558,6 +558,6 @@ void DialogPrivate::_k_updateEnabledState(bool enabled)
 
 } //namespace
 
-#include "dialog.moc"
+#include "moc_dialog.cpp"
 
 // vim: ts=4
diff --git a/kutils/ksettings/dispatcher.cpp b/kutils/ksettings/dispatcher.cpp
index c5b88d6..041f86b 100644
--- a/kutils/ksettings/dispatcher.cpp
+++ b/kutils/ksettings/dispatcher.cpp
@@ -122,4 +122,4 @@ void DispatcherPrivate::unregisterComponent(QObject *obj)
 } // namespace Dispatcher
 } // namespace KSettings
 
-#include "dispatcher_p.moc"
+#include "moc_dispatcher_p.cpp"
diff --git a/kutils/ksettings/pluginpage.cpp b/kutils/ksettings/pluginpage.cpp
index be6a7ba..4739d26 100644
--- a/kutils/ksettings/pluginpage.cpp
+++ b/kutils/ksettings/pluginpage.cpp
@@ -86,4 +86,4 @@ void PluginPage::defaults()
 
 } //namespace
 
-#include "pluginpage.moc"
+#include "moc_pluginpage.cpp"
diff --git a/kutils/ksettingswidgetadaptor.cpp b/kutils/ksettingswidgetadaptor.cpp
index b683869..3c90da4 100644
--- a/kutils/ksettingswidgetadaptor.cpp
+++ b/kutils/ksettingswidgetadaptor.cpp
@@ -31,4 +31,3 @@ QString KSettingsWidgetAdaptor::applicationName()
 	return KGlobal::caption();
 }
 
-#include "ksettingswidgetadaptor.moc"
diff --git a/nepomuk/core/graphwrapper.cpp b/nepomuk/core/graphwrapper.cpp
index cd17113..3accbe3 100644
--- a/nepomuk/core/graphwrapper.cpp
+++ b/nepomuk/core/graphwrapper.cpp
@@ -124,4 +124,4 @@ void Nepomuk::GraphWrapper::storeGraph( const QUrl& graph )
     m_timer.start( 200 );
 }
 
-#include "graphwrapper_p.moc"
+#include "moc_graphwrapper_p.cpp"
diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
index 7e48a79..06e6bf1 100644
--- a/nepomuk/core/nepomukmainmodel.cpp
+++ b/nepomuk/core/nepomukmainmodel.cpp
@@ -278,4 +278,3 @@ Soprano::Node Nepomuk::MainModel::createBlankNode()
     return n;
 }
 
-#include "nepomukmainmodel.moc"
diff --git a/nepomuk/core/nepomukservice.cpp b/nepomuk/core/nepomukservice.cpp
index 196cbf9..782ee7a 100644
--- a/nepomuk/core/nepomukservice.cpp
+++ b/nepomuk/core/nepomukservice.cpp
@@ -59,4 +59,3 @@ void Nepomuk::Service::setServiceInitialized( bool success )
                                Q_ARG(bool, success) );
 }
 
-#include "nepomukservice.moc"
diff --git a/nepomuk/core/resourcefiltermodel.cpp \
b/nepomuk/core/resourcefiltermodel.cpp index 39da1bb..5c3e12e 100644
--- a/nepomuk/core/resourcefiltermodel.cpp
+++ b/nepomuk/core/resourcefiltermodel.cpp
@@ -188,4 +188,3 @@ Soprano::Error::ErrorCode \
Nepomuk::ResourceFilterModel::ensureResource( const QU  }
 }
 
-#include "resourcefiltermodel.moc"
diff --git a/nepomuk/core/resourcemanager.cpp b/nepomuk/core/resourcemanager.cpp
index a122020..601c87a 100644
--- a/nepomuk/core/resourcemanager.cpp
+++ b/nepomuk/core/resourcemanager.cpp
@@ -545,4 +545,4 @@ Nepomuk::ResourceManager* \
Nepomuk::ResourceManager::createManagerForModel( Sopra  return manager;
 }
 
-#include "resourcemanager.moc"
+#include "moc_resourcemanager.cpp"
diff --git a/nepomuk/query/queryserviceclient.cpp \
b/nepomuk/query/queryserviceclient.cpp index 3891ffe..c2860cd 100644
--- a/nepomuk/query/queryserviceclient.cpp
+++ b/nepomuk/query/queryserviceclient.cpp
@@ -438,5 +438,5 @@ QString Nepomuk::Query::QueryServiceClient::errorMessage() const
     return d->m_errorMessage;
 }
 
-#include "queryserviceclient.moc"
-#include "queryserviceclient_p.moc"
+#include "moc_queryserviceclient.cpp"
+#include "moc_queryserviceclient_p.cpp"
diff --git a/nepomuk/test/queryparsertest.cpp b/nepomuk/test/queryparsertest.cpp
index 74d9372..ba0c84a 100644
--- a/nepomuk/test/queryparsertest.cpp
+++ b/nepomuk/test/queryparsertest.cpp
@@ -210,4 +210,3 @@ void QueryParserTest::testQueryParserDetectFilenamePattern()
 
 QTEST_KDEMAIN_CORE( QueryParserTest )
 
-#include "queryparsertest.moc"
diff --git a/nepomuk/test/queryserializertest.cpp \
b/nepomuk/test/queryserializertest.cpp index 781f02c..038d086 100644
--- a/nepomuk/test/queryserializertest.cpp
+++ b/nepomuk/test/queryserializertest.cpp
@@ -289,4 +289,3 @@ void QuerySerializerTest::testSerialization()
 
 QTEST_KDEMAIN_CORE( QuerySerializerTest )
 
-#include "queryserializertest.moc"
diff --git a/nepomuk/test/querytest.cpp b/nepomuk/test/querytest.cpp
index 0a23a41..1e2cc11f 100644
--- a/nepomuk/test/querytest.cpp
+++ b/nepomuk/test/querytest.cpp
@@ -661,4 +661,3 @@ void QueryTest::testTermFromProperty()
 
 QTEST_KDEMAIN_CORE( QueryTest )
 
-#include "querytest.moc"
diff --git a/nepomuk/test/ratingpaintertestwidget.cpp \
b/nepomuk/test/ratingpaintertestwidget.cpp index 8d87798..7885b84 100644
--- a/nepomuk/test/ratingpaintertestwidget.cpp
+++ b/nepomuk/test/ratingpaintertestwidget.cpp
@@ -135,4 +135,3 @@ void RatingPainterTestWidget::slotChangeIcon()
     }
 }
 
-#include "ratingpaintertestwidget.moc"
diff --git a/nepomuk/test/resourcetest.cpp b/nepomuk/test/resourcetest.cpp
index 517c7d0..a96d0a7 100644
--- a/nepomuk/test/resourcetest.cpp
+++ b/nepomuk/test/resourcetest.cpp
@@ -485,4 +485,3 @@ void ResourceTest::testKickOffListRemoval()
 
 QTEST_KDEMAIN(ResourceTest, NoGUI)
 
-#include "resourcetest.moc"
diff --git a/nepomuk/test/tagwidgettest.cpp b/nepomuk/test/tagwidgettest.cpp
index 72e9b59..ef2ea1c 100644
--- a/nepomuk/test/tagwidgettest.cpp
+++ b/nepomuk/test/tagwidgettest.cpp
@@ -92,4 +92,3 @@ void TagWidgetTest::setReadOnly( bool enable )
     m_tagWidget->setModeFlags( enable ? flags | Nepomuk::TagWidget::ReadOnly : flags \
& ~Nepomuk::TagWidget::ReadOnly );  }
 
-#include "tagwidgettest.moc"
diff --git a/nepomuk/test/testbase.cpp b/nepomuk/test/testbase.cpp
index 7ad30cf..dcd657b 100644
--- a/nepomuk/test/testbase.cpp
+++ b/nepomuk/test/testbase.cpp
@@ -52,4 +52,3 @@ void TestBase::cleanup()
 {
 }
 
-#include "testbase.moc"
diff --git a/nepomuk/test/typefacettest.cpp b/nepomuk/test/typefacettest.cpp
index 72a374e..6410393 100644
--- a/nepomuk/test/typefacettest.cpp
+++ b/nepomuk/test/typefacettest.cpp
@@ -101,4 +101,3 @@ void TypeFacetTest::testSelectFromTerm()
 
 QTEST_KDEMAIN_CORE(TypeFacetTest)
 
-#include "typefacettest.moc"
diff --git a/nepomuk/ui/kedittagsdialog.cpp b/nepomuk/ui/kedittagsdialog.cpp
index dc5ace9..b3e23e4 100644
--- a/nepomuk/ui/kedittagsdialog.cpp
+++ b/nepomuk/ui/kedittagsdialog.cpp
@@ -272,4 +272,4 @@ void KEditTagsDialog::removeNewTagItem()
     }
 }
 
-#include "kedittagsdialog_p.moc"
+#include "moc_kedittagsdialog_p.cpp"
diff --git a/nepomuk/ui/ktagcloudwidget.cpp b/nepomuk/ui/ktagcloudwidget.cpp
index 8914827..bbfe939 100644
--- a/nepomuk/ui/ktagcloudwidget.cpp
+++ b/nepomuk/ui/ktagcloudwidget.cpp
@@ -176,4 +176,3 @@ void KTagCloudWidget::buildTagCloud()
     }
 }
 
-#include "ktagcloudwidget.moc"
diff --git a/nepomuk/ui/ktagdisplaywidget.cpp b/nepomuk/ui/ktagdisplaywidget.cpp
index e7f53bd..be6d820 100644
--- a/nepomuk/ui/ktagdisplaywidget.cpp
+++ b/nepomuk/ui/ktagdisplaywidget.cpp
@@ -116,4 +116,3 @@ void KTagDisplayWidget::clear()
     d->buildDisplay();
 }
 
-#include "ktagdisplaywidget.moc"
diff --git a/nepomuk/ui/nepomukmassupdatejob.cpp \
b/nepomuk/ui/nepomukmassupdatejob.cpp index cf7a9c6..07a003b 100644
--- a/nepomuk/ui/nepomukmassupdatejob.cpp
+++ b/nepomuk/ui/nepomukmassupdatejob.cpp
@@ -161,4 +161,3 @@ Nepomuk::MassUpdateJob* Nepomuk::MassUpdateJob::commentResources( \
const QList<Ne  return job;
 }
 
-#include "nepomukmassupdatejob.moc"
diff --git a/nepomuk/ui/tagcheckbox.cpp b/nepomuk/ui/tagcheckbox.cpp
index 6ff6411..ee670cb 100644
--- a/nepomuk/ui/tagcheckbox.cpp
+++ b/nepomuk/ui/tagcheckbox.cpp
@@ -164,4 +164,3 @@ void Nepomuk::TagCheckBox::enableUrlHover( bool enable )
     }
 }
 
-#include "tagcheckbox.moc"
diff --git a/nepomuk/ui/tagwidget.cpp b/nepomuk/ui/tagwidget.cpp
index f5254b4..a0615d0 100644
--- a/nepomuk/ui/tagwidget.cpp
+++ b/nepomuk/ui/tagwidget.cpp
@@ -395,4 +395,3 @@ void Nepomuk::TagWidget::slotTagStateChanged( const \
Nepomuk::Tag&, int )  }
 }
 
-#include "tagwidget.moc"
diff --git a/nepomuk/utils/datefacet.cpp b/nepomuk/utils/datefacet.cpp
index 386aa00..bef2d9d 100644
--- a/nepomuk/utils/datefacet.cpp
+++ b/nepomuk/utils/datefacet.cpp
@@ -417,4 +417,3 @@ DateRange Nepomuk::Utils::DateFacet::getCustomRange( bool* ok ) \
const  return drw->range();
 }
 
-#include "datefacet.moc"
diff --git a/nepomuk/utils/daterangeselectionwidget.cpp \
b/nepomuk/utils/daterangeselectionwidget.cpp index a3c4979..d354058 100644
--- a/nepomuk/utils/daterangeselectionwidget.cpp
+++ b/nepomuk/utils/daterangeselectionwidget.cpp
@@ -334,4 +334,4 @@ void DateRangeSelectionWidget::setRange( const DateRange& range )
     d->setRange( range );
 }
 
-#include "daterangeselectionwidget.moc"
+#include "moc_daterangeselectionwidget.cpp"
diff --git a/nepomuk/utils/dynamicresourcefacet.cpp \
b/nepomuk/utils/dynamicresourcefacet.cpp index 47dcf4f..3c044a9 100644
--- a/nepomuk/utils/dynamicresourcefacet.cpp
+++ b/nepomuk/utils/dynamicresourcefacet.cpp
@@ -419,4 +419,4 @@ Nepomuk::Resource \
Nepomuk::Utils::DynamicResourceFacet::resourceAt(int i) const  return Resource();
 }
 
-#include "dynamicresourcefacet.moc"
+#include "moc_dynamicresourcefacet.cpp"
diff --git a/nepomuk/utils/facet.cpp b/nepomuk/utils/facet.cpp
index 258c583..2869b97 100644
--- a/nepomuk/utils/facet.cpp
+++ b/nepomuk/utils/facet.cpp
@@ -196,4 +196,3 @@ Nepomuk::Utils::Facet* Nepomuk::Utils::Facet::createRatingFacet( \
QObject* parent  return facet;
 }
 
-#include "facet.moc"
diff --git a/nepomuk/utils/facetfiltermodel.cpp b/nepomuk/utils/facetfiltermodel.cpp
index e636a89..026e1f1 100644
--- a/nepomuk/utils/facetfiltermodel.cpp
+++ b/nepomuk/utils/facetfiltermodel.cpp
@@ -42,4 +42,3 @@ bool Nepomuk::Utils::FacetFilterModel::filterAcceptsRow(int \
                source_row, const QM
     return index.isValid() && \
index.data(FacetModel::FacetRole).value<Facet*>()->count() > 0;  }
 
-#include "facetfiltermodel.moc"
diff --git a/nepomuk/utils/facetmodel.cpp b/nepomuk/utils/facetmodel.cpp
index 30177c2..4ecca15 100644
--- a/nepomuk/utils/facetmodel.cpp
+++ b/nepomuk/utils/facetmodel.cpp
@@ -407,4 +407,4 @@ void Nepomuk::Utils::FacetModel::setClientQuery( const \
Nepomuk::Query::Query& qu  }
 }
 
-#include "facetmodel.moc"
+#include "moc_facetmodel.cpp"
diff --git a/nepomuk/utils/facetwidget.cpp b/nepomuk/utils/facetwidget.cpp
index 0a443fe..9082e0e 100644
--- a/nepomuk/utils/facetwidget.cpp
+++ b/nepomuk/utils/facetwidget.cpp
@@ -128,4 +128,3 @@ void Nepomuk::Utils::FacetWidget::clear()
     d->m_facetModel->clear();
 }
 
-#include "facetwidget.moc"
diff --git a/nepomuk/utils/proxyfacet.cpp b/nepomuk/utils/proxyfacet.cpp
index cb9d7b1..8242c6f 100644
--- a/nepomuk/utils/proxyfacet.cpp
+++ b/nepomuk/utils/proxyfacet.cpp
@@ -210,4 +210,3 @@ bool Nepomuk::Utils::ProxyFacet::facetConditionMet() const
     return d->m_facetConditionMet;
 }
 
-#include "proxyfacet.moc"
diff --git a/nepomuk/utils/resourcemodel.cpp b/nepomuk/utils/resourcemodel.cpp
index 1cbf6af..fac3d24 100644
--- a/nepomuk/utils/resourcemodel.cpp
+++ b/nepomuk/utils/resourcemodel.cpp
@@ -227,4 +227,3 @@ bool Nepomuk::Utils::ResourceModel::setData( const QModelIndex& \
index, const QVa  return QAbstractItemModel::setData(index, value, role);
 }
 
-#include "resourcemodel.moc"
diff --git a/nepomuk/utils/searchlineedit.cpp b/nepomuk/utils/searchlineedit.cpp
index 2941846..9e3d93e 100644
--- a/nepomuk/utils/searchlineedit.cpp
+++ b/nepomuk/utils/searchlineedit.cpp
@@ -154,4 +154,4 @@ Nepomuk::Query::Query Nepomuk::Utils::SearchLineEdit::query() \
const  return d->m_currentQuery;
 }
 
-#include "searchlineedit.moc"
+#include "moc_searchlineedit.cpp"
diff --git a/nepomuk/utils/searchwidget.cpp b/nepomuk/utils/searchwidget.cpp
index de609ab..72eeb39 100644
--- a/nepomuk/utils/searchwidget.cpp
+++ b/nepomuk/utils/searchwidget.cpp
@@ -313,4 +313,4 @@ QList<Nepomuk::Resource> \
Nepomuk::Utils::SearchWidget::searchResources( QWidget*  }
 }
 
-#include "searchwidget.moc"
+#include "moc_searchwidget.cpp"
diff --git a/nepomuk/utils/simplefacet.cpp b/nepomuk/utils/simplefacet.cpp
index 568f0ed..e784a28 100644
--- a/nepomuk/utils/simplefacet.cpp
+++ b/nepomuk/utils/simplefacet.cpp
@@ -263,4 +263,3 @@ bool Nepomuk::Utils::SimpleFacet::selectFromTerm( const \
Nepomuk::Query::Term& te  }
 }
 
-#include "simplefacet.moc"
diff --git a/nepomuk/utils/simpleresourcemodel.cpp \
b/nepomuk/utils/simpleresourcemodel.cpp index d56524a..669e7b5 100644
--- a/nepomuk/utils/simpleresourcemodel.cpp
+++ b/nepomuk/utils/simpleresourcemodel.cpp
@@ -167,4 +167,3 @@ void Nepomuk::Utils::SimpleResourceModel::clear()
     reset();
 }
 
-#include "simpleresourcemodel.moc"
diff --git a/nepomuk/utils/typefacet.cpp b/nepomuk/utils/typefacet.cpp
index fb11dc3..584bdb9 100644
--- a/nepomuk/utils/typefacet.cpp
+++ b/nepomuk/utils/typefacet.cpp
@@ -414,4 +414,3 @@ bool Nepomuk::Utils::TypeFacet::selectFromTerm(const \
Nepomuk::Query::Term &query  return false;
 }
 
-#include "typefacet.moc"
diff --git a/plasma/abstractdialogmanager.cpp b/plasma/abstractdialogmanager.cpp
index cf6cb51..50d78f1 100644
--- a/plasma/abstractdialogmanager.cpp
+++ b/plasma/abstractdialogmanager.cpp
@@ -52,4 +52,3 @@ void AbstractDialogManager::showDialog(QWidget *widget, \
Plasma::Applet *applet)  
 }
 
-#include "abstractdialogmanager.moc"
diff --git a/plasma/abstractrunner.cpp b/plasma/abstractrunner.cpp
index 57e94b1..95847ba 100644
--- a/plasma/abstractrunner.cpp
+++ b/plasma/abstractrunner.cpp
@@ -453,4 +453,3 @@ void AbstractRunnerPrivate::setupScriptSupport()
 
 } // Plasma namespace
 
-#include "abstractrunner.moc"
diff --git a/plasma/abstracttoolbox.cpp b/plasma/abstracttoolbox.cpp
index 818d2b0..a107e3b 100644
--- a/plasma/abstracttoolbox.cpp
+++ b/plasma/abstracttoolbox.cpp
@@ -113,5 +113,4 @@ void AbstractToolBox::reposition()
 
 } // plasma namespace
 
-#include "abstracttoolbox.moc"
 
diff --git a/plasma/animations/animation.cpp b/plasma/animations/animation.cpp
index 190b0b9..c3887e3 100644
--- a/plasma/animations/animation.cpp
+++ b/plasma/animations/animation.cpp
@@ -89,4 +89,3 @@ void Animation::updateCurrentTime(int currentTime)
 
 } //namespace Plasma
 
-#include "animation.moc"
diff --git a/plasma/animations/easinganimation.cpp \
b/plasma/animations/easinganimation.cpp index e21313c..125222f 100644
--- a/plasma/animations/easinganimation.cpp
+++ b/plasma/animations/easinganimation.cpp
@@ -35,5 +35,5 @@ void EasingAnimation::updateCurrentTime(int currentTime)
 
 } // namespace Plasma
 
-#include "easinganimation_p.moc"
+#include "moc_easinganimation_p.cpp"
 
diff --git a/plasma/animations/fade.cpp b/plasma/animations/fade.cpp
index 813cb18..44ef63d 100644
--- a/plasma/animations/fade.cpp
+++ b/plasma/animations/fade.cpp
@@ -83,4 +83,4 @@ void FadeAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "fade_p.moc"
+#include "moc_fade_p.cpp"
diff --git a/plasma/animations/geometry.cpp b/plasma/animations/geometry.cpp
index 9edf110..a417904 100644
--- a/plasma/animations/geometry.cpp
+++ b/plasma/animations/geometry.cpp
@@ -96,4 +96,4 @@ void GeometryAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "geometry_p.moc"
+#include "moc_geometry_p.cpp"
diff --git a/plasma/animations/grow.cpp b/plasma/animations/grow.cpp
index 1d9a009..40a576b 100644
--- a/plasma/animations/grow.cpp
+++ b/plasma/animations/grow.cpp
@@ -95,5 +95,5 @@ void GrowAnimation::updateState(QAbstractAnimation::State newState, \
QAbstractAni  
 } //namespace Plasma
 
-#include "grow_p.moc"
+#include "moc_grow_p.cpp"
 
diff --git a/plasma/animations/pixmaptransition.cpp \
b/plasma/animations/pixmaptransition.cpp index de59be2..c56d8ce 100644
--- a/plasma/animations/pixmaptransition.cpp
+++ b/plasma/animations/pixmaptransition.cpp
@@ -176,4 +176,4 @@ void PixmapTransition::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "pixmaptransition_p.moc"
+#include "moc_pixmaptransition_p.cpp"
diff --git a/plasma/animations/pulser.cpp b/plasma/animations/pulser.cpp
index 850b73b..7bacf34 100644
--- a/plasma/animations/pulser.cpp
+++ b/plasma/animations/pulser.cpp
@@ -141,4 +141,4 @@ void PulseAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "pulser_p.moc"
+#include "moc_pulser_p.cpp"
diff --git a/plasma/animations/rotation.cpp b/plasma/animations/rotation.cpp
index ea957b8..2930cab 100644
--- a/plasma/animations/rotation.cpp
+++ b/plasma/animations/rotation.cpp
@@ -164,4 +164,4 @@ void RotationAnimation::updateEffectiveTime(int currentTime)
 
 }
 
-#include "rotation_p.moc"
+#include "moc_rotation_p.cpp"
diff --git a/plasma/animations/rotationstacked.cpp \
b/plasma/animations/rotationstacked.cpp index 2052415..70cac45 100644
--- a/plasma/animations/rotationstacked.cpp
+++ b/plasma/animations/rotationstacked.cpp
@@ -185,4 +185,4 @@ void RotationStackedAnimation::updateTransformations()
 
 } //namespace Plasma
 
-#include "rotationstacked_p.moc"
+#include "moc_rotationstacked_p.cpp"
diff --git a/plasma/animations/slide.cpp b/plasma/animations/slide.cpp
index cc0e022..ee350f5 100644
--- a/plasma/animations/slide.cpp
+++ b/plasma/animations/slide.cpp
@@ -126,4 +126,4 @@ void SlideAnimation::updateState(QAbstractAnimation::State \
newState, QAbstractAn  
 } //namespace Plasma
 
-#include "slide_p.moc"
+#include "moc_slide_p.cpp"
diff --git a/plasma/applet.cpp b/plasma/applet.cpp
index acc9e47..d59c6ab 100644
--- a/plasma/applet.cpp
+++ b/plasma/applet.cpp
@@ -2581,5 +2581,4 @@ QSet<QString> AppletPrivate::s_customCategories;
 
 } // Plasma namespace
 
-#include "applet.moc"
-#include "private/applet_p.moc"
+#include "moc_applet_p.cpp"
diff --git a/plasma/containment.cpp b/plasma/containment.cpp
index 9709cfb..daf8613 100644
--- a/plasma/containment.cpp
+++ b/plasma/containment.cpp
@@ -2427,5 +2427,4 @@ QHash<QString, ContainmentActions*> * \
ContainmentPrivate::actionPlugins()  
 } // Plasma namespace
 
-#include "containment.moc"
 
diff --git a/plasma/containmentactions.cpp b/plasma/containmentactions.cpp
index 0dac72a..0bb3c39 100644
--- a/plasma/containmentactions.cpp
+++ b/plasma/containmentactions.cpp
@@ -332,4 +332,3 @@ void ContainmentActions::setContainment(Containment \
*newContainment) {  
 } // Plasma namespace
 
-#include "containmentactions.moc"
diff --git a/plasma/corona.cpp b/plasma/corona.cpp
index 7a0faa7..6f880da 100644
--- a/plasma/corona.cpp
+++ b/plasma/corona.cpp
@@ -1046,5 +1046,4 @@ QList<Plasma::Containment *> CoronaPrivate::importLayout(const \
KConfigGroup &con  
 } // namespace Plasma
 
-#include "corona.moc"
 
diff --git a/plasma/datacontainer.cpp b/plasma/datacontainer.cpp
index 0f80285..36f08b5 100644
--- a/plasma/datacontainer.cpp
+++ b/plasma/datacontainer.cpp
@@ -356,5 +356,4 @@ void DataContainer::timerEvent(QTimerEvent * event)
 
 } // Plasma namespace
 
-#include "datacontainer.moc"
 
diff --git a/plasma/dataengine.cpp b/plasma/dataengine.cpp
index 8487020..680abe7 100644
--- a/plasma/dataengine.cpp
+++ b/plasma/dataengine.cpp
@@ -710,4 +710,3 @@ void DataEnginePrivate::setupScriptSupport()
 
 }
 
-#include "dataengine.moc"
diff --git a/plasma/dataenginemanager.cpp b/plasma/dataenginemanager.cpp
index e001410..aa7e33f 100644
--- a/plasma/dataenginemanager.cpp
+++ b/plasma/dataenginemanager.cpp
@@ -250,4 +250,3 @@ void DataEngineManager::timerEvent(QTimerEvent *)
 
 } // namespace Plasma
 
-#include "dataenginemanager.moc"
diff --git a/plasma/delegate.cpp b/plasma/delegate.cpp
index ec35ddb..bdf8c5a 100644
--- a/plasma/delegate.cpp
+++ b/plasma/delegate.cpp
@@ -489,5 +489,4 @@ bool Delegate::showToolTip() const
 
 }
 
-#include "delegate.moc"
 
diff --git a/plasma/dialog.cpp b/plasma/dialog.cpp
index 775ae6a..4d24eab 100644
--- a/plasma/dialog.cpp
+++ b/plasma/dialog.cpp
@@ -868,4 +868,3 @@ void Dialog::setAspectRatioMode(Plasma::AspectRatioMode mode)
 }
 
 }
-#include "dialog.moc"
diff --git a/plasma/framesvg.cpp b/plasma/framesvg.cpp
index d25dfef..0fd13de 100644
--- a/plasma/framesvg.cpp
+++ b/plasma/framesvg.cpp
@@ -1093,4 +1093,3 @@ int FrameData::refcount() const
 
 } // Plasma namespace
 
-#include "framesvg.moc"
diff --git a/plasma/intoJavascriptEngine/bindings/animationgroup.cpp \
b/plasma/intoJavascriptEngine/bindings/animationgroup.cpp index 7071c6b..3a1b7e4 \
                100644
--- a/plasma/intoJavascriptEngine/bindings/animationgroup.cpp
+++ b/plasma/intoJavascriptEngine/bindings/animationgroup.cpp
@@ -104,4 +104,4 @@ void SequentialAnimationGroup::removeAnimation(QAbstractAnimation \
*animation)  
 } // namespace Plasma
 
-#include "animationgroup_p.moc"
+#include "moc_animationgroup_p.cpp"
diff --git a/plasma/intoJavascriptEngine/javascriptanimation.cpp \
b/plasma/intoJavascriptEngine/javascriptanimation.cpp index d472b06..716b3ce 100644
--- a/plasma/intoJavascriptEngine/javascriptanimation.cpp
+++ b/plasma/intoJavascriptEngine/javascriptanimation.cpp
@@ -125,4 +125,4 @@ void JavascriptAnimation::updateEffectiveTime(int currentTime)
 
 } //namespace Plasma
 
-#include "javascriptanimation_p.moc"
+#include "moc_javascriptanimation_p.cpp"
diff --git a/plasma/packagestructure.cpp b/plasma/packagestructure.cpp
index 627b8b5..4159e8a 100644
--- a/plasma/packagestructure.cpp
+++ b/plasma/packagestructure.cpp
@@ -57,5 +57,4 @@ bool PackageStructure::uninstallPackage(Package *package, const \
QString &package  
 }
 
-#include "packagestructure.moc"
 
diff --git a/plasma/popupapplet.cpp b/plasma/popupapplet.cpp
index 9fce479..54d22ba 100644
--- a/plasma/popupapplet.cpp
+++ b/plasma/popupapplet.cpp
@@ -895,5 +895,4 @@ void PopupAppletPrivate::updateDialogPosition(bool move)
 
 } // Plasma namespace
 
-#include "popupapplet.moc"
 
diff --git a/plasma/private/animablegraphicswebview.cpp \
b/plasma/private/animablegraphicswebview.cpp index d372caf..0a74a60 100644
--- a/plasma/private/animablegraphicswebview.cpp
+++ b/plasma/private/animablegraphicswebview.cpp
@@ -189,5 +189,5 @@ void AnimableGraphicsWebView::setScrollPositionY(qreal position)
 }
 
 
-#include "animablegraphicswebview_p.moc"
+#include "moc_animablegraphicswebview_p.cpp"
 
diff --git a/plasma/private/applethandle.cpp b/plasma/private/applethandle.cpp
index 59dfd38..4d9bb70 100644
--- a/plasma/private/applethandle.cpp
+++ b/plasma/private/applethandle.cpp
@@ -1064,5 +1064,5 @@ void AppletHandle::calculateSize()
 
 } // Plasma Namespace
 
-#include "applethandle_p.moc"
+#include "moc_applethandle_p.cpp"
 
diff --git a/plasma/private/datacontainer_p.cpp b/plasma/private/datacontainer_p.cpp
index c4576e4..908ebe7 100644
--- a/plasma/private/datacontainer_p.cpp
+++ b/plasma/private/datacontainer_p.cpp
@@ -166,5 +166,4 @@ void SignalRelay::timerEvent(QTimerEvent *event)
 
 } // Plasma namespace
 
-#include "datacontainer_p.moc"
 
diff --git a/plasma/private/dataengineconsumer.cpp \
b/plasma/private/dataengineconsumer.cpp index 2de105f..d078a00 100644
--- a/plasma/private/dataengineconsumer.cpp
+++ b/plasma/private/dataengineconsumer.cpp
@@ -159,6 +159,6 @@ DataEngine *DataEngineConsumer::remoteDataEngine(const KUrl \
&location, const QSt  
 } // namespace Plasma
 
-#include "dataengineconsumer_p.moc"
+#include "moc_dataengineconsumer_p.cpp"
 
 
diff --git a/plasma/private/dataengineservice.cpp \
b/plasma/private/dataengineservice.cpp index 6a0da45..7335f2d 100644
--- a/plasma/private/dataengineservice.cpp
+++ b/plasma/private/dataengineservice.cpp
@@ -55,5 +55,5 @@ void DataEngineService::sourceAdded(QString source)
 
 }
 
-#include "dataengineservice_p.moc"
+#include "moc_dataengineservice_p.cpp"
 
diff --git a/plasma/private/effectwatcher.cpp b/plasma/private/effectwatcher.cpp
index 46854a7..48f803d 100644
--- a/plasma/private/effectwatcher.cpp
+++ b/plasma/private/effectwatcher.cpp
@@ -87,4 +87,4 @@ bool EffectWatcher::isEffectActive() const
 
 }
 
-#include "effectwatcher_p.moc"
+#include "moc_effectwatcher_p.cpp"
diff --git a/plasma/private/getsource.cpp b/plasma/private/getsource.cpp
index 9e28e7d..c19664e 100644
--- a/plasma/private/getsource.cpp
+++ b/plasma/private/getsource.cpp
@@ -79,5 +79,5 @@ void GetSource::start()
 
 }
 
-#include "getsource_p.moc"
+#include "moc_getsource_p.cpp"
 
diff --git a/plasma/private/nativetabbar.cpp b/plasma/private/nativetabbar.cpp
index 094be43..f7affc5 100644
--- a/plasma/private/nativetabbar.cpp
+++ b/plasma/private/nativetabbar.cpp
@@ -632,5 +632,5 @@ void NativeTabBar::wheelEvent(QWheelEvent *event)
 
 } // namespace Plasma
 
-#include "nativetabbar_p.moc"
+#include "moc_nativetabbar_p.cpp"
 
diff --git a/plasma/private/packages.cpp b/plasma/private/packages.cpp
index 7bcfcd7..a52fcc0 100644
--- a/plasma/private/packages.cpp
+++ b/plasma/private/packages.cpp
@@ -370,5 +370,5 @@ void GenericPackage::initPackage(Package *package)
 
 } // namespace Plasma
 
-#include "packages_p.moc"
+#include "moc_packages_p.cpp"
 
diff --git a/plasma/private/plasmoidservice.cpp b/plasma/private/plasmoidservice.cpp
index 10f9e02..bb2d17c 100644
--- a/plasma/private/plasmoidservice.cpp
+++ b/plasma/private/plasmoidservice.cpp
@@ -143,5 +143,5 @@ Plasma::ServiceJob* PlasmoidService::createJob(const QString& \
operation, QHash<Q  
 }
 
-#include "plasmoidservice_p.moc"
+#include "moc_plasmoidservice_p.cpp"
 
diff --git a/plasma/private/qtjolie-branch/qtjolie/clientthread.cpp \
b/plasma/private/qtjolie-branch/qtjolie/clientthread.cpp index c165dcd..9d45947 \
                100644
--- a/plasma/private/qtjolie-branch/qtjolie/clientthread.cpp
+++ b/plasma/private/qtjolie-branch/qtjolie/clientthread.cpp
@@ -88,4 +88,4 @@ void ClientThread::run()
     delete m_socket;
 }
 
-#include "clientthread_p.moc"
+#include "moc_clientthread_p.cpp"
diff --git a/plasma/private/qtjolie-branch/qtjolie/serverthread.cpp \
b/plasma/private/qtjolie-branch/qtjolie/serverthread.cpp index a609e2f..30aa392 \
                100644
--- a/plasma/private/qtjolie-branch/qtjolie/serverthread.cpp
+++ b/plasma/private/qtjolie-branch/qtjolie/serverthread.cpp
@@ -109,4 +109,4 @@ void ServerThread::run()
     delete m_serverSocket;
 }
 
-#include "serverthread_p.moc"
+#include "moc_serverthread_p.cpp"
diff --git a/plasma/private/remotedataengine.cpp \
b/plasma/private/remotedataengine.cpp index ccdff03..95c3562 100644
--- a/plasma/private/remotedataengine.cpp
+++ b/plasma/private/remotedataengine.cpp
@@ -243,5 +243,5 @@ void RemoteDataEngine::updateSources()
 
 }
 
-#include "remotedataengine_p.moc"
+#include "moc_remotedataengine_p.cpp"
 
diff --git a/plasma/private/remoteservice.cpp b/plasma/private/remoteservice.cpp
index c70389d..32d4c71 100644
--- a/plasma/private/remoteservice.cpp
+++ b/plasma/private/remoteservice.cpp
@@ -307,4 +307,4 @@ Jolie::Message RemoteService::signMessage(const Jolie::Message \
&message) const  
 } //namespace Plasma
 
-#include "remoteservice_p.moc"
+#include "moc_remoteservice_p.cpp"
diff --git a/plasma/private/runnerjobs.cpp b/plasma/private/runnerjobs.cpp
index 6a8a771..74912a3 100644
--- a/plasma/private/runnerjobs.cpp
+++ b/plasma/private/runnerjobs.cpp
@@ -216,4 +216,3 @@ void DelayedJobCleaner::checkIfFinished()
 
 } // Plasma namespace
 
-// #include "runnerjobs.moc"
diff --git a/plasma/private/serviceprovider.cpp b/plasma/private/serviceprovider.cpp
index adc78e8..dd3f5d5 100644
--- a/plasma/private/serviceprovider.cpp
+++ b/plasma/private/serviceprovider.cpp
@@ -530,4 +530,4 @@ void ServiceProvider::authorizationFailed(const Jolie::Message \
&message, const Q  
 } //namespace Plasma
 
-#include "serviceprovider_p.moc"
+#include "moc_serviceprovider_p.cpp"
diff --git a/plasma/private/storage.cpp b/plasma/private/storage.cpp
index 67054e5..3b86d48 100644
--- a/plasma/private/storage.cpp
+++ b/plasma/private/storage.cpp
@@ -156,4 +156,4 @@ Storage::~Storage()
 {
 }
 
-#include "storage_p.moc"
+#include "moc_storage_p.cpp"
diff --git a/plasma/private/storagethread.cpp b/plasma/private/storagethread.cpp
index 417e2ff..9675411 100644
--- a/plasma/private/storagethread.cpp
+++ b/plasma/private/storagethread.cpp
@@ -328,4 +328,4 @@ void StorageThread::run()
 
 }
 
-#include "storagethread_p.moc"
+#include "moc_storagethread_p.cpp"
diff --git a/plasma/private/style.cpp b/plasma/private/style.cpp
index adfa9bd..3d923f7 100644
--- a/plasma/private/style.cpp
+++ b/plasma/private/style.cpp
@@ -383,6 +383,6 @@ QSize Style::sizeFromContents(ContentsType type, const \
QStyleOption *option,  
 }
 
-#include "style_p.moc"
+#include "moc_style_p.cpp"
 
 
diff --git a/plasma/private/themedwidgetinterface.cpp \
b/plasma/private/themedwidgetinterface.cpp index 399033c..9910620 100644
--- a/plasma/private/themedwidgetinterface.cpp
+++ b/plasma/private/themedwidgetinterface.cpp
@@ -81,5 +81,5 @@ void PaletteHelper::generatePalettes()
 
 } // namespace Plasma
 
-#include "themedwidgetinterface_p.moc"
+#include "moc_themedwidgetinterface_p.cpp"
 
diff --git a/plasma/private/tooltip.cpp b/plasma/private/tooltip.cpp
index 3117281..4e1266c 100644
--- a/plasma/private/tooltip.cpp
+++ b/plasma/private/tooltip.cpp
@@ -404,4 +404,4 @@ void ToolTip::updateTheme()
 
 } // namespace Plasma
 
-#include "tooltip_p.moc"
+#include "moc_tooltip_p.cpp"
diff --git a/plasma/private/wallpaperrenderthread.cpp \
b/plasma/private/wallpaperrenderthread.cpp index 5599e5c..a037c31 100644
--- a/plasma/private/wallpaperrenderthread.cpp
+++ b/plasma/private/wallpaperrenderthread.cpp
@@ -273,5 +273,5 @@ void WallpaperRenderThread::run()
 
 } // namespace Plasma
 
-#include "wallpaperrenderthread_p.moc"
+#include "moc_wallpaperrenderthread_p.cpp"
 
diff --git a/plasma/private/windowpreview.cpp b/plasma/private/windowpreview.cpp
index 8df0f2e..d11bb8a 100644
--- a/plasma/private/windowpreview.cpp
+++ b/plasma/private/windowpreview.cpp
@@ -231,4 +231,4 @@ void WindowPreview::leaveEvent(QEvent *event)
 
 } // namespace Plasma
 
-#include "windowpreview_p.moc"
+#include "moc_windowpreview_p.cpp"
diff --git a/plasma/private/windowshadows.cpp b/plasma/private/windowshadows.cpp
index 28b1d40..0bb0bd4 100644
--- a/plasma/private/windowshadows.cpp
+++ b/plasma/private/windowshadows.cpp
@@ -231,5 +231,5 @@ void WindowShadows::Private::clearShadow(const QWidget *window)
 
 } // namespace Plasma
 
-#include "windowshadows_p.moc"
+#include "moc_windowshadows_p.cpp"
 
diff --git a/plasma/remote/accessappletjob.cpp b/plasma/remote/accessappletjob.cpp
index 26da7f6..785b087 100644
--- a/plasma/remote/accessappletjob.cpp
+++ b/plasma/remote/accessappletjob.cpp
@@ -205,5 +205,4 @@ void AccessAppletJob::start()
 
 } // namespace Plasma
 
-#include "accessappletjob.moc"
 
diff --git a/plasma/remote/accessmanager.cpp b/plasma/remote/accessmanager.cpp
index 766c968..420de6c 100644
--- a/plasma/remote/accessmanager.cpp
+++ b/plasma/remote/accessmanager.cpp
@@ -271,4 +271,3 @@ void \
AccessManagerPrivate::slotRemoveService(DNSSD::RemoteService::Ptr service)  
 } // Plasma namespace
 
-#include "accessmanager.moc"
diff --git a/plasma/remote/authorizationmanager.cpp \
b/plasma/remote/authorizationmanager.cpp index 73974c6..17b72b4 100644
--- a/plasma/remote/authorizationmanager.cpp
+++ b/plasma/remote/authorizationmanager.cpp
@@ -314,4 +314,3 @@ void AuthorizationManagerPrivate::addCredentials(const \
Credentials &identity)  
 } // Plasma namespace
 
-#include "authorizationmanager.moc"
diff --git a/plasma/remote/authorizationrule.cpp \
b/plasma/remote/authorizationrule.cpp index ccb4a12..bac6a29 100644
--- a/plasma/remote/authorizationrule.cpp
+++ b/plasma/remote/authorizationrule.cpp
@@ -168,4 +168,3 @@ QString AuthorizationRule::serviceName() const
 
 } // Plasma namespace
 
-#include "authorizationrule.moc"
diff --git a/plasma/remote/clientpinrequest.cpp b/plasma/remote/clientpinrequest.cpp
index c77fe4a..5686505 100644
--- a/plasma/remote/clientpinrequest.cpp
+++ b/plasma/remote/clientpinrequest.cpp
@@ -74,5 +74,4 @@ QString ClientPinRequest::pin() const
 
 } // Plasma namespace
 
-#include "clientpinrequest.moc"
 
diff --git a/plasma/remote/pinpairingdialog.cpp b/plasma/remote/pinpairingdialog.cpp
index d2bf9a5..95406bd 100644
--- a/plasma/remote/pinpairingdialog.cpp
+++ b/plasma/remote/pinpairingdialog.cpp
@@ -119,4 +119,4 @@ PinPairingDialog::~PinPairingDialog()
 
 }
 
-#include "pinpairingdialog_p.moc"
+#include "moc_pinpairingdialog_p.cpp"
diff --git a/plasma/remote/serviceaccessjob.cpp b/plasma/remote/serviceaccessjob.cpp
index 1169db6..4ff0ffc 100644
--- a/plasma/remote/serviceaccessjob.cpp
+++ b/plasma/remote/serviceaccessjob.cpp
@@ -72,5 +72,4 @@ void ServiceAccessJob::start()
 
 } // namespace Plasma
 
-#include "serviceaccessjob.moc"
 
diff --git a/plasma/runnercontext.cpp b/plasma/runnercontext.cpp
index 1a14edf..160dd7a 100644
--- a/plasma/runnercontext.cpp
+++ b/plasma/runnercontext.cpp
@@ -547,4 +547,3 @@ void RunnerContext::run(const QueryMatch &match)
 
 } // Plasma namespace
 
-#include "runnercontext.moc"
diff --git a/plasma/runnermanager.cpp b/plasma/runnermanager.cpp
index be841f0..c008df8 100644
--- a/plasma/runnermanager.cpp
+++ b/plasma/runnermanager.cpp
@@ -835,4 +835,3 @@ void RunnerManager::reset()
 
 } // Plasma namespace
 
-#include "runnermanager.moc"
diff --git a/plasma/scripting/appletscript.cpp b/plasma/scripting/appletscript.cpp
index c4a859e..d0b733f 100644
--- a/plasma/scripting/appletscript.cpp
+++ b/plasma/scripting/appletscript.cpp
@@ -249,4 +249,3 @@ void AppletScript::setContainmentType(Containment::Type type)
 
 } // Plasma namespace
 
-#include "appletscript.moc"
diff --git a/plasma/scripting/dataenginescript.cpp \
b/plasma/scripting/dataenginescript.cpp index 1de690d..4c11f46 100644
--- a/plasma/scripting/dataenginescript.cpp
+++ b/plasma/scripting/dataenginescript.cpp
@@ -218,4 +218,3 @@ void DataEngineScript::forceImmediateUpdateOfAllVisualizations()
 
 } // Plasma namespace
 
-#include "dataenginescript.moc"
diff --git a/plasma/scripting/runnerscript.cpp b/plasma/scripting/runnerscript.cpp
index 672903c..adf818e 100644
--- a/plasma/scripting/runnerscript.cpp
+++ b/plasma/scripting/runnerscript.cpp
@@ -188,4 +188,3 @@ QString RunnerScript::mainScript() const
 
 } // Plasma namespace
 
-#include "runnerscript.moc"
diff --git a/plasma/scripting/wallpaperscript.cpp \
b/plasma/scripting/wallpaperscript.cpp index e716a87..483a26f 100644
--- a/plasma/scripting/wallpaperscript.cpp
+++ b/plasma/scripting/wallpaperscript.cpp
@@ -221,4 +221,3 @@ void WallpaperScript::renderCompleted(const QImage &image)
 
 } // Plasma namespace
 
-#include "wallpaperscript.moc"
diff --git a/plasma/service.cpp b/plasma/service.cpp
index 4fae57b..0b728ab 100644
--- a/plasma/service.cpp
+++ b/plasma/service.cpp
@@ -417,5 +417,4 @@ void Service::registerOperationsScheme()
 
 } // namespace Plasma
 
-#include "service.moc"
 
diff --git a/plasma/servicejob.cpp b/plasma/servicejob.cpp
index fc02d68..899c053 100644
--- a/plasma/servicejob.cpp
+++ b/plasma/servicejob.cpp
@@ -99,5 +99,4 @@ void ServiceJob::start()
 
 } // namespace Plasma
 
-#include "servicejob.moc"
 
diff --git a/plasma/svg.cpp b/plasma/svg.cpp
index 368fd7a..5a9806b 100644
--- a/plasma/svg.cpp
+++ b/plasma/svg.cpp
@@ -825,5 +825,4 @@ Theme *Svg::theme() const
 
 } // Plasma namespace
 
-#include "svg.moc"
 
diff --git a/plasma/tests/configloadertest.cpp b/plasma/tests/configloadertest.cpp
index 6737cae..987764c 100644
--- a/plasma/tests/configloadertest.cpp
+++ b/plasma/tests/configloadertest.cpp
@@ -209,5 +209,4 @@ void ConfigLoaderTest::ulongLongDefaultValue()
 
 QTEST_KDEMAIN(ConfigLoaderTest, NoGUI)
 
-//#include "configloadertest.moc"
 
diff --git a/plasma/tests/packagestructuretest.cpp \
b/plasma/tests/packagestructuretest.cpp index eb3327e..6fec184 100644
--- a/plasma/tests/packagestructuretest.cpp
+++ b/plasma/tests/packagestructuretest.cpp
@@ -171,5 +171,4 @@ void PackageStructureTest::mimeTypes()
 
 QTEST_KDEMAIN(PackageStructureTest, NoGUI)
 
-//#include "packagestructuretest.moc"
 
diff --git a/plasma/tests/testcontainmentactionsplugin/test.cpp \
b/plasma/tests/testcontainmentactionsplugin/test.cpp index 05066b6..fb5bb66 100644
--- a/plasma/tests/testcontainmentactionsplugin/test.cpp
+++ b/plasma/tests/testcontainmentactionsplugin/test.cpp
@@ -104,4 +104,3 @@ void ContextTest::save(KConfigGroup &config)
 }
 
 
-#include "test.moc"
diff --git a/plasma/tests/testengine/testengine.cpp \
b/plasma/tests/testengine/testengine.cpp index a94720f..c65514d 100644
--- a/plasma/tests/testengine/testengine.cpp
+++ b/plasma/tests/testengine/testengine.cpp
@@ -175,4 +175,3 @@ bool TestEngine::sourceRequestEvent(const QString &source)
 } // sourceRequestEvent()
 
 
-#include "testengine.moc"
diff --git a/plasma/tooltipmanager.cpp b/plasma/tooltipmanager.cpp
index d35b515..4e6446c 100644
--- a/plasma/tooltipmanager.cpp
+++ b/plasma/tooltipmanager.cpp
@@ -495,5 +495,4 @@ bool ToolTipManager::eventFilter(QObject *watched, QEvent *event)
 
 } // Plasma namespace
 
-#include "tooltipmanager.moc"
 
diff --git a/plasma/view.cpp b/plasma/view.cpp
index f232b58..6dde8b7 100644
--- a/plasma/view.cpp
+++ b/plasma/view.cpp
@@ -418,5 +418,4 @@ View * View::topLevelViewAt(const QPoint & pos)
 
 } // namespace Plasma
 
-#include "view.moc"
 
diff --git a/plasma/wallpaper.cpp b/plasma/wallpaper.cpp
index ceadc29..769cd6a 100644
--- a/plasma/wallpaper.cpp
+++ b/plasma/wallpaper.cpp
@@ -663,5 +663,4 @@ Package Wallpaper::package() const
 
 } // Plasma namespace
 
-#include "wallpaper.moc"
-#include "private/wallpaper_p.moc"
+#include "moc_wallpaper_p.cpp"
diff --git a/plasma/widgets/flashinglabel.cpp b/plasma/widgets/flashinglabel.cpp
index 210207d..dce4624 100644
--- a/plasma/widgets/flashinglabel.cpp
+++ b/plasma/widgets/flashinglabel.cpp
@@ -328,4 +328,3 @@ void FlashingLabelPrivate::setPalette()
     q->update();
 }
 
-#include "flashinglabel.moc"
diff --git a/plasma/widgets/iconwidget.cpp b/plasma/widgets/iconwidget.cpp
index da7a47a..4656add 100644
--- a/plasma/widgets/iconwidget.cpp
+++ b/plasma/widgets/iconwidget.cpp
@@ -1616,5 +1616,4 @@ void IconWidget::changeEvent(QEvent *event)
 
 } // namespace Plasma
 
-#include "iconwidget.moc"
-#include "iconwidget_p.moc"
+#include "moc_iconwidget_p.cpp"
diff --git a/plasma/widgets/itembackground.cpp b/plasma/widgets/itembackground.cpp
index 960578d..75ed506 100644
--- a/plasma/widgets/itembackground.cpp
+++ b/plasma/widgets/itembackground.cpp
@@ -340,6 +340,5 @@ void ItemBackgroundPrivate::refreshCurrentTarget()
 } // Plasma namespace
 
 
-#include "itembackground.moc"
 
 
diff --git a/plasma/widgets/meter.cpp b/plasma/widgets/meter.cpp
index d1007e5..4e45a38 100644
--- a/plasma/widgets/meter.cpp
+++ b/plasma/widgets/meter.cpp
@@ -553,5 +553,4 @@ QSizeF Meter::sizeHint(Qt::SizeHint which, const QSizeF \
&constraint) const  
 } // End of namepace
 
-#include "meter.moc"
-#include "../private/meter_p.moc"
+#include "moc_meter_p.cpp"
diff --git a/plasma/widgets/separator.cpp b/plasma/widgets/separator.cpp
index 6af93b8..3c1bf46 100644
--- a/plasma/widgets/separator.cpp
+++ b/plasma/widgets/separator.cpp
@@ -96,4 +96,3 @@ QSizeF Separator::sizeHint(Qt::SizeHint which, const QSizeF & \
constraint) const  
 } // Plasma namespace
 
-#include "separator.moc"
diff --git a/plasma/widgets/signalplotter.cpp b/plasma/widgets/signalplotter.cpp
index fdf3ab5..2721b59 100644
--- a/plasma/widgets/signalplotter.cpp
+++ b/plasma/widgets/signalplotter.cpp
@@ -1112,5 +1112,4 @@ QString SignalPlotter::lastValueAsString(uint i) const
 
 } // Plasma namespace
 
-#include "signalplotter.moc"
 
diff --git a/plasma/widgets/svgwidget.cpp b/plasma/widgets/svgwidget.cpp
index d55a998..093a615 100644
--- a/plasma/widgets/svgwidget.cpp
+++ b/plasma/widgets/svgwidget.cpp
@@ -139,4 +139,3 @@ QSizeF SvgWidget::sizeHint(Qt::SizeHint which, const QSizeF & \
constraint) const  
 } // Plasma namespace
 
-#include "svgwidget.moc"
diff --git a/plasma/widgets/webview.cpp b/plasma/widgets/webview.cpp
index f85881c..77f96b4 100644
--- a/plasma/widgets/webview.cpp
+++ b/plasma/widgets/webview.cpp
@@ -333,5 +333,4 @@ void WebViewPrivate::loadingFinished(bool success)
 
 } // namespace Plasma
 
-#include "webview.moc"
 
diff --git a/security/crypto/certexport.cpp b/security/crypto/certexport.cpp
index b4933e7..6d41625 100644
--- a/security/crypto/certexport.cpp
+++ b/security/crypto/certexport.cpp
@@ -154,5 +154,4 @@ void KCertExport::slotTextChanged(const QString& x) {
 }
 
 
-#include "certexport.moc"
 
diff --git a/security/crypto/crypto.cpp b/security/crypto/crypto.cpp
index 465f1dd..f11e552 100644
--- a/security/crypto/crypto.cpp
+++ b/security/crypto/crypto.cpp
@@ -2406,4 +2406,3 @@ bool noneDef, noneHost;
 
 }
 
-#include "crypto.moc"
diff --git a/security/crypto/kdatetimedlg.cpp b/security/crypto/kdatetimedlg.cpp
index 08870c9..89d2a16 100644
--- a/security/crypto/kdatetimedlg.cpp
+++ b/security/crypto/kdatetimedlg.cpp
@@ -116,5 +116,4 @@ void KDateTimeDlg::setDateTime(const QDateTime& qdatetime) {
 }
 
 
-#include "kdatetimedlg.moc"
 


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic