--- a/src/hbcore/style/hbstyle_p.h	Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyle_p.h	Fri May 14 16:09:54 2010 +0300
@@ -38,15 +38,15 @@
 //
 
 #include <QObject>
-#include <QPluginLoader>
 #include <QHash>
 #include <QVector>
 #include <hbstyle.h>
 #include "hbcssparser_p.h"
-#include "hbwidget_p.h"
 
 class HbWidget;
+class HbPluginLoader;
 class HbStyleInterface;
+class HbWidgetBasePrivate;
 
 class HbStylePluginInfo
 {
@@ -59,7 +59,7 @@
 class HbStyleInterfaceInfo
 {
 public: 
-    QPluginLoader* loader;
+    HbPluginLoader* loader;
     int primitiveBaseId;
 };
 
@@ -88,6 +88,8 @@
     void _q_onThemeChanged();
     void clearStyleSheetCaches();
 
+    HbWidgetBasePrivate *widgetBasePrivate(HbWidgetBase *widgetBase) const;
+
     HbStyle* q_ptr;
 
     mutable QHash<int, HbStyleInterfaceInfo*> customPrimitives;