diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index bd5b74496b8e3e098c4337429f5187e61208ade1..b956110ef2ef950457e6d79a190568ea81c622ad 100644
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -28,7 +28,9 @@
 **************************************************************************/
 
 #include "contentwindow.h"
+
 #include "centralwidget.h"
+#include "helpmanager.h"
 
 #include <QtGui/QLayout>
 #include <QtGui/QFocusEvent>
@@ -38,11 +40,10 @@
 #include <QtHelp/QHelpContentWidget>
 
 ContentWindow::ContentWindow(QHelpEngine *helpEngine)
-    : m_helpEngine(helpEngine)
-    , m_contentWidget(0)
+    : m_contentWidget(0)
     , m_expandDepth(-2)
 {
-    m_contentWidget = m_helpEngine->contentWidget();
+    m_contentWidget = (&Help::HelpManager::helpEngine())->contentWidget();
     m_contentWidget->installEventFilter(this);
     m_contentWidget->viewport()->installEventFilter(this);
     m_contentWidget->setContextMenuPolicy(Qt::CustomContextMenu);
diff --git a/src/shared/help/contentwindow.h b/src/shared/help/contentwindow.h
index c9a6532e01675d9b286d2924dd6b2f18051185a4..dd3796b9c9a9c355bb4bed4123c713e349c4a657 100644
--- a/src/shared/help/contentwindow.h
+++ b/src/shared/help/contentwindow.h
@@ -66,7 +66,6 @@ private:
     bool eventFilter(QObject *o, QEvent *e);
     bool isPdfFile(QHelpContentItem *item) const;
 
-    QHelpEngine *m_helpEngine;
     QHelpContentWidget *m_contentWidget;
     int m_expandDepth;
 };
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 0344383740c5010bb549ae098d1035b01b519219..498d9d5c6a29bd9a70597b5c775e9c7ccfb4c338 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -27,8 +27,9 @@
 **
 **************************************************************************/
 
-#include "indexwindow.h"
 #include "centralwidget.h"
+#include "helpmanager.h"
+#include "indexwindow.h"
 #include "topicchooser.h"
 
 #include <QtGui/QLayout>
@@ -46,7 +47,6 @@ IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
     : QWidget(parent)
     , m_searchLineEdit(0)
     , m_indexWidget(0)
-    , m_helpEngine(helpEngine)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
     QLabel *l = new QLabel(tr("&Look for:"));
@@ -61,11 +61,12 @@ IndexWindow::IndexWindow(QHelpEngine *helpEngine, QWidget *parent)
     layout->setMargin(4);
     layout->addWidget(m_searchLineEdit);
 
-    m_indexWidget = m_helpEngine->indexWidget();
+    QHelpEngine *engine = &Help::HelpManager::helpEngine();
+    m_indexWidget = engine->indexWidget();
     m_indexWidget->installEventFilter(this);
-    connect(m_helpEngine->indexModel(), SIGNAL(indexCreationStarted()), this,
+    connect(engine->indexModel(), SIGNAL(indexCreationStarted()), this,
         SLOT(disableSearchLineEdit()));
-    connect(m_helpEngine->indexModel(), SIGNAL(indexCreated()), this,
+    connect(engine->indexModel(), SIGNAL(indexCreated()), this,
         SLOT(enableSearchLineEdit()));
     connect(m_indexWidget, SIGNAL(linkActivated(QUrl, QString)), this,
         SIGNAL(linkActivated(QUrl)));
diff --git a/src/shared/help/indexwindow.h b/src/shared/help/indexwindow.h
index ff4db3a53683a74e6d971c68cb1674f9f7ee95e0..69a557b0902bce48e94e8a12673fdc22d67ea2bb 100644
--- a/src/shared/help/indexwindow.h
+++ b/src/shared/help/indexwindow.h
@@ -73,7 +73,6 @@ private:
 
     QLineEdit *m_searchLineEdit;
     QHelpIndexWidget *m_indexWidget;
-    QHelpEngine *m_helpEngine;
 };
 
 #endif // INDEXWINDOW_H