diff --git a/interfaces/ktexteditor/attribute.h b/interfaces/ktexteditor/attribute.h
index bad22478..0e48e551 100644
--- a/interfaces/ktexteditor/attribute.h
+++ b/interfaces/ktexteditor/attribute.h
@@ -57,7 +57,7 @@ class SmartRange;
  *
  * \author Hamish Rodda \<rodda@kde.org\>
  */
-class KTEXTEDITOR_EXPORT Attribute : public QTextCharFormat, public KShared
+class KTEXTEDITOR_EXPORT Attribute : public QTextCharFormat, public QSharedData
 {
   friend class SmartRange;
 
diff --git a/kdecore/config/kconfigbackend.h b/kdecore/config/kconfigbackend.h
index 49ca6933..63e0626d 100644
--- a/kdecore/config/kconfigbackend.h
+++ b/kdecore/config/kconfigbackend.h
@@ -46,7 +46,7 @@ class QDateTime;
  * to create plugins that allow access to other file formats and
  * configuration systems.
  */
-class KDECORE_EXPORT KConfigBackend : public QObject, public KShared
+class KDECORE_EXPORT KConfigBackend : public QObject, public QSharedData
 {
     Q_OBJECT
     Q_FLAGS(ParseOption)
diff --git a/kdecore/io/klockfile.h b/kdecore/io/klockfile.h
index 3531a131..c36c88a7 100644
--- a/kdecore/io/klockfile.h
+++ b/kdecore/io/klockfile.h
@@ -33,7 +33,7 @@ class QString;
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KLockFile : public KShared
+class KDECORE_EXPORT KLockFile : public QSharedData
 {
 public:
    typedef KSharedPtr<KLockFile> Ptr;
diff --git a/kdecore/io/kmountpoint.h b/kdecore/io/kmountpoint.h
index 77ba4b0d..5fe1c59d 100644
--- a/kdecore/io/kmountpoint.h
+++ b/kdecore/io/kmountpoint.h
@@ -32,7 +32,7 @@
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
-class KDECORE_EXPORT KMountPoint : public KShared
+class KDECORE_EXPORT KMountPoint : public QSharedData
 {
 public:
     typedef KSharedPtr<KMountPoint> Ptr;
diff --git a/kdecore/services/ktraderparsetree_p.h b/kdecore/services/ktraderparsetree_p.h
index d5969f6b..255788d1 100644
--- a/kdecore/services/ktraderparsetree_p.h
+++ b/kdecore/services/ktraderparsetree_p.h
@@ -91,7 +91,7 @@ public:
 /**
  * @internal
  */
-class ParseTreeBase : public KShared
+class ParseTreeBase : public QSharedData
 {
 public:
   typedef KSharedPtr<ParseTreeBase> Ptr;
diff --git a/kdecore/sycoca/ksycocaentry.h b/kdecore/sycoca/ksycocaentry.h
index 32f587a0..db915bad 100644
--- a/kdecore/sycoca/ksycocaentry.h
+++ b/kdecore/sycoca/ksycocaentry.h
@@ -38,7 +38,7 @@ class KSycocaEntryPrivate;
  * @internal
  * @see http://techbase.kde.org/Development/Architecture/KDE3/System_Configuration_Cache
  */
-class KDECORE_EXPORT KSycocaEntry : public KShared
+class KDECORE_EXPORT KSycocaEntry : public QSharedData
 {
 
 public:
diff --git a/kdecore/tests/ksharedptrtest.cpp b/kdecore/tests/ksharedptrtest.cpp
index c39de289..83dacfec 100644
--- a/kdecore/tests/ksharedptrtest.cpp
+++ b/kdecore/tests/ksharedptrtest.cpp
@@ -30,7 +30,7 @@
 
 QTEST_KDEMAIN_CORE( KSharedPtrTest )
 
-class SharedString : public KShared
+class SharedString : public QSharedData
 {
 public:
     SharedString( const QString& data ) : mStr( data ) {}
@@ -94,7 +94,7 @@ void KSharedPtrTest::testWithStrings()
 }
 
 static int dtor_called = 0;
-class Base : public KShared
+class Base : public QSharedData
 {
 public:
 	virtual ~Base() { ++dtor_called; }
diff --git a/kdecore/util/ksharedptr.h b/kdecore/util/ksharedptr.h
index d8d3d146..f6e67f95 100644
--- a/kdecore/util/ksharedptr.h
+++ b/kdecore/util/ksharedptr.h
@@ -31,12 +31,6 @@
 #include <QtCore/qatomic.h>
 #include <kdemacros.h>
 
-/**
- * @deprecated
- * Use QSharedData instead.
- */
-typedef QSharedData KShared;
-
 /**
  * \class KSharedPtr ksharedptr.h <KSharedPtr>
  *
diff --git a/kdecore/util/kuser_unix.cpp b/kdecore/util/kuser_unix.cpp
index a6416cf0..b76b2370 100644
--- a/kdecore/util/kuser_unix.cpp
+++ b/kdecore/util/kuser_unix.cpp
@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <grp.h>
 
-class KUser::Private : public KShared
+class KUser::Private : public QSharedData
 {
 public:
     uid_t uid;
@@ -226,7 +226,7 @@ QStringList KUser::allUserNames() {
 KUser::~KUser() {
 }
 
-class KUserGroup::Private : public KShared
+class KUserGroup::Private : public QSharedData
 {
 public:
     gid_t gid;