5 files changed, 3 insertions, 13 deletions
diff --git a/sources/pyside6/libpyside/dynamicqmetaobject.cpp b/sources/pyside6/libpyside/dynamicqmetaobject.cpp
index 5269067e7..fb8762a0a 100644
--- a/sources/pyside6/libpyside/dynamicqmetaobject.cpp
+++ b/sources/pyside6/libpyside/dynamicqmetaobject.cpp
@@ -473,7 +473,7 @@ void MetaObjectBuilderPrivate::parsePythonType(PyTypeObject *type)
     basesToCheck.reserve(1u + basesCount);
     basesToCheck.push_back(type);
 
-    auto sbkObjTypeF = reinterpret_cast<PyTypeObject *>(SbkObject_TypeF());
+    auto sbkObjTypeF = SbkObject_TypeF();
     auto baseObjType = reinterpret_cast<PyTypeObject *>(&PyBaseObject_Type);
     for (Py_ssize_t i = 0; i < basesCount; ++i) {
         auto baseType = reinterpret_cast<PyTypeObject *>(PyTuple_GET_ITEM(mro, i));
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp
index 990b45694..59b7f54e9 100644
--- a/sources/pyside6/libpyside/pyside.cpp
+++ b/sources/pyside6/libpyside/pyside.cpp
@@ -240,14 +240,9 @@ void initDynamicMetaObject(SbkObjectType *type, const QMetaObject *base, std::si
                      PySide::PyName::qtStaticMetaObject(), pyMetaObject);
 }
 
-TypeUserData *retrieveTypeUserData(SbkObjectType *sbkTypeObj)
-{
-    return reinterpret_cast<TypeUserData *>(Shiboken::ObjectType::getTypeUserData(sbkTypeObj));
-}
-
 TypeUserData *retrieveTypeUserData(PyTypeObject *pyTypeObj)
 {
-    return retrieveTypeUserData(reinterpret_cast<SbkObjectType *>(pyTypeObj));
+    return reinterpret_cast<TypeUserData *>(Shiboken::ObjectType::getTypeUserData(pyTypeObj));
 }
 
 TypeUserData *retrieveTypeUserData(PyObject *pyObj)
diff --git a/sources/pyside6/libpyside/pyside.h b/sources/pyside6/libpyside/pyside.h
index 0c9ad92cf..b74cc8414 100644
--- a/sources/pyside6/libpyside/pyside.h
+++ b/sources/pyside6/libpyside/pyside.h
@@ -51,8 +51,6 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QHash>
 
-struct SbkObjectType;
-
 namespace PySide
 {
 
diff --git a/sources/pyside6/libpyside/pyside_p.h b/sources/pyside6/libpyside/pyside_p.h
index 1084a40a1..a5183c907 100644
--- a/sources/pyside6/libpyside/pyside_p.h
+++ b/sources/pyside6/libpyside/pyside_p.h
@@ -44,8 +44,6 @@
 
 #include <dynamicqmetaobject.h>
 
-struct SbkObjectType;
-
 namespace PySide
 {
 
@@ -59,7 +57,6 @@ struct TypeUserData
     std::size_t cppObjSize;
 };
 
-TypeUserData *retrieveTypeUserData(SbkObjectType *sbkTypeObj);
 TypeUserData *retrieveTypeUserData(PyTypeObject *pyTypeObj);
 TypeUserData *retrieveTypeUserData(PyObject *pyObj);
 // For QML
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp
index 95acb1bad..3a3b52c2a 100644
--- a/sources/pyside6/libpyside/pysidesignal.cpp
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
@@ -942,7 +942,7 @@ static typename T::value_type join(T t, const char *sep)
 
 static void _addSignalToWrapper(SbkObjectType *wrapperType, const char *signalName, PySideSignal *signal)
 {
-    auto typeDict = reinterpret_cast<PyTypeObject *>(wrapperType)->tp_dict;
+    auto typeDict = wrapperType->tp_dict;
     PyObject *homonymousMethod;
     if ((homonymousMethod = PyDict_GetItemString(typeDict, signalName))) {
         Py_INCREF(homonymousMethod);