diff --git a/documentation/documentation.pri b/documentation/documentation.pri
index ea3919f..605691f 100644
--- a/documentation/documentation.pri
+++ b/documentation/documentation.pri
@@ -1,4 +1,4 @@
-QDOC = /opt/qt5/bin/qdoc
+QDOC = qdoc
 system($$QDOC $$PWD/ubuntu-sdk.qdocconf)
 
 install_docs.files = $$PWD/html
diff --git a/modules/Ubuntu/Components/plugin/i18n.cpp b/modules/Ubuntu/Components/plugin/i18n.cpp
index 01a64ab..26cce09 100644
--- a/modules/Ubuntu/Components/plugin/i18n.cpp
+++ b/modules/Ubuntu/Components/plugin/i18n.cpp
@@ -16,13 +16,13 @@
  * Author: Tim Peeters <tim.peeters@canonical.om>
  */
 
+#include <QtQml>
 #include "i18n.h"
 
 namespace C {
 #include <libintl.h>
 }
 
-#include <QtQml>
 #include <stdlib.h>
 
 UbuntuI18n::UbuntuI18n(QObject* parent) : QObject(parent)
diff --git a/modules/Ubuntu/Components/plugin/plugin.cpp b/modules/Ubuntu/Components/plugin/plugin.cpp
index ded8816..b240a33 100644
--- a/modules/Ubuntu/Components/plugin/plugin.cpp
+++ b/modules/Ubuntu/Components/plugin/plugin.cpp
@@ -30,7 +30,7 @@
 #include "ucscalingimageprovider.h"
 #include "ucqquickimageextension.h"
 #include "quickutils.h"
-#include "giconprovider.h"
+//#include "giconprovider.h"
 
 void UbuntuComponentsPlugin::registerTypes(const char *uri)
 {
@@ -68,5 +68,5 @@ void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *ur
     engine->addImageProvider(QLatin1String("scaling"), new UCScalingImageProvider);
 
     // register gicon provider
-     engine->addImageProvider(QLatin1String("gicon"), new GIconProvider);
+    // engine->addImageProvider(QLatin1String("gicon"), new GIconProvider);
 }
diff --git a/modules/Ubuntu/Components/plugin/plugin.pro b/modules/Ubuntu/Components/plugin/plugin.pro
index b79ded3..a7bc94e 100644
--- a/modules/Ubuntu/Components/plugin/plugin.pro
+++ b/modules/Ubuntu/Components/plugin/plugin.pro
@@ -1,10 +1,14 @@
 include( ../../../../common.pri )
 
 unix {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += gio-2.0
+    # Gio does not exist on BB10
+    #CONFIG += link_pkgconfig
+    #PKGCONFIG += gio-2.0
 }
 
+# Added for BB10
+LIBS += -lintl -liconv
+
 TEMPLATE = lib
 TARGET = ../UbuntuComponents
 QT += qml quick quick-private
@@ -33,8 +37,7 @@ HEADERS += plugin.h \
     ucscalingimageprovider.h \
     ucunits.h \
     ucqquickimageextension.h \
-    quickutils.h \
-    giconprovider.h
+    quickutils.h 
 
 SOURCES += plugin.cpp \
     themeengine.cpp \
@@ -49,8 +52,7 @@ SOURCES += plugin.cpp \
     ucscalingimageprovider.cpp \
     ucunits.cpp \
     ucqquickimageextension.cpp \
-    quickutils.cpp \
-    giconprovider.cpp
+    quickutils.cpp 
 
 # deployment rules for the plugin
 installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)