Promote the QtIfRemoteObjectsHelper lib to a proper qt module

Instead of being a static private library it is now a dynamic
library with public code including documentation.

This makes it possible to host more code which is
QtRemoteObjects specific.

Change-Id: I3ff601add349d4fad721890c12fc6e59fbe4ee79
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

39 files changed, 223 insertions, 70 deletions

diff --git a/src/helper/remoteobjects/CMakeLists.txt b/src/helper/remoteobjects/CMakeLists.txt
index 58ac9922..448870e5 100644
--- a/src/helper/remoteobjects/CMakeLists.txt
+++ b/src/helper/remoteobjects/CMakeLists.txt
@@ -8,23 +8,27 @@
 # building the module and at that time the rep headers are not created yet
 set(QT_FEATURE_headersclean FALSE)
 
-qt_internal_add_module(IfRemoteObjectsHelperPrivate
+qt_internal_add_module(IfRemoteObjectsHelper
     CONFIG_MODULE_NAME ifremoteobjects_helper
-    STATIC
-    INTERNAL_MODULE
     SOURCES
-        qifpagingmodelqtroadapter.cpp qifpagingmodelqtroadapter.h
-        qifremoteobjectspendingresult.cpp qifremoteobjectspendingresult.h
-        qifremoteobjectsreplicahelper.cpp qifremoteobjectsreplicahelper.h
-        qifremoteobjectssourcehelper.h qifremoteobjectshelper.h
+        qifpagingmodelqtroadapter.cpp qifpagingmodelqtroadapter_p.h
+        qifremoteobjectspendingresult.cpp qifremoteobjectspendingresult_p.h
+        qifremoteobjectsreplicahelper.cpp qifremoteobjectsreplicahelper_p.h
+        qifremoteobjectssourcehelper_p.h qifremoteobjectshelper.h
+        qifremoteobjectshelper.cpp qifremoteobjectshelper.h
     PUBLIC_LIBRARIES
         Qt::InterfaceFramework
         Qt::Qml
         Qt::RemoteObjects
 )
-qt6_add_repc_sources(IfRemoteObjectsHelperPrivate
+
+target_sources(IfRemoteObjectsHelper
+  PRIVATE
+    qtifremoteobjectshelper_global.h
+)
+qt6_add_repc_sources(IfRemoteObjectsHelper
     qifpagingmodel.rep
 )
-qt6_add_repc_replicas(IfRemoteObjectsHelperPrivate
+qt6_add_repc_replicas(IfRemoteObjectsHelper
     qifpagingmodel.rep
 )
diff --git a/src/helper/remoteobjects/qifpagingmodel.rep b/src/helper/remoteobjects/qifpagingmodel.rep
index 2e26e641..e1f56ecc 100644
--- a/src/helper/remoteobjects/qifpagingmodel.rep
+++ b/src/helper/remoteobjects/qifpagingmodel.rep
@@ -1,7 +1,11 @@
 #include <QtInterfaceFramework/QtInterfaceFrameworkModule>
 #include <QUuid>
 
-class QIfPagingModel
+#include <QtIfRemoteObjectsHelper/qtifremoteobjectshelper_global.h>
+
+#HEADER QT_BEGIN_NAMESPACE
+
+class Q_IFREMOTEOBJECTSHELPER_EXPORT QIfPagingModel
 {
     SLOT(void registerInstance(const QUuid &identifier))
     SLOT(void unregisterInstance(const QUuid &identifier))
@@ -12,3 +16,5 @@ class QIfPagingModel
     SIGNAL(dataFetched(const QUuid &identifier, const QList<QVariant> &data, int start, bool moreAvailable))
     SIGNAL(dataChanged(const QUuid &identifier, const QList<QVariant> &data, int start, int count))
 };
+
+#FOOTER QT_END_NAMESPACE
diff --git a/src/helper/remoteobjects/qifpagingmodelqtroadapter.cpp b/src/helper/remoteobjects/qifpagingmodelqtroadapter.cpp
index ea797508..25341ff5 100644
--- a/src/helper/remoteobjects/qifpagingmodelqtroadapter.cpp
+++ b/src/helper/remoteobjects/qifpagingmodelqtroadapter.cpp
@@ -1,7 +1,9 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#include "qifpagingmodelqtroadapter.h"
+#include "qifpagingmodelqtroadapter_p.h"
+
+QT_BEGIN_NAMESPACE
 
 QIfPagingModelQtRoAdapter::QIfPagingModelQtRoAdapter(const QString &remoteObjectsLookupName, QIfPagingModelInterface *parent)
     : QIfPagingModelSource(parent)
@@ -34,4 +36,6 @@ void QIfPagingModelQtRoAdapter::fetchData(const QUuid &identifier, int start, in
     m_backend->fetchData(identifier, start, count);
 }
 
-#include "moc_qifpagingmodelqtroadapter.cpp"
+QT_END_NAMESPACE
+
+#include "moc_qifpagingmodelqtroadapter_p.cpp"
diff --git a/src/helper/remoteobjects/qifpagingmodelqtroadapter.h b/src/helper/remoteobjects/qifpagingmodelqtroadapter_p.h
index 45aa7b3f..9d1e0ad9 100644
--- a/src/helper/remoteobjects/qifpagingmodelqtroadapter.h
+++ b/src/helper/remoteobjects/qifpagingmodelqtroadapter_p.h
@@ -1,11 +1,24 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QIFPAGINGMODELQTROADAPTER_H
-#define QIFPAGINGMODELQTROADAPTER_H
+#ifndef QIFPAGINGMODELQTROADAPTER_P_H
+#define QIFPAGINGMODELQTROADAPTER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtInterfaceFramework/QIfPagingModelInterface>
-#include "QtIfRemoteObjectsHelper/rep_qifpagingmodel_source.h"
+#include "rep_qifpagingmodel_source.h"
+
+#include "qtifremoteobjectshelper_global.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -16,7 +29,7 @@ struct QIfPagingModelAddressWrapper: public QIfPagingModelSourceAPI<ObjectType>
     {}
 };
 
-class QIfPagingModelQtRoAdapter : public QIfPagingModelSource
+class Q_IFREMOTEOBJECTSHELPER_EXPORT QIfPagingModelQtRoAdapter : public QIfPagingModelSource
 {
     Q_OBJECT
 
@@ -37,4 +50,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QIFPAGINGMODELQTROADAPTER_H
+#endif // QIFPAGINGMODELQTROADAPTER_P_H
diff --git a/src/helper/remoteobjects/qifremoteobjectshelper.cpp b/src/helper/remoteobjects/qifremoteobjectshelper.cpp
new file mode 100644
index 00000000..e923b451
--- /dev/null
+++ b/src/helper/remoteobjects/qifremoteobjectshelper.cpp
@@ -0,0 +1,63 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#include "qifremoteobjectshelper.h"
+
+QT_BEGIN_NAMESPACE
+
+using namespace Qt::Literals::StringLiterals;
+
+/*!
+    \module QtIfRemoteObjectsHelper
+    \title Qt Interface Framework Remote Object Helper Classes
+    \ingroup modules
+    \ingroup qtif_helper_modules
+    \qtvariable interfaceframework
+
+    \brief Qt Interface Framework Remote Object Helper Classes.
+
+    To include the definitions of the module's classes, use the following directive:
+
+    \code
+    #include <QtIfRemoteObjectsHelper>
+    \endcode
+
+    To link against the module, add this line to your qmake .pro file:
+
+    \code
+    QT += ifremoteobjects_helper
+    \endcode
+*/
+
+/*!
+    \namespace QIfRemoteObjectsHelper
+    \inmodule QtIfRemoteObjectsHelper
+
+    \brief Contains miscellaneous identifiers and functions.
+*/
+
+namespace QIfRemoteObjectsHelper {
+
+/*!
+    Returns a default remoteobjects url using the passed \a url.
+
+    The created url is platform dependent.
+*/
+QString buildDefaultUrl(const QString &url)
+{
+#ifdef Q_OS_ANDROID
+    return u"localabstract:"_s + url;
+#elif defined(Q_OS_LINUX)
+    static bool isTempWritable = QFileInfo(QDir::tempPath()).isWritable();
+    if (!isTempWritable)
+        return u"localabstract:"_s + url;
+    else
+        return u"local:"_s + url;
+#else
+    return u"local:"_s + url;
+#endif
+}
+
+} // namespace QIfRemoteObjectsHelper
+
+QT_END_NAMESPACE
diff --git a/src/helper/remoteobjects/qifremoteobjectshelper.h b/src/helper/remoteobjects/qifremoteobjectshelper.h
index 41fb5bc2..34733a42 100644
--- a/src/helper/remoteobjects/qifremoteobjectshelper.h
+++ b/src/helper/remoteobjects/qifremoteobjectshelper.h
@@ -7,25 +7,15 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 
+#include <QtIfRemoteObjectsHelper/qtifremoteobjectshelper_global.h>
+
 QT_BEGIN_NAMESPACE
 
-class QIfRemoteObjectsHelper {
-
-public:
-    static QString buildDefaultUrl(const QString &url) {
-#ifdef Q_OS_ANDROID
-        return QStringLiteral("localabstract:") + url;
-#elif defined(Q_OS_LINUX)
-        static bool isTempWritable = QFileInfo(QDir::tempPath()).isWritable();
-        if (!isTempWritable)
-            return QStringLiteral("localabstract:") + url;
-        else
-            return QStringLiteral("local:") + url;
-#else
-        return QStringLiteral("local:") + url;
-#endif
-    }
-};
+namespace QIfRemoteObjectsHelper {
+
+Q_IFREMOTEOBJECTSHELPER_EXPORT QString buildDefaultUrl(const QString &url);
+
+} // namespace QIfRemoteObjectsHelper
 
 QT_END_NAMESPACE
 
diff --git a/src/helper/remoteobjects/qifremoteobjectspendingresult.cpp b/src/helper/remoteobjects/qifremoteobjectspendingresult.cpp
index 9d670f0b..330c3d19 100644
--- a/src/helper/remoteobjects/qifremoteobjectspendingresult.cpp
+++ b/src/helper/remoteobjects/qifremoteobjectspendingresult.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2019 Luxoft Sweden AB
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#include "qifremoteobjectspendingresult.h"
+#include "qifremoteobjectspendingresult_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -44,4 +44,4 @@ void QIfRemoteObjectsPendingResult::setFailed(bool failed)
 
 QT_END_NAMESPACE
 
-#include "moc_qifremoteobjectspendingresult.cpp"
+#include "moc_qifremoteobjectspendingresult_p.cpp"
diff --git a/src/helper/remoteobjects/qifremoteobjectspendingresult.h b/src/helper/remoteobjects/qifremoteobjectspendingresult_p.h
index 19dd14d4..ac832093 100644
--- a/src/helper/remoteobjects/qifremoteobjectspendingresult.h
+++ b/src/helper/remoteobjects/qifremoteobjectspendingresult_p.h
@@ -2,20 +2,32 @@
 // Copyright (C) 2019 Luxoft Sweden AB
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QIFREMOTEOBJECTSPENDINGRESULT_H
-#define QIFREMOTEOBJECTSPENDINGRESULT_H
+#ifndef QIFREMOTEOBJECTSPENDINGRESULT_P_H
+#define QIFREMOTEOBJECTSPENDINGRESULT_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/QDataStream>
 #include <QtCore/QObject>
 #include <QtRemoteObjects/qtremoteobjectglobal.h>
+#include <QtIfRemoteObjectsHelper/qtifremoteobjectshelper_global.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace qtif_private {
-    Q_DECLARE_LOGGING_CATEGORY(qLcQtIfRoHelper)
+    Q_DECLARE_EXPORTED_LOGGING_CATEGORY(qLcQtIfRoHelper, Q_IFREMOTEOBJECTSHELPER_EXPORT)
 }
 
-class QIfRemoteObjectsPendingResult
+class Q_IFREMOTEOBJECTSHELPER_EXPORT QIfRemoteObjectsPendingResult
 {
     Q_GADGET
 
@@ -53,4 +65,4 @@ inline QDataStream &operator>>(QDataStream &ds, QIfRemoteObjectsPendingResult &o
 
 QT_END_NAMESPACE
 
-#endif //QIFREMOTEOBJECTSPENDINGRESULT_H
+#endif //QIFREMOTEOBJECTSPENDINGRESULT_P_H
diff --git a/src/helper/remoteobjects/qifremoteobjectsreplicahelper.cpp b/src/helper/remoteobjects/qifremoteobjectsreplicahelper.cpp
index 221a8019..b1b1a24c 100644
--- a/src/helper/remoteobjects/qifremoteobjectsreplicahelper.cpp
+++ b/src/helper/remoteobjects/qifremoteobjectsreplicahelper.cpp
@@ -2,7 +2,7 @@
 // Copyright (C) 2019 Luxoft Sweden AB
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#include "qifremoteobjectsreplicahelper.h"
+#include "qifremoteobjectsreplicahelper_p.h"
 
 using namespace Qt::StringLiterals;
 
@@ -62,4 +62,4 @@ void QIfRemoteObjectsReplicaHelper::onNodeError(QRemoteObjectNode::ErrorCode cod
 
 QT_END_NAMESPACE
 
-#include "moc_qifremoteobjectsreplicahelper.cpp"
+#include "moc_qifremoteobjectsreplicahelper_p.cpp"
diff --git a/src/helper/remoteobjects/qifremoteobjectsreplicahelper.h b/src/helper/remoteobjects/qifremoteobjectsreplicahelper_p.h
index 055a60c2..5164b15f 100644
--- a/src/helper/remoteobjects/qifremoteobjectsreplicahelper.h
+++ b/src/helper/remoteobjects/qifremoteobjectsreplicahelper_p.h
@@ -2,8 +2,19 @@
 // Copyright (C) 2019 Luxoft Sweden AB
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QIFREMOTEOBJECTSREPLICAHELPER_H
-#define QIFREMOTEOBJECTSREPLICAHELPER_H
+#ifndef QIFREMOTEOBJECTSREPLICAHELPER_P_H
+#define QIFREMOTEOBJECTSREPLICAHELPER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtInterfaceFramework/QIfPendingReply>
 #include <QtInterfaceFramework/QIfAbstractFeature>
@@ -11,12 +22,12 @@
 #include <QtRemoteObjects/QRemoteObjectReplica>
 #include <QtRemoteObjects/QRemoteObjectPendingCall>
 
-#include <QtIfRemoteObjectsHelper/qifremoteobjectshelper.h>
-#include <QtIfRemoteObjectsHelper/qifremoteobjectspendingresult.h>
+#include "qtifremoteobjectshelper_global.h"
+#include "qifremoteobjectspendingresult_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QIfRemoteObjectsReplicaHelper : public QObject
+class Q_IFREMOTEOBJECTSHELPER_EXPORT QIfRemoteObjectsReplicaHelper : public QObject
 {
     Q_OBJECT
 
@@ -69,4 +80,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif //QIFREMOTEOBJECTSREPLICAHELPER_H
+#endif //QIFREMOTEOBJECTSREPLICAHELPER_P_H
diff --git a/src/helper/remoteobjects/qifremoteobjectssourcehelper.h b/src/helper/remoteobjects/qifremoteobjectssourcehelper_p.h
index 8157aa0a..69734bdc 100644
--- a/src/helper/remoteobjects/qifremoteobjectssourcehelper.h
+++ b/src/helper/remoteobjects/qifremoteobjectssourcehelper_p.h
@@ -2,14 +2,25 @@
 // Copyright (C) 2019 Luxoft Sweden AB
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-#ifndef QIFREMOTEOBJECTSSOURCEHELPER_H
-#define QIFREMOTEOBJECTSSOURCEHELPER_H
+#ifndef QIFREMOTEOBJECTSSOURCEHELPER_P_H
+#define QIFREMOTEOBJECTSSOURCEHELPER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include <QtCore/QObject>
 #include <QtInterfaceFramework/QIfPendingReply>
 
-#include <QtIfRemoteObjectsHelper/qifremoteobjectshelper.h>
-#include <QtIfRemoteObjectsHelper/qifremoteobjectspendingresult.h>
+#include "qtifremoteobjectshelper_global.h"
+#include "qifremoteobjectspendingresult_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -62,4 +73,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif //QIFREMOTEOBJECTSSOURCEHELPER_H
+#endif //QIFREMOTEOBJECTSSOURCEHELPER_P_H
diff --git a/src/helper/remoteobjects/qtifremoteobjectshelper_global.h b/src/helper/remoteobjects/qtifremoteobjectshelper_global.h
new file mode 100644
index 00000000..31268f8e
--- /dev/null
+++ b/src/helper/remoteobjects/qtifremoteobjectshelper_global.h
@@ -0,0 +1,23 @@
+// Copyright (C) 2023 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+#ifndef QTIFREMOTEOBJECTSHELPER_GLOBAL_H
+#define QTIFREMOTEOBJECTSHELPER_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+#  if defined(QT_BUILD_IFREMOTEOBJECTS_HELPER_LIB)
+#    define Q_IFREMOTEOBJECTSHELPER_EXPORT Q_DECL_EXPORT
+#  else
+#    define Q_IFREMOTEOBJECTSHELPER_EXPORT Q_DECL_IMPORT
+#  endif
+#else
+#  define Q_IFREMOTEOBJECTSHELPER_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QTIFREMOTEOBJECTSHELPER_GLOBAL_H
diff --git a/src/interfaceframework/doc/QtInterfaceFrameworkDoc b/src/interfaceframework/doc/QtInterfaceFrameworkDoc
index e26a563a..9c832cf0 100644
--- a/src/interfaceframework/doc/QtInterfaceFrameworkDoc
+++ b/src/interfaceframework/doc/QtInterfaceFrameworkDoc
@@ -1,4 +1,5 @@
 #include <QtInterfaceFramework/QtInterfaceFramework>
+#include <QtIfRemoteObjectsHelper/QIfRemoteObjectsHelper>
 #include <QtIfVehicleFunctions/QtIfVehicleFunctions>
 #include <QtIfVehicleFunctions/QIfClimateControlBackendInterface>
 #include <QtIfVehicleFunctions/QIfWindowControlBackendInterface>
diff --git a/src/interfaceframework/doc/qtinterfaceframework-project.qdocconf b/src/interfaceframework/doc/qtinterfaceframework-project.qdocconf
index e7a38c94..506b7863 100644
--- a/src/interfaceframework/doc/qtinterfaceframework-project.qdocconf
+++ b/src/interfaceframework/doc/qtinterfaceframework-project.qdocconf
@@ -5,13 +5,16 @@ url                           = http://doc.qt.io/QtInterfaceFramework
 
 moduleheader                  = QtInterfaceFrameworkDoc
 includepaths                  = -I . \
-                                -I ..
+                                -I .. \
+                                -I ../../helper
 
 headerdirs                   += . \
                                 .. \
+                                ../../helper \
 
 sourcedirs                   += . \
                                 .. \
+                                ../../helper \
 
 imagedirs                    += images
 exampledirs                  += ../../../examples \
diff --git a/src/interfaceframework/doc/src/qtif-modules.qdoc b/src/interfaceframework/doc/src/qtif-modules.qdoc
index a66c4471..2b3ef2d5 100644
--- a/src/interfaceframework/doc/src/qtif-modules.qdoc
+++ b/src/interfaceframework/doc/src/qtif-modules.qdoc
@@ -13,7 +13,9 @@
     Qt Interface Framework contains the following modules:
     \annotatedlist qtif_modules
 
+    The following helper modules provide protocol specific functions:
 
+    \annotatedlist qtif_helper_modules
 */
 
 /*!
diff --git a/src/plugins/ifmedia/media_qtro/CMakeLists.txt b/src/plugins/ifmedia/media_qtro/CMakeLists.txt
index 5fae2b93..8515906d 100644
--- a/src/plugins/ifmedia/media_qtro/CMakeLists.txt
+++ b/src/plugins/ifmedia/media_qtro/CMakeLists.txt
@@ -17,6 +17,7 @@ qt_internal_add_plugin(MediaQtROPlugin
         Qt::InterfaceFramework
         Qt::IfMedia
         Qt::RemoteObjects
+        Qt::IfRemoteObjectsHelper
         Qt::IfRemoteObjectsHelperPrivate
 )
 qt6_add_repc_replicas(MediaQtROPlugin
diff --git a/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.cpp b/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.cpp
index 0df1b01b..367b996b 100644
--- a/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.cpp
+++ b/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.cpp
@@ -7,6 +7,7 @@
 
 #include <QTimer>
 #include <QSettings>
+#include <QFile>
 #include <QIODevice>
 
 using namespace Qt::StringLiterals;
diff --git a/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.h b/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.h
index 61507a8b..ea4549ff 100644
--- a/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.h
+++ b/src/plugins/ifmedia/media_qtro/filterandbrowsemodel.h
@@ -7,7 +7,7 @@
 
 #include <QtInterfaceFramework/QIfFilterAndBrowseModelInterface>
 #include <QtIfMedia/QIfPlayableItem>
-#include <QIfRemoteObjectsReplicaHelper>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectsreplicahelper_p.h>
 #include <QRemoteObjectNode>
 #include "rep_qiffilterandbrowsemodel_replica.h"
 
diff --git a/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.cpp b/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.cpp
index aff93fd2..cac2f0b6 100644
--- a/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.cpp
+++ b/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.cpp
@@ -7,6 +7,7 @@
 
 #include <QtDebug>
 #include <QTimer>
+#include <QFile>
 #include <QSettings>
 
 using namespace Qt::StringLiterals;
diff --git a/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.h b/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.h
index 666bcd64..b2788991 100644
--- a/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.h
+++ b/src/plugins/ifmedia/media_qtro/mediadiscoverybackend.h
@@ -7,7 +7,7 @@
 
 #include <QtIfMedia/QIfMediaDeviceDiscoveryModelBackendInterface>
 #include <QtInterfaceFramework/QIfServiceObject>
-#include <QIfRemoteObjectsReplicaHelper>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectsreplicahelper_p.h>
 #include <QRemoteObjectNode>
 
 #include "rep_qifmediadiscoverymodel_replica.h"
diff --git a/src/plugins/ifmedia/media_qtro/mediaindexerbackend.cpp b/src/plugins/ifmedia/media_qtro/mediaindexerbackend.cpp
index b29fd5b8..6b51a600 100644
--- a/src/plugins/ifmedia/media_qtro/mediaindexerbackend.cpp
+++ b/src/plugins/ifmedia/media_qtro/mediaindexerbackend.cpp
@@ -5,6 +5,7 @@
 #include "mediaindexerbackend.h"
 
 #include <QTimer>
+#include <QFile>
 #include <QSettings>
 
 using namespace Qt::StringLiterals;
diff --git a/src/plugins/ifmedia/media_qtro/mediaindexerbackend.h b/src/plugins/ifmedia/media_qtro/mediaindexerbackend.h
index b5b08fac..3022f0f6 100644
--- a/src/plugins/ifmedia/media_qtro/mediaindexerbackend.h
+++ b/src/plugins/ifmedia/media_qtro/mediaindexerbackend.h
@@ -6,7 +6,7 @@
 #define MEDIAINDEXERBACKEND_H
 
 #include <QtIfMedia/QIfMediaIndexerControlBackendInterface>
-#include <QIfRemoteObjectsReplicaHelper>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectsreplicahelper_p.h>
 #include <QRemoteObjectNode>
 
 #include "rep_qifmediaindexer_replica.h"
diff --git a/src/plugins/ifmedia/media_qtro/mediaplayerbackend.cpp b/src/plugins/ifmedia/media_qtro/mediaplayerbackend.cpp
index faf7be75..7e254024 100644
--- a/src/plugins/ifmedia/media_qtro/mediaplayerbackend.cpp
+++ b/src/plugins/ifmedia/media_qtro/mediaplayerbackend.cpp
@@ -6,6 +6,7 @@
 #include "qifqmlconversion_helper.h"
 
 #include <QTimer>
+#include <QFile>
 #include <QSettings>
 
 using namespace Qt::StringLiterals;
diff --git a/src/plugins/ifmedia/media_qtro/mediaplayerbackend.h b/src/plugins/ifmedia/media_qtro/mediaplayerbackend.h
index d0343bef..ede3ad1e 100644
--- a/src/plugins/ifmedia/media_qtro/mediaplayerbackend.h
+++ b/src/plugins/ifmedia/media_qtro/mediaplayerbackend.h
@@ -6,7 +6,7 @@
 #define MEDIAPLAYERBACKEND_H
 
 #include <QtIfMedia/QIfMediaPlayerBackendInterface>
-#include <QIfRemoteObjectsReplicaHelper>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectsreplicahelper_p.h>
 #include <QRemoteObjectNode>
 #include "rep_qifmediaplayer_replica.h"
 
diff --git a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl
index 34a55b5c..d53c49d7 100644
--- a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl
@@ -26,6 +26,7 @@ qt6_set_ifcodegen_variable(${VAR_PREFIX}_REPLICAS
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_LIBRARIES
     Qt6::InterfaceFramework
     Qt6::RemoteObjects
+    Qt6::IfRemoteObjectsHelper
     Qt6::IfRemoteObjectsHelperPrivate
 )
 
diff --git a/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.tpl b/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.tpl
index 44467388..bfba9ff7 100644
--- a/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.tpl
+++ b/src/tools/ifcodegen/templates/backend_qtro/backend.cpp.tpl
@@ -14,6 +14,7 @@
 #include <QDebug>
 #include <QSettings>
 #include <QTimer>
+#include <QtIfRemoteObjectsHelper/QtIfRemoteObjectsHelper>
 #include "{{module.module_name|lower}}.h"
 
 using namespace Qt::StringLiterals;
diff --git a/src/tools/ifcodegen/templates/backend_qtro/backend.h.tpl b/src/tools/ifcodegen/templates/backend_qtro/backend.h.tpl
index e55f96a3..7a64d180 100644
--- a/src/tools/ifcodegen/templates/backend_qtro/backend.h.tpl
+++ b/src/tools/ifcodegen/templates/backend_qtro/backend.h.tpl
@@ -14,7 +14,7 @@
 #define {{oncedefine}}
 
 #include <QRemoteObjectNode>
-#include <QtIfRemoteObjectsHelper/QIfRemoteObjectsReplicaHelper>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectsreplicahelper_p.h>
 {% if module.tags.config.module %}
 #include <{{module.tags.config.module}}/{{interface}}BackendInterface>
 {% else %}
diff --git a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl
index 18b7f5b8..c3e77778 100644
--- a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl
@@ -22,7 +22,7 @@ qt6_set_ifcodegen_variable(${VAR_PREFIX}_REPLICAS
 qt6_set_ifcodegen_variable(${VAR_PREFIX}_LIBRARIES
     Qt6::InterfaceFramework
     Qt6::RemoteObjects
-    Qt6::IfRemoteObjectsHelperPrivate
+    Qt6::IfRemoteObjectsHelper
 )
 
 if (TARGET ${CURRENT_TARGET})
diff --git a/src/tools/ifcodegen/templates/server_qtro/server.pri.tpl b/src/tools/ifcodegen/templates/server_qtro/server.pri.tpl
index 87d017b2..ba325977 100644
--- a/src/tools/ifcodegen/templates/server_qtro/server.pri.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro/server.pri.tpl
@@ -6,7 +6,7 @@
 #}
 {% include "common/generated_comment.qmake.tpl" %}
 
-QT += interfaceframework remoteobjects ifremoteobjects_helper_private
+QT += interfaceframework remoteobjects ifremoteobjects_helper
 
 HEADERS += $$PWD/core.h
 
diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl
index 8718f5cf..6e9e737b 100644
--- a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl
@@ -34,6 +34,7 @@ qt6_set_ifcodegen_variable(${VAR_PREFIX}_LIBRARIES
     Qt6::InterfaceFramework
     Qt6::Gui
     Qt6::RemoteObjects
+    Qt6::IfRemoteObjectsHelper
     Qt6::IfRemoteObjectsHelperPrivate
 )
 
diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.tpl b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.tpl
index df142c60..ee0ff05e 100644
--- a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.cpp.tpl
@@ -9,7 +9,7 @@
 {% set interface_zoned = interface.tags.config and interface.tags.config.zoned %}
 #include "{{interface|lower}}adapter.h"
 
-#include <QtIfRemoteObjectsHelper/QIfPagingModelAddressWrapper>
+#include <QtIfRemoteObjectsHelper/private/qifpagingmodelqtroadapter_p.h>
 
 Q_LOGGING_CATEGORY(qLcRO{{interface}}, "{{module|qml_type|lower}}.{{interface|lower}}backend.remoteobjects", QtInfoMsg)
 
diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.tpl b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.tpl
index fa2ac586..b84f6fce 100644
--- a/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro_simulator/adapter.h.tpl
@@ -11,8 +11,8 @@
 #ifndef {{oncedefine}}
 #define {{oncedefine}}
 
-#include <QtIfRemoteObjectsHelper/QIfRemoteObjectsSourceHelper>
-#include "QtIfRemoteObjectsHelper/rep_qifpagingmodel_source.h"
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectssourcehelper_p.h>
+#include <QtIfRemoteObjectsHelper/QIfPagingModelSource>
 
 #include "{{interface|lower}}backend.h"
 #include "rep_{{interface|lower}}_source.h"
diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.tpl b/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.tpl
index ea3a30dc..07dcb8ec 100644
--- a/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.tpl
+++ b/src/tools/ifcodegen/templates/server_qtro_simulator/server.pri.tpl
@@ -5,7 +5,7 @@
 #}
 {% include "common/generated_comment.qmake.tpl" %}
 
-QT += gui remoteobjects ifremoteobjects_helper_private
+QT += gui remoteobjects ifremoteobjects_helper ifremoteobjects_helper_private
 
 HEADERS += \
 {% for interface in module.interfaces %}
diff --git a/src/tools/media-simulation-server/CMakeLists.txt b/src/tools/media-simulation-server/CMakeLists.txt
index a02040b1..85747a8c 100644
--- a/src/tools/media-simulation-server/CMakeLists.txt
+++ b/src/tools/media-simulation-server/CMakeLists.txt
@@ -26,6 +26,7 @@ qt_internal_add_app(ifmedia-simulation-server
         Qt::Multimedia
         Qt::RemoteObjects
         Qt::Sql
+        Qt::IfRemoteObjectsHelper
         Qt::IfRemoteObjectsHelperPrivate
 )
 
diff --git a/src/tools/media-simulation-server/qiffilterandbrowsemodelqtroadapter.h b/src/tools/media-simulation-server/qiffilterandbrowsemodelqtroadapter.h
index cfc23fc4..1277e1de 100644
--- a/src/tools/media-simulation-server/qiffilterandbrowsemodelqtroadapter.h
+++ b/src/tools/media-simulation-server/qiffilterandbrowsemodelqtroadapter.h
@@ -5,7 +5,7 @@
 #ifndef QIFSEARCHANDBROWSEMODELQTROADAPTER_H
 #define QIFSEARCHANDBROWSEMODELQTROADAPTER_H
 
-#include <QIfRemoteObjectsSourceHelper>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectssourcehelper_p.h>
 
 #include "searchandbrowsebackend.h"
 #include "rep_qiffilterandbrowsemodel_source.h"
diff --git a/src/tools/media-simulation-server/qifmediaplayerqtroadapter.h b/src/tools/media-simulation-server/qifmediaplayerqtroadapter.h
index 4b866694..8e7f81b6 100644
--- a/src/tools/media-simulation-server/qifmediaplayerqtroadapter.h
+++ b/src/tools/media-simulation-server/qifmediaplayerqtroadapter.h
@@ -5,7 +5,7 @@
 #ifndef QIFMEDIAPLAYERQTROADAPTER_H
 #define QIFMEDIAPLAYERQTROADAPTER_H
 
-#include <QIfRemoteObjectsSourceHelper>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectssourcehelper_p.h>
 
 #include "mediaplayerbackend.h"
 #include "rep_qifmediaplayer_source.h"
diff --git a/tests/auto/core/ifcodegen/backends/server_qtro/CMakeLists.txt b/tests/auto/core/ifcodegen/backends/server_qtro/CMakeLists.txt
index 1da8afb8..575bf2e2 100644
--- a/tests/auto/core/ifcodegen/backends/server_qtro/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/backends/server_qtro/CMakeLists.txt
@@ -25,4 +25,5 @@ target_link_libraries(org-example-echo-qtro-server
     PRIVATE
         echo_qtro_frontend
         cmdlistener
+        Qt6::IfRemoteObjectsHelperPrivate
 )
diff --git a/tests/auto/core/ifcodegen/backends/server_qtro/echoservice.cpp b/tests/auto/core/ifcodegen/backends/server_qtro/echoservice.cpp
index 0473a6f0..6712588f 100644
--- a/tests/auto/core/ifcodegen/backends/server_qtro/echoservice.cpp
+++ b/tests/auto/core/ifcodegen/backends/server_qtro/echoservice.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "echoservice.h"
-#include <QtIfRemoteObjectsHelper/QIfRemoteObjectsPendingResult>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectspendingresult_p.h>
 #include <QTimer>
 
 EchoService::EchoService()
diff --git a/tests/auto/core/ifcodegen/backends/server_qtro/echozonedservice.cpp b/tests/auto/core/ifcodegen/backends/server_qtro/echozonedservice.cpp
index 4e411584..f4d583d3 100644
--- a/tests/auto/core/ifcodegen/backends/server_qtro/echozonedservice.cpp
+++ b/tests/auto/core/ifcodegen/backends/server_qtro/echozonedservice.cpp
@@ -4,7 +4,7 @@
 
 #include "echozonedservice.h"
 
-#include <QtIfRemoteObjectsHelper/QIfRemoteObjectsPendingResult>
+#include <QtIfRemoteObjectsHelper/private/qifremoteobjectspendingresult_p.h>
 #include <QTimer>
 
 #define SET_VALUE(m_VALUE, VALUE, CHANGED_SIGNAL) \