diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index 6fbc1096..12cd3d59 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -516,7 +516,6 @@ install(
     KParts/BrowserHostExtension
     KParts/BrowserInterface
     KParts/BrowserRun
-    KParts/ComponentFactory
     KParts/Event
     KParts/Factory
     KParts/FileInfoExtension
diff --git a/includes/KParts/ComponentFactory b/includes/KParts/ComponentFactory
deleted file mode 100644
index 194be0d8..00000000
--- a/includes/KParts/ComponentFactory
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../kparts/componentfactory.h"
diff --git a/kparts/CMakeLists.txt b/kparts/CMakeLists.txt
index 15c95511..65a9283e 100644
--- a/kparts/CMakeLists.txt
+++ b/kparts/CMakeLists.txt
@@ -72,7 +72,6 @@ install(
     factory.h
     historyprovider.h
     browserinterface.h
-    componentfactory.h
     browserrun.h
     statusbarextension.h
     browseropenorsavequestion.h
diff --git a/kparts/componentfactory.h b/kparts/componentfactory.h
deleted file mode 100644
index 984c5444..00000000
--- a/kparts/componentfactory.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* This file is part of the KDE project
-   Copyright (C) 2001 Simon Hausmann <hausmann@kde.org>
-   Copyright (C) 2002-2006 David Faure <faure@kde.org>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef KPARTS_COMPONENTFACTORY_H
-#define KPARTS_COMPONENTFACTORY_H
-
-#include <kparts/factory.h>
-#include <kparts/part.h>
-#include <kservicetypetrader.h>
-#include <kmimetypetrader.h>
-
-#include <QtCore/QFile>
-
-namespace KParts
-{
-    namespace ComponentFactory
-    {
-        /**
-         * This method creates and returns a KParts part from a serviceType (e.g. a mimetype).
-         *
-         * You can use this method to create a generic viewer - that can display any
-         * kind of file, provided that there is a ReadOnlyPart installed for it - in 5 lines:
-         * \code
-         * // Given the following: KUrl url, QWidget* parentWidget and QObject* parentObject.
-         * QString mimetype = KMimeType::findByURL( url )->name();
-         * KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, QString(), parentWidget, parentObject );
-         * if ( part ) {
-         *     part->openUrl( url );
-         *     part->widget()->show();  // also insert the widget into a layout, or simply use a KVBox as parentWidget
-         * }
-         * \endcode
-         *
-         * @deprecated use KMimeTypeTrader::createPartInstanceFromQuery instead
-         *
-         * @param mimeType the mimetype which this part is associated with
-         * @param constraint an optional constraint to pass to the trader (see KTrader)
-         * @param parentWidget the parent widget, will be set as the parent of the part's widget
-         * @param parent the parent object for the part itself
-         * @param args A list of string arguments, passed to the factory and possibly
-         *             to the component (see KLibFactory)
-         * @param error The int passed here will receive an error code in case of errors.
-         *              (See enum KLibLoader::ComponentLoadingError)
-         * @return A pointer to the newly created object or a null pointer if the
-         *         factory was unable to create an object of the given type.
-         */
-    }
-}
-
-/*
- * vim: et sw=4
- */
-
-#endif
diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp
index b140b701..94baac43 100644
--- a/kparts/plugin.cpp
+++ b/kparts/plugin.cpp
@@ -20,7 +20,6 @@
 
 #include <kparts/plugin.h>
 #include <kparts/part.h>
-#include <kparts/componentfactory.h>
 
 #include <assert.h>
 
@@ -35,6 +34,8 @@
 #include <klocale.h>
 #include <kdesktopfile.h>
 #include <kconfiggroup.h>
+#include <kpluginfactory.h>
+#include <kpluginloader.h>
 
 using namespace KParts;