diff --git a/src/lib/3rdparty/ecwin7.h b/src/lib/3rdparty/ecwin7.h
index 5f2e36065..fc9fda615 100644
--- a/src/lib/3rdparty/ecwin7.h
+++ b/src/lib/3rdparty/ecwin7.h
@@ -20,6 +20,8 @@
 #ifndef ECWIN7_H
 #define ECWIN7_H
 
+#include "qz_namespace.h"
+
 #include <QtGlobal>
 #include <QWidget>
 
diff --git a/src/lib/3rdparty/fancytabwidget.cpp b/src/lib/3rdparty/fancytabwidget.cpp
index 451301497..750caab25 100644
--- a/src/lib/3rdparty/fancytabwidget.cpp
+++ b/src/lib/3rdparty/fancytabwidget.cpp
@@ -474,7 +474,7 @@ void FancyTabBar::setCurrentIndex(int index)
 // FancyColorButton
 //////
 
-class FancyColorButton : public QWidget
+class QT_QUPZILLA_EXPORT FancyColorButton : public QWidget
 {
 public:
     FancyColorButton(QWidget* parent)
diff --git a/src/lib/3rdparty/fancytabwidget.h b/src/lib/3rdparty/fancytabwidget.h
index 337644e5e..572d6b7f4 100644
--- a/src/lib/3rdparty/fancytabwidget.h
+++ b/src/lib/3rdparty/fancytabwidget.h
@@ -30,6 +30,8 @@
 #ifndef FANCYTABWIDGET_H
 #define FANCYTABWIDGET_H
 
+#include "qz_namespace.h"
+
 #include <QIcon>
 #include <QPropertyAnimation>
 #include <QProxyStyle>
@@ -50,7 +52,7 @@ namespace Core
 namespace Internal
 {
 
-class FancyTabProxyStyle : public QProxyStyle
+class QT_QUPZILLA_EXPORT FancyTabProxyStyle : public QProxyStyle
 {
     Q_OBJECT
 
@@ -65,7 +67,7 @@ protected:
     bool eventFilter(QObject* o, QEvent* e);
 };
 
-class FancyTab : public QWidget
+class QT_QUPZILLA_EXPORT FancyTab : public QWidget
 {
     Q_OBJECT
 
@@ -93,7 +95,7 @@ private:
     float m_fader;
 };
 
-class FancyTabBar : public QWidget
+class QT_QUPZILLA_EXPORT FancyTabBar : public QWidget
 {
     Q_OBJECT
 
@@ -142,7 +144,7 @@ private:
 
 };
 
-class FancyTabWidget : public QWidget
+class QT_QUPZILLA_EXPORT FancyTabWidget : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/3rdparty/lineedit.h b/src/lib/3rdparty/lineedit.h
index 78e234e11..baa43ab01 100644
--- a/src/lib/3rdparty/lineedit.h
+++ b/src/lib/3rdparty/lineedit.h
@@ -1,5 +1,6 @@
 #ifndef LINEEDIT_H
 #define LINEEDIT_H
+
 /**
 * Copyright (c) 2008 - 2009, Benjamin C. Meyer <ben@meyerhome.net>
 *
@@ -29,6 +30,7 @@
 */
 
 #include <QLineEdit>
+#include "qz_namespace.h"
 
 class QHBoxLayout;
 
@@ -43,7 +45,7 @@ As widgets are added to the class they are inserted from the outside
 into the center of the widget.
 */
 class SideWidget;
-class LineEdit : public QLineEdit
+class QT_QUPZILLA_EXPORT LineEdit : public QLineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)
@@ -89,7 +91,7 @@ private:
 };
 
 
-class SideWidget : public QWidget
+class QT_QUPZILLA_EXPORT SideWidget : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/3rdparty/qtwin.cpp b/src/lib/3rdparty/qtwin.cpp
index c6d83f732..b7272e4dc 100644
--- a/src/lib/3rdparty/qtwin.cpp
+++ b/src/lib/3rdparty/qtwin.cpp
@@ -71,7 +71,7 @@ static PtrDwmGetColorizationColor pDwmGetColorizationColor = 0;
  * DWM compositing state changes and updates the widget
  * flags correspondingly.
  */
-class WindowNotifier : public QWidget
+class QT_QUPZILLA_EXPORT WindowNotifier : public QWidget
 {
 public:
     WindowNotifier() {
diff --git a/src/lib/3rdparty/qtwin.h b/src/lib/3rdparty/qtwin.h
index 9df6f67e7..04cd69f09 100644
--- a/src/lib/3rdparty/qtwin.h
+++ b/src/lib/3rdparty/qtwin.h
@@ -27,6 +27,8 @@
 #ifndef QTWIN_H
 #define QTWIN_H
 
+#include "qz_namespace.h"
+
 #include <QColor>
 #include <QWidget>
 #include <QSysInfo>
@@ -46,7 +48,7 @@ DEFINE_PROPERTYKEY(PKEY_AppUserModel_IsDestListSeparator, 0x9F4C2855, 0x9F79, 0x
 
 #endif
 class WindowNotifier;
-class QtWin : public QObject
+class QT_QUPZILLA_EXPORT QtWin : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/3rdparty/squeezelabelv1.h b/src/lib/3rdparty/squeezelabelv1.h
index 4b7f089e6..c1bbb2c4a 100644
--- a/src/lib/3rdparty/squeezelabelv1.h
+++ b/src/lib/3rdparty/squeezelabelv1.h
@@ -1,6 +1,8 @@
 #ifndef SQUEEZELABELV1_H
 #define SQUEEZELABELV1_H
 
+#include "qz_namespace.h"
+
 /**
 * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
 *
@@ -35,7 +37,7 @@
 A label that will squeeze the set text to fit within the size of the
 widget. The text will be elided in the middle.
 */
-class SqueezeLabelV1 : public QLabel
+class QT_QUPZILLA_EXPORT SqueezeLabelV1 : public QLabel
 {
     Q_OBJECT
 
diff --git a/src/lib/3rdparty/squeezelabelv2.h b/src/lib/3rdparty/squeezelabelv2.h
index 7ad4ddb4f..0f178a529 100644
--- a/src/lib/3rdparty/squeezelabelv2.h
+++ b/src/lib/3rdparty/squeezelabelv2.h
@@ -1,6 +1,8 @@
 #ifndef SQUEEZELABELV2_H
 #define SQUEEZELABELV2_H
 
+#include "qz_namespace.h"
+
 /**
 * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
 *
@@ -35,7 +37,7 @@
 A label that will squeeze the set text to fit within the size of the
 widget. The text will be elided in the middle.
 */
-class SqueezeLabelV2 : public QLabel
+class QT_QUPZILLA_EXPORT SqueezeLabelV2 : public QLabel
 {
     Q_OBJECT
 
diff --git a/src/lib/3rdparty/stylehelper.h b/src/lib/3rdparty/stylehelper.h
index efa14e0ea..c1a52c819 100644
--- a/src/lib/3rdparty/stylehelper.h
+++ b/src/lib/3rdparty/stylehelper.h
@@ -30,6 +30,8 @@
 #ifndef STYLEHELPER_H
 #define STYLEHELPER_H
 
+#include "qz_namespace.h"
+
 #include <QtGui/QColor>
 #include <QtGui/QStyle>
 
diff --git a/src/lib/adblock/adblockblockednetworkreply.cpp b/src/lib/adblock/adblockblockednetworkreply.cpp
index 24825bbdd..fc09fb17e 100644
--- a/src/lib/adblock/adblockblockednetworkreply.cpp
+++ b/src/lib/adblock/adblockblockednetworkreply.cpp
@@ -44,11 +44,10 @@
  */
 
 #include "adblockblockednetworkreply.h"
-
 #include "adblockrule.h"
 
-#include <qnetworkrequest.h>
-#include <qtimer.h>
+#include <QNetworkRequest>
+#include <QTimer>
 
 AdBlockBlockedNetworkReply::AdBlockBlockedNetworkReply(const QNetworkRequest &request, const AdBlockRule* rule, QObject* parent)
     : QNetworkReply(parent)
diff --git a/src/lib/adblock/adblockblockednetworkreply.h b/src/lib/adblock/adblockblockednetworkreply.h
index 5f4d38ec2..d8ea3f391 100644
--- a/src/lib/adblock/adblockblockednetworkreply.h
+++ b/src/lib/adblock/adblockblockednetworkreply.h
@@ -46,10 +46,13 @@
 #ifndef ADBLOCKBLOCKEDNETWORKREPLY_H
 #define ADBLOCKBLOCKEDNETWORKREPLY_H
 
-#include <qnetworkreply.h>
+#include <QNetworkReply>
+
+#include "qz_namespace.h"
 
 class AdBlockRule;
-class AdBlockBlockedNetworkReply : public QNetworkReply
+
+class QT_QUPZILLA_EXPORT AdBlockBlockedNetworkReply : public QNetworkReply
 {
     Q_OBJECT
 
diff --git a/src/lib/adblock/adblockdialog.cpp b/src/lib/adblock/adblockdialog.cpp
index 3c1fe760e..fd561c3f3 100644
--- a/src/lib/adblock/adblockdialog.cpp
+++ b/src/lib/adblock/adblockdialog.cpp
@@ -47,6 +47,10 @@
 #include "adblocksubscription.h"
 #include "mainapplication.h"
 
+#include <QMenu>
+#include <QMessageBox>
+#include <QInputDialog>
+
 AdBlockDialog::AdBlockDialog(QWidget* parent)
     : QDialog(parent)
     , m_itemChangingBlock(false)
diff --git a/src/lib/adblock/adblockdialog.h b/src/lib/adblock/adblockdialog.h
index 8b57e7da6..70f77baad 100644
--- a/src/lib/adblock/adblockdialog.h
+++ b/src/lib/adblock/adblockdialog.h
@@ -47,23 +47,15 @@
 #define ADBLOCKDIALOG_H
 
 #include <QDialog>
-#include <QDesktopServices>
-#include <QMenu>
-#include <QUrl>
-#include <QSortFilterProxyModel>
-#include <QDebug>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QTimer>
 
+#include "qz_namespace.h"
 #include "ui_adblockdialog.h"
 
 class AdBlockModel;
 class AdBlockManager;
 class TreeSortFilterProxyModel;
-class AdBlockDialog : public QDialog, public Ui_AdBlockDialog
+
+class QT_QUPZILLA_EXPORT AdBlockDialog : public QDialog, public Ui_AdBlockDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/adblock/adblockicon.cpp b/src/lib/adblock/adblockicon.cpp
index 056e91341..7d4da2cbe 100644
--- a/src/lib/adblock/adblockicon.cpp
+++ b/src/lib/adblock/adblockicon.cpp
@@ -24,6 +24,9 @@
 #include "tabwidget.h"
 #include "desktopnotificationsfactory.h"
 
+#include <QMenu>
+#include <QTimer>
+
 AdBlockIcon::AdBlockIcon(QupZilla* mainClass, QWidget* parent)
     : ClickableLabel(parent)
     , p_QupZilla(mainClass)
diff --git a/src/lib/adblock/adblockicon.h b/src/lib/adblock/adblockicon.h
index 08e4fbc21..bff8e9fa3 100644
--- a/src/lib/adblock/adblockicon.h
+++ b/src/lib/adblock/adblockicon.h
@@ -18,13 +18,16 @@
 #ifndef ADBLOCKICON_H
 #define ADBLOCKICON_H
 
-#include <QObject>
-#include <QMenu>
 
+#include "qz_namespace.h"
 #include "clickablelabel.h"
 
+class QMenu;
+class QUrl;
+
 class QupZilla;
-class AdBlockIcon : public ClickableLabel
+
+class QT_QUPZILLA_EXPORT AdBlockIcon : public ClickableLabel
 {
     Q_OBJECT
 public:
diff --git a/src/lib/adblock/adblockmanager.cpp b/src/lib/adblock/adblockmanager.cpp
index 677614d38..2d95d5812 100644
--- a/src/lib/adblock/adblockmanager.cpp
+++ b/src/lib/adblock/adblockmanager.cpp
@@ -52,6 +52,8 @@
 #include "qupzilla.h"
 #include "settings.h"
 
+#include <QDateTime>
+
 AdBlockManager* AdBlockManager::s_adBlockManager = 0;
 
 AdBlockManager::AdBlockManager(QObject* parent)
diff --git a/src/lib/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h
index 96b344e27..b106b1bf6 100644
--- a/src/lib/adblock/adblockmanager.h
+++ b/src/lib/adblock/adblockmanager.h
@@ -46,15 +46,18 @@
 #define ADBLOCKMANAGER_H
 
 #include <QObject>
-#include <QStringList>
 #include <QWeakPointer>
 
+#include "qz_namespace.h"
+
 class QUrl;
+
 class AdBlockDialog;
 class AdBlockNetwork;
 class AdBlockPage;
 class AdBlockSubscription;
-class AdBlockManager : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/lib/adblock/adblocknetwork.h b/src/lib/adblock/adblocknetwork.h
index 76ca31e1f..13633e49c 100644
--- a/src/lib/adblock/adblocknetwork.h
+++ b/src/lib/adblock/adblocknetwork.h
@@ -48,9 +48,12 @@
 
 #include <QObject>
 
+#include "qz_namespace.h"
+
 class QNetworkRequest;
 class QNetworkReply;
-class AdBlockNetwork : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockNetwork : public QObject
 {
 public:
     AdBlockNetwork(QObject* parent = 0);
diff --git a/src/lib/adblock/adblockpage.cpp b/src/lib/adblock/adblockpage.cpp
index 34501123d..a8e5e86aa 100644
--- a/src/lib/adblock/adblockpage.cpp
+++ b/src/lib/adblock/adblockpage.cpp
@@ -25,20 +25,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
 #include "adblockpage.h"
-
 #include "adblockmanager.h"
 #include "adblocksubscription.h"
 #include "adblockrule.h"
 
-#if QT_VERSION >= 0x040600
-#include <qwebelement.h>
-#endif
-#include <qwebpage.h>
-#include <qwebframe.h>
-
-#include <qdebug.h>
+#include <QWebElement>
+#include <QWebPage>
+#include <QWebFrame>
 
 // #define ADBLOCKPAGE_DEBUG
 
@@ -89,7 +83,7 @@ void AdBlockPage::checkRule(const AdBlockRule* rule, QWebPage* page, const QStri
     }
 
     Q_UNUSED(page);
-#if QT_VERSION >= 0x040600
+
     QWebElement document = page->mainFrame()->documentElement();
     QWebElementCollection elements = document.findAll(selectorQuery);
 #if defined(ADBLOCKPAGE_DEBUG)
@@ -101,8 +95,6 @@ void AdBlockPage::checkRule(const AdBlockRule* rule, QWebPage* page, const QStri
         element.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
         element.removeFromDocument();
     }
-
-#endif
 }
 
 void AdBlockPage::applyRulesToPage(QWebPage* page)
@@ -114,7 +106,7 @@ void AdBlockPage::applyRulesToPage(QWebPage* page)
     if (!manager->isEnabled()) {
         return;
     }
-#if QT_VERSION >= 0x040600
+
     QString host = page->mainFrame()->url().host();
     AdBlockSubscription* subscription = manager->subscription();
 
@@ -122,6 +114,5 @@ void AdBlockPage::applyRulesToPage(QWebPage* page)
     foreach(const AdBlockRule * rule, rules) {
         checkRule(rule, page, host);
     }
-#endif
 }
 
diff --git a/src/lib/adblock/adblockpage.h b/src/lib/adblock/adblockpage.h
index b3f8b4fad..afa85a513 100644
--- a/src/lib/adblock/adblockpage.h
+++ b/src/lib/adblock/adblockpage.h
@@ -29,11 +29,15 @@
 #ifndef ADBLOCKPAGE_H
 #define ADBLOCKPAGE_H
 
-#include <qobject.h>
+#include <QObject>
+
+#include "qz_namespace.h"
+
+class QWebPage;
 
 class AdBlockRule;
-class QWebPage;
-class AdBlockPage : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockPage : public QObject
 {
 public:
     AdBlockPage(QObject* parent = 0);
diff --git a/src/lib/adblock/adblockrule.cpp b/src/lib/adblock/adblockrule.cpp
index 05e85677c..797095b87 100644
--- a/src/lib/adblock/adblockrule.cpp
+++ b/src/lib/adblock/adblockrule.cpp
@@ -45,12 +45,13 @@
  */
 
 #include "adblockrule.h"
-
 #include "adblocksubscription.h"
 
-#include <qdebug.h>
-#include <qregexp.h>
-#include <qurl.h>
+#include <QDebug>
+#include <QRegExp>
+#include <QUrl>
+#include <QString>
+#include <QStringList>
 
 // #define ADBLOCKRULE_DEBUG
 
diff --git a/src/lib/adblock/adblockrule.h b/src/lib/adblock/adblockrule.h
index ea0e50be3..00fc927c1 100644
--- a/src/lib/adblock/adblockrule.h
+++ b/src/lib/adblock/adblockrule.h
@@ -46,10 +46,14 @@
 #ifndef ADBLOCKRULE_H
 #define ADBLOCKRULE_H
 
-#include <qstringlist.h>
+#include <QObject>
+#include <QRegExp>
+#include <QStringList>
+
+#include "qz_namespace.h"
 
 class QUrl;
-class QRegExp;
+
 class AdBlockRule
 {
 
diff --git a/src/lib/adblock/adblocksubscription.cpp b/src/lib/adblock/adblocksubscription.cpp
index 37f63de47..071de8cbd 100644
--- a/src/lib/adblock/adblocksubscription.cpp
+++ b/src/lib/adblock/adblocksubscription.cpp
@@ -45,6 +45,11 @@
 #include "adblocksubscription.h"
 #include "mainapplication.h"
 #include "networkmanager.h"
+
+#include <QFile>
+#include <QTimer>
+#include <QNetworkReply>
+#include <QDebug>
 // #define ADBLOCKSUBSCRIPTION_DEBUG
 
 AdBlockSubscription::AdBlockSubscription(QObject* parent)
diff --git a/src/lib/adblock/adblocksubscription.h b/src/lib/adblock/adblocksubscription.h
index b9a68110c..411d8087a 100644
--- a/src/lib/adblock/adblocksubscription.h
+++ b/src/lib/adblock/adblocksubscription.h
@@ -46,20 +46,15 @@
 #ifndef ADBLOCKSUBSCRIPTION_H
 #define ADBLOCKSUBSCRIPTION_H
 
-#include "adblockrule.h"
-#include <QObject>
 #include <QList>
-#include <QDateTime>
-#include <QDebug>
-#include <QFile>
-#include <QNetworkReply>
-#include <QTextStream>
-#include <QFileInfo>
-#include <QTimer>
+
+#include "qz_namespace.h"
+#include "adblockrule.h"
 
 class QNetworkReply;
 class QUrl;
-class AdBlockSubscription : public QObject
+
+class QT_QUPZILLA_EXPORT AdBlockSubscription : public QObject
 {
     Q_OBJECT
 
diff --git a/src/lib/app/autosaver.h b/src/lib/app/autosaver.h
index c600f8f8f..0c9facfeb 100644
--- a/src/lib/app/autosaver.h
+++ b/src/lib/app/autosaver.h
@@ -20,9 +20,10 @@
 
 #include <QObject>
 #include <QBasicTimer>
-#include <QDebug>
 
-class AutoSaver : public QObject
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT AutoSaver : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/app/commandlineoptions.h b/src/lib/app/commandlineoptions.h
index 348794ab8..4f3b52a21 100644
--- a/src/lib/app/commandlineoptions.h
+++ b/src/lib/app/commandlineoptions.h
@@ -23,7 +23,7 @@
 
 #include "qz_namespace.h"
 
-class CommandLineOptions
+class QT_QUPZILLA_EXPORT CommandLineOptions
 {
 public:
     struct ActionPair {
diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
index f136bcddd..3b469337b 100644
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@@ -47,6 +47,18 @@
 #include "locationbarsettings.h"
 #include "webviewsettings.h"
 
+#ifdef Q_WS_MAC
+#include <QFileOpenEvent>
+#endif
+#include <QWebSecurityOrigin>
+#include <QNetworkDiskCache>
+#include <QDir>
+#include <QDesktopServices>
+#include <QSettings>
+#include <QTimer>
+#include <QTranslator>
+#include <QMessageBox>
+
 #ifdef Q_WS_WIN
 #define DEFAULT_CHECK_UPDATES true
 #else
diff --git a/src/lib/app/mainapplication.h b/src/lib/app/mainapplication.h
index 248acd0a6..454a8de14 100644
--- a/src/lib/app/mainapplication.h
+++ b/src/lib/app/mainapplication.h
@@ -20,23 +20,17 @@
 
 #define mApp MainApplication::getInstance()
 
-#include <QEvent>
+#include <QList>
 #include <QUrl>
-#include <QWebSettings>
 #include <QWeakPointer>
-#include <QNetworkDiskCache>
-#include <QWebSecurityOrigin>
-#include <iostream>
-
-#ifdef Q_WS_MAC
-#include <QFileOpenEvent>
-#endif
 
 #include "qtsingleapplication.h"
 #include "commandlineoptions.h"
-
 #include "qz_namespace.h"
 
+class QWebSettings;
+class QNetworkDiskCache;
+
 class QupZilla;
 class CookieManager;
 class BrowsingLibrary;
@@ -53,7 +47,8 @@ class DesktopNotificationsFactory;
 class IconProvider;
 class SearchEnginesManager;
 class DatabaseWriter;
-class MainApplication : public QtSingleApplication
+
+class QT_QUPZILLA_EXPORT MainApplication : public QtSingleApplication
 {
     Q_OBJECT
 
diff --git a/src/lib/app/profileupdater.cpp b/src/lib/app/profileupdater.cpp
index a65cc550f..887e4763c 100644
--- a/src/lib/app/profileupdater.cpp
+++ b/src/lib/app/profileupdater.cpp
@@ -20,6 +20,10 @@
 #include "updater.h"
 #include "mainapplication.h"
 
+#include <QDir>
+#include <QSqlQuery>
+#include <iostream>
+
 ProfileUpdater::ProfileUpdater(const QString &profilePath)
     : m_profilePath(profilePath)
 {
diff --git a/src/lib/app/profileupdater.h b/src/lib/app/profileupdater.h
index 5caa71c82..22b07060f 100644
--- a/src/lib/app/profileupdater.h
+++ b/src/lib/app/profileupdater.h
@@ -18,8 +18,9 @@
 #ifndef PROFILEUPDATER_H
 #define PROFILEUPDATER_H
 
-#include <QDir>
-#include <iostream>
+#include <QString>
+
+#include "qz_namespace.h"
 
 class ProfileUpdater
 {
diff --git a/src/lib/app/proxystyle.h b/src/lib/app/proxystyle.h
index 4d06ced0a..dd0b706ef 100644
--- a/src/lib/app/proxystyle.h
+++ b/src/lib/app/proxystyle.h
@@ -3,7 +3,9 @@
 
 #include <QProxyStyle>
 
-class ProxyStyle : public QProxyStyle
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT ProxyStyle : public QProxyStyle
 {
 public:
     explicit ProxyStyle();
diff --git a/src/lib/app/qupzilla.cpp b/src/lib/app/qupzilla.cpp
index b1f57b18c..907959cce 100644
--- a/src/lib/app/qupzilla.cpp
+++ b/src/lib/app/qupzilla.cpp
@@ -64,6 +64,21 @@
 #include "webtab.h"
 #include "speeddial.h"
 
+#include <QSplitter>
+#include <QStatusBar>
+#include <QMenuBar>
+#include <QTimer>
+#include <QShortcut>
+#include <QStackedWidget>
+#include <QSqlQuery>
+#include <QTextCodec>
+#include <QFileDialog>
+#include <QNetworkRequest>
+#include <QDesktopServices>
+#include <QPrintPreviewDialog>
+#include <QWebFrame>
+#include <QMessageBox>
+
 const QString QupZilla::VERSION = "1.1.8";
 const QString QupZilla::BUILDTIME =  __DATE__" "__TIME__;
 const QString QupZilla::AUTHOR = "David Rosca";
diff --git a/src/lib/app/qupzilla.h b/src/lib/app/qupzilla.h
index d5ac627bf..966fda29d 100644
--- a/src/lib/app/qupzilla.h
+++ b/src/lib/app/qupzilla.h
@@ -19,33 +19,17 @@
 #define QUPZILLA_H
 
 #include <QMainWindow>
-#include <QMenuBar>
-#include <QTranslator>
-#include <QDesktopWidget>
-#include <QDebug>
 #include <QUrl>
-#include <QWebView>
-#include <QWebFrame>
-#include <QWebHistory>
-#include <QtNetwork/QtNetwork>
-#include <QtSql/QtSql>
-#include <QMessageBox>
-#include <QFile>
-#include <QMovie>
-#include <QDesktopServices>
-#include <QStatusBar>
-#include <QSplitter>
-#include <QPushButton>
-#include <QProgressBar>
-#include <QPrintPreviewDialog>
-#include <QToolButton>
-#include <QWebInspector>
-#include <QWeakPointer>
-#include <QVBoxLayout>
 #include "qwebkitversion.h"
 
 #include "qz_namespace.h"
 
+class QMenuBar;
+class QLabel;
+class QVBoxLayout;
+class QSplitter;
+class QWebFrame;
+
 class Menu;
 class TabWidget;
 class TabbedWebView;
@@ -63,7 +47,7 @@ class NavigationBar;
 class ClickableLabel;
 class WebInspectorDockWidget;
 class LocationBar;
-class QupZilla : public QMainWindow
+class QT_QUPZILLA_EXPORT QupZilla : public QMainWindow
 {
     Q_OBJECT
 
diff --git a/src/lib/app/qz_namespace.h b/src/lib/app/qz_namespace.h
index 6ddf4f1a0..41fe3bd09 100644
--- a/src/lib/app/qz_namespace.h
+++ b/src/lib/app/qz_namespace.h
@@ -1,6 +1,12 @@
 #ifndef QZ_NAMESPACE_H
 #define QZ_NAMESPACE_H
 
+#ifdef QUPZILLA_SHAREDLIBRARY
+#define QT_QUPZILLA_EXPORT Q_DECL_EXPORT
+#else
+#define QT_QUPZILLA_EXPORT Q_DECL_IMPORT
+#endif
+
 #include <QFlags>
 
 namespace Qz
diff --git a/src/lib/app/settings.cpp b/src/lib/app/settings.cpp
index c4b43b4d2..f8205651f 100644
--- a/src/lib/app/settings.cpp
+++ b/src/lib/app/settings.cpp
@@ -1,5 +1,24 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "settings.h"
 
+#include <QSettings>
+
 QSettings* Settings::m_settings = 0;
 
 Settings::Settings()
diff --git a/src/lib/app/settings.h b/src/lib/app/settings.h
index 39b6a3bd0..50e3305b4 100644
--- a/src/lib/app/settings.h
+++ b/src/lib/app/settings.h
@@ -1,8 +1,29 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <QObject>
-#include <QSettings>
+#include <qglobal.h>
+#include <QVariant>
+
+#include "qz_namespace.h"
+
+class QSettings;
 
 class Settings
 {
diff --git a/src/lib/autofill/autofillmodel.cpp b/src/lib/autofill/autofillmodel.cpp
index 6252195e5..70f5614d2 100644
--- a/src/lib/autofill/autofillmodel.cpp
+++ b/src/lib/autofill/autofillmodel.cpp
@@ -25,6 +25,11 @@
 #include "databasewriter.h"
 #include "settings.h"
 
+#include <QXmlStreamWriter>
+#include <QXmlStreamReader>
+#include <QWebFrame>
+#include <QNetworkRequest>
+
 AutoFillModel::AutoFillModel(QupZilla* mainClass, QObject* parent)
     : QObject(parent)
     , p_QupZilla(mainClass)
diff --git a/src/lib/autofill/autofillmodel.h b/src/lib/autofill/autofillmodel.h
index 01b9d2f40..eaddec195 100644
--- a/src/lib/autofill/autofillmodel.h
+++ b/src/lib/autofill/autofillmodel.h
@@ -18,16 +18,18 @@
 #ifndef AUTOFILLMODEL_H
 #define AUTOFILLMODEL_H
 
-#include <QObject>
-#include <QUrl>
-#include <QNetworkRequest>
-#include <QWebElement>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
+#include <QPair>
+
+#include "qz_namespace.h"
+
+class QUrl;
+class QWebElement;
+class QNetworkRequest;
 
 class QupZilla;
 class WebPage;
-class AutoFillModel : public QObject
+
+class QT_QUPZILLA_EXPORT AutoFillModel : public QObject
 {
 public:
     typedef QPair<QString, QString> QueryItem;
diff --git a/src/lib/autofill/autofillnotification.h b/src/lib/autofill/autofillnotification.h
index 0ca1c8bb8..984f8eaff 100644
--- a/src/lib/autofill/autofillnotification.h
+++ b/src/lib/autofill/autofillnotification.h
@@ -18,19 +18,18 @@
 #ifndef AUTOFILLWIDGET_H
 #define AUTOFILLWIDGET_H
 
-#include <QWidget>
 #include <QUrl>
-#include <QTimer>
-#include <QDebug>
 
+#include "qz_namespace.h"
 #include "animatedwidget.h"
 
 namespace Ui
 {
 class AutoFillWidget;
 }
+
 class AnimatedWidget;
-class AutoFillNotification : public AnimatedWidget
+class QT_QUPZILLA_EXPORT AutoFillNotification : public AnimatedWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/bookmarks/bookmarkicon.cpp b/src/lib/bookmarks/bookmarkicon.cpp
index e4ff185cb..039481341 100644
--- a/src/lib/bookmarks/bookmarkicon.cpp
+++ b/src/lib/bookmarks/bookmarkicon.cpp
@@ -25,6 +25,8 @@
 #include "pluginproxy.h"
 #include "speeddial.h"
 
+#include <QStyle>
+
 BookmarkIcon::BookmarkIcon(QupZilla* mainClass, QWidget* parent)
     : ClickableLabel(parent)
     , p_QupZilla(mainClass)
diff --git a/src/lib/bookmarks/bookmarkicon.h b/src/lib/bookmarks/bookmarkicon.h
index 58ed88096..c62c643f1 100644
--- a/src/lib/bookmarks/bookmarkicon.h
+++ b/src/lib/bookmarks/bookmarkicon.h
@@ -22,11 +22,12 @@
 
 #include "clickablelabel.h"
 #include "bookmarksmodel.h"
+#include "qz_namespace.h"
 
 class SpeedDial;
 class QupZilla;
-class BookmarksModel;
-class BookmarkIcon : public ClickableLabel
+
+class QT_QUPZILLA_EXPORT BookmarkIcon : public ClickableLabel
 {
     Q_OBJECT
 public:
diff --git a/src/lib/bookmarks/bookmarksmanager.cpp b/src/lib/bookmarks/bookmarksmanager.cpp
index f6b35046f..ea568cf3c 100644
--- a/src/lib/bookmarks/bookmarksmanager.cpp
+++ b/src/lib/bookmarks/bookmarksmanager.cpp
@@ -29,6 +29,13 @@
 #include "bookmarksimportdialog.h"
 #include "webtab.h"
 
+#include <QInputDialog>
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QShortcut>
+#include <QMenu>
+#include <QSqlQuery>
+
 BookmarksManager::BookmarksManager(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , m_isRefreshing(false)
diff --git a/src/lib/bookmarks/bookmarksmanager.h b/src/lib/bookmarks/bookmarksmanager.h
index e2b7a2a02..dbdd7a3d5 100644
--- a/src/lib/bookmarks/bookmarksmanager.h
+++ b/src/lib/bookmarks/bookmarksmanager.h
@@ -19,23 +19,22 @@
 #define BOOKMARKSMANAGER_H
 
 #include <QWidget>
-#include <QTreeWidgetItem>
-#include <QInputDialog>
 #include <QWeakPointer>
-#include <QDialogButtonBox>
-#include <QShortcut>
 
 #include "bookmarksmodel.h"
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class BookmarksManager;
 }
 
+class QTreeWidgetItem;
+
 class WebView;
 class QupZilla;
 class BookmarksModel;
-class BookmarksManager : public QWidget
+class QT_QUPZILLA_EXPORT BookmarksManager : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/bookmarks/bookmarksmodel.cpp b/src/lib/bookmarks/bookmarksmodel.cpp
index 6b4faa2ab..36cd080d4 100644
--- a/src/lib/bookmarks/bookmarksmodel.cpp
+++ b/src/lib/bookmarks/bookmarksmodel.cpp
@@ -16,11 +16,13 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "bookmarksmodel.h"
-#include "settings.h"
-#include "mainapplication.h"
 #include "tabbedwebview.h"
 #include "iconprovider.h"
 #include "databasewriter.h"
+#include "mainapplication.h"
+#include "settings.h"
+
+#include <QBuffer>
 
 // SQLite DB -> table bookmarks + folders
 // Unique in bookmarks table is id
diff --git a/src/lib/bookmarks/bookmarksmodel.h b/src/lib/bookmarks/bookmarksmodel.h
index 1cd39803c..f557225bf 100644
--- a/src/lib/bookmarks/bookmarksmodel.h
+++ b/src/lib/bookmarks/bookmarksmodel.h
@@ -23,13 +23,17 @@
 #define _bookmarksUnsorted BookmarksModel::toTranslatedFolder("unsorted")
 
 #include <QObject>
-#include <QVariant>
 #include <QUrl>
-#include <QIcon>
-#include <QSqlQuery>
+#include <QImage>
+#include <QVariant>
+
+#include "qz_namespace.h"
+
+class QIcon;
 
 class WebView;
-class BookmarksModel : public QObject
+
+class QT_QUPZILLA_EXPORT BookmarksModel : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/bookmarks/bookmarkstoolbar.cpp b/src/lib/bookmarks/bookmarkstoolbar.cpp
index df87da4ee..49bccb0e0 100644
--- a/src/lib/bookmarks/bookmarkstoolbar.cpp
+++ b/src/lib/bookmarks/bookmarkstoolbar.cpp
@@ -26,6 +26,16 @@
 #include "enhancedmenu.h"
 #include "tabwidget.h"
 
+#include <QDialog>
+#include <QIcon>
+#include <QHBoxLayout>
+#include <QFormLayout>
+#include <QLineEdit>
+#include <QLabel>
+#include <QDialogButtonBox>
+#include <QMimeData>
+#include <QDragEnterEvent>
+
 BookmarksToolbar::BookmarksToolbar(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , p_QupZilla(mainClass)
diff --git a/src/lib/bookmarks/bookmarkstoolbar.h b/src/lib/bookmarks/bookmarkstoolbar.h
index 901e79e16..f0dd07814 100644
--- a/src/lib/bookmarks/bookmarkstoolbar.h
+++ b/src/lib/bookmarks/bookmarkstoolbar.h
@@ -18,23 +18,20 @@
 #ifndef BOOKMARKSTOOLBAR_H
 #define BOOKMARKSTOOLBAR_H
 
-#include <QMenu>
-#include <QToolButton>
-#include <QHBoxLayout>
-#include <QFormLayout>
-#include <QDialogButtonBox>
-#include <QDropEvent>
-#include <QLabel>
-#include <QLineEdit>
+#include <QWidget>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
+class QHBoxLayout;
+
 class QupZilla;
 class BookmarksModel;
 class HistoryModel;
 class ToolButton;
 class Menu;
-class BookmarksToolbar : public QWidget
+
+class QT_QUPZILLA_EXPORT BookmarksToolbar : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/bookmarks/bookmarkswidget.cpp b/src/lib/bookmarks/bookmarkswidget.cpp
index c7141c1b3..fd76ca59e 100644
--- a/src/lib/bookmarks/bookmarkswidget.cpp
+++ b/src/lib/bookmarks/bookmarkswidget.cpp
@@ -23,6 +23,9 @@
 #include "speeddial.h"
 #include "webview.h"
 
+#include <QToolTip>
+#include <QSqlQuery>
+
 BookmarksWidget::BookmarksWidget(WebView* view, QWidget* parent)
     : QMenu(parent)
     , ui(new Ui::BookmarksWidget)
diff --git a/src/lib/bookmarks/bookmarkswidget.h b/src/lib/bookmarks/bookmarkswidget.h
index 37b909c5f..e99abf6d3 100644
--- a/src/lib/bookmarks/bookmarkswidget.h
+++ b/src/lib/bookmarks/bookmarkswidget.h
@@ -18,18 +18,10 @@
 #ifndef BOOKMARKSWIDGET_H
 #define BOOKMARKSWIDGET_H
 
-#include <QMenu>
-#include <QFormLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QMouseEvent>
-#include <QDebug>
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QToolTip>
 #include <QUrl>
+#include <QMenu>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
@@ -39,7 +31,7 @@ class BookmarksWidget;
 class WebView;
 class SpeedDial;
 class BookmarksModel;
-class BookmarksWidget : public QMenu
+class QT_QUPZILLA_EXPORT BookmarksWidget : public QMenu
 {
     Q_OBJECT
 public:
diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.cpp b/src/lib/bookmarksimport/bookmarksimportdialog.cpp
index dd6bb88e7..d8e6db0b2 100644
--- a/src/lib/bookmarksimport/bookmarksimportdialog.cpp
+++ b/src/lib/bookmarksimport/bookmarksimportdialog.cpp
@@ -26,6 +26,10 @@
 #include "iconprovider.h"
 #include "networkmanager.h"
 
+#include <QWebSettings>
+#include <QMessageBox>
+#include <QFileDialog>
+
 BookmarksImportDialog::BookmarksImportDialog(QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::BookmarksImportDialog)
diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.h b/src/lib/bookmarksimport/bookmarksimportdialog.h
index 0b5d05b2e..047256200 100644
--- a/src/lib/bookmarksimport/bookmarksimportdialog.h
+++ b/src/lib/bookmarksimport/bookmarksimportdialog.h
@@ -19,13 +19,9 @@
 #define BOOKMARKSIMPORTDIALOG_H
 
 #include <QDialog>
-#include <QFileDialog>
-#include <QMessageBox>
 #include <QPair>
-#include <QWebPage>
-#include <QWebFrame>
-#include <QWebSettings>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
 namespace Ui
@@ -34,7 +30,7 @@ class BookmarksImportDialog;
 }
 
 class IconFetcher;
-class BookmarksImportDialog : public QDialog
+class QT_QUPZILLA_EXPORT BookmarksImportDialog : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/bookmarksimport/chromeimporter.cpp b/src/lib/bookmarksimport/chromeimporter.cpp
index 0a9e1135c..5218ea3cb 100644
--- a/src/lib/bookmarksimport/chromeimporter.cpp
+++ b/src/lib/bookmarksimport/chromeimporter.cpp
@@ -19,6 +19,11 @@
 #include "globalfunctions.h"
 #include "bookmarksimportdialog.h"
 
+#include <QScriptEngine>
+#include <QScriptValue>
+#include <QScriptValueIterator>
+#include <QRegExp>
+
 ChromeImporter::ChromeImporter(QObject* parent)
     : QObject(parent)
     , m_error(false)
diff --git a/src/lib/bookmarksimport/chromeimporter.h b/src/lib/bookmarksimport/chromeimporter.h
index bc9c86a3c..d26ca055a 100644
--- a/src/lib/bookmarksimport/chromeimporter.h
+++ b/src/lib/bookmarksimport/chromeimporter.h
@@ -20,14 +20,11 @@
 
 #include <QObject>
 #include <QFile>
-#include <QScriptEngine>
-#include <QScriptValue>
-#include <QScriptValueIterator>
-#include <QRegExp>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class ChromeImporter : public QObject
+class QT_QUPZILLA_EXPORT ChromeImporter : public QObject
 {
 public:
     explicit ChromeImporter(QObject* parent = 0);
diff --git a/src/lib/bookmarksimport/firefoximporter.cpp b/src/lib/bookmarksimport/firefoximporter.cpp
index c83256e32..73ad4c96d 100644
--- a/src/lib/bookmarksimport/firefoximporter.cpp
+++ b/src/lib/bookmarksimport/firefoximporter.cpp
@@ -18,6 +18,9 @@
 #include "firefoximporter.h"
 #include "bookmarksimportdialog.h"
 
+#include <QSqlQuery>
+#include <QSqlError>
+
 FirefoxImporter::FirefoxImporter(QObject* parent)
     : QObject(parent)
     , m_error(false)
diff --git a/src/lib/bookmarksimport/firefoximporter.h b/src/lib/bookmarksimport/firefoximporter.h
index 9c030b3cd..9a7f9279c 100644
--- a/src/lib/bookmarksimport/firefoximporter.h
+++ b/src/lib/bookmarksimport/firefoximporter.h
@@ -19,14 +19,13 @@
 #define FIREFOXIMPORTER_H
 
 #include <QObject>
-#include <QSqlDatabase>
-#include <QSqlQuery>
-#include <QSqlError>
 #include <QFile>
+#include <QSqlDatabase>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class FirefoxImporter : public QObject
+class QT_QUPZILLA_EXPORT FirefoxImporter : public QObject
 {
 public:
     explicit FirefoxImporter(QObject* parent = 0);
diff --git a/src/lib/bookmarksimport/htmlimporter.cpp b/src/lib/bookmarksimport/htmlimporter.cpp
index d74a8d5fa..850d602ad 100644
--- a/src/lib/bookmarksimport/htmlimporter.cpp
+++ b/src/lib/bookmarksimport/htmlimporter.cpp
@@ -1,6 +1,25 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "htmlimporter.h"
 #include "bookmarksimportdialog.h"
 
+#include <QRegExp>
+
 HtmlImporter::HtmlImporter(QObject* parent)
     : QObject(parent)
     , m_error(false)
diff --git a/src/lib/bookmarksimport/htmlimporter.h b/src/lib/bookmarksimport/htmlimporter.h
index 8f3ebb774..c250582d1 100644
--- a/src/lib/bookmarksimport/htmlimporter.h
+++ b/src/lib/bookmarksimport/htmlimporter.h
@@ -1,13 +1,30 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef HTMLIMPORTER_H
 #define HTMLIMPORTER_H
 
 #include <QObject>
 #include <QFile>
-#include <QRegExp>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class HtmlImporter : public QObject
+class QT_QUPZILLA_EXPORT HtmlImporter : public QObject
 {
 public:
     explicit HtmlImporter(QObject* parent = 0);
diff --git a/src/lib/bookmarksimport/operaimporter.h b/src/lib/bookmarksimport/operaimporter.h
index ff981ecbc..eea0a649a 100644
--- a/src/lib/bookmarksimport/operaimporter.h
+++ b/src/lib/bookmarksimport/operaimporter.h
@@ -21,9 +21,10 @@
 #include <QObject>
 #include <QFile>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
-class OperaImporter : public QObject
+class QT_QUPZILLA_EXPORT OperaImporter : public QObject
 {
 public:
     explicit OperaImporter(QObject* parent = 0);
diff --git a/src/lib/cookies/cookiejar.cpp b/src/lib/cookies/cookiejar.cpp
index 8d20c46d6..e2d544124 100644
--- a/src/lib/cookies/cookiejar.cpp
+++ b/src/lib/cookies/cookiejar.cpp
@@ -19,6 +19,8 @@
 #include "qupzilla.h"
 #include "mainapplication.h"
 #include "settings.h"
+
+#include <QDateTime>
 //#define COOKIE_DEBUG
 
 bool containsDomain(QString string, QString domain)
diff --git a/src/lib/cookies/cookiejar.h b/src/lib/cookies/cookiejar.h
index 05eb321d2..c87f465c7 100644
--- a/src/lib/cookies/cookiejar.h
+++ b/src/lib/cookies/cookiejar.h
@@ -18,13 +18,15 @@
 #ifndef COOKIEJAR_H
 #define COOKIEJAR_H
 
-#include <QNetworkCookieJar>
-#include <QDebug>
+#include "qz_namespace.h"
+
 #include <QFile>
 #include <QStringList>
+#include <QNetworkCookieJar>
 
 class QupZilla;
-class CookieJar : public QNetworkCookieJar
+
+class QT_QUPZILLA_EXPORT CookieJar : public QNetworkCookieJar
 {
 public:
     explicit CookieJar(QupZilla* mainClass, QObject* parent = 0);
diff --git a/src/lib/cookies/cookiemanager.cpp b/src/lib/cookies/cookiemanager.cpp
index 4369d6a04..b73c68c54 100644
--- a/src/lib/cookies/cookiemanager.cpp
+++ b/src/lib/cookies/cookiemanager.cpp
@@ -23,6 +23,13 @@
 #include "globalfunctions.h"
 #include "settings.h"
 
+#include <QMessageBox>
+#include <QDateTime>
+#include <QShortcut>
+#include <QTimer>
+#include <QInputDialog>
+#include <QCloseEvent>
+
 CookieManager::CookieManager(QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::CookieManager)
diff --git a/src/lib/cookies/cookiemanager.h b/src/lib/cookies/cookiemanager.h
index de5dcfd5f..34b9dd5b3 100644
--- a/src/lib/cookies/cookiemanager.h
+++ b/src/lib/cookies/cookiemanager.h
@@ -19,20 +19,19 @@
 #define COOKIEMANAGER_H
 
 #include <QWidget>
-#include <QTimer>
-#include <QNetworkCookie>
-#include <QTreeWidgetItem>
-#include <QShortcut>
-#include <QHash>
-#include <QInputDialog>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class CookieManager;
 }
 
+class QTreeWidgetItem;
+
 class QupZilla;
-class CookieManager : public QWidget
+
+class QT_QUPZILLA_EXPORT CookieManager : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/desktopnotifications/desktopnotification.cpp b/src/lib/desktopnotifications/desktopnotification.cpp
index 14866bbf0..a427b70b4 100644
--- a/src/lib/desktopnotifications/desktopnotification.cpp
+++ b/src/lib/desktopnotifications/desktopnotification.cpp
@@ -18,6 +18,9 @@
 #include "desktopnotification.h"
 #include "ui_desktopnotification.h"
 
+#include <QTimer>
+#include <QMouseEvent>
+
 DesktopNotification::DesktopNotification(bool setPosition)
     : QWidget(0)
     , ui(new Ui::DesktopNotification)
diff --git a/src/lib/desktopnotifications/desktopnotification.h b/src/lib/desktopnotifications/desktopnotification.h
index 5bb1fbaca..b2935b201 100644
--- a/src/lib/desktopnotifications/desktopnotification.h
+++ b/src/lib/desktopnotifications/desktopnotification.h
@@ -18,9 +18,9 @@
 #ifndef DESKTOPNOTIFICATION_H
 #define DESKTOPNOTIFICATION_H
 
+#include "qz_namespace.h"
+
 #include <QWidget>
-#include <QTimer>
-#include <QMouseEvent>
 #include <QPixmap>
 
 namespace Ui
@@ -28,7 +28,7 @@ namespace Ui
 class DesktopNotification;
 }
 
-class DesktopNotification : public QWidget
+class QT_QUPZILLA_EXPORT DesktopNotification : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/desktopnotifications/desktopnotificationsfactory.cpp b/src/lib/desktopnotifications/desktopnotificationsfactory.cpp
index 9c331e15b..19e2ec8f2 100644
--- a/src/lib/desktopnotifications/desktopnotificationsfactory.cpp
+++ b/src/lib/desktopnotifications/desktopnotificationsfactory.cpp
@@ -20,6 +20,13 @@
 #include "mainapplication.h"
 #include "settings.h"
 
+#include <QFile>
+#include <QDir>
+
+#ifdef Q_WS_X11
+#include <QDBusInterface>
+#endif
+
 DesktopNotificationsFactory::DesktopNotificationsFactory(QObject* parent)
     : QObject(parent)
     , m_uint(0)
diff --git a/src/lib/desktopnotifications/desktopnotificationsfactory.h b/src/lib/desktopnotifications/desktopnotificationsfactory.h
index 1736fd64c..99170151f 100644
--- a/src/lib/desktopnotifications/desktopnotificationsfactory.h
+++ b/src/lib/desktopnotifications/desktopnotificationsfactory.h
@@ -18,19 +18,17 @@
 #ifndef DESKTOPNOTIFICATIONSFACTORY_H
 #define DESKTOPNOTIFICATIONSFACTORY_H
 
+#include "qz_namespace.h"
+
 #include <QObject>
-#ifdef Q_WS_X11
-#include <QDBusInterface>
-#endif
-#include <QStringList>
 #include <QPoint>
-#include <QTimer>
 #include <QWeakPointer>
-#include <QDir>
-#include <QPixmap>
+
+class QPixmap;
 
 class DesktopNotification;
-class DesktopNotificationsFactory : public QObject
+
+class QT_QUPZILLA_EXPORT DesktopNotificationsFactory : public QObject
 {
 public:
     enum Type { DesktopNative, PopupWidget };
diff --git a/src/lib/downloads/downloadfilehelper.cpp b/src/lib/downloads/downloadfilehelper.cpp
index 3e3e279eb..1858955f6 100644
--- a/src/lib/downloads/downloadfilehelper.cpp
+++ b/src/lib/downloads/downloadfilehelper.cpp
@@ -26,6 +26,14 @@
 #include "globalfunctions.h"
 #include "settings.h"
 
+#include <QFileIconProvider>
+#include <QListWidgetItem>
+#include <QTemporaryFile>
+#include <QWebHistory>
+#include <QDebug>
+#include <QFileDialog>
+#include <QDesktopServices>
+
 DownloadFileHelper::DownloadFileHelper(const QString &lastDownloadPath, const QString &downloadPath, bool useNativeDialog, WebPage* page)
     : QObject()
     , m_lastDownloadOption(DownloadManager::SaveFile)
diff --git a/src/lib/downloads/downloadfilehelper.h b/src/lib/downloads/downloadfilehelper.h
index 4985338a1..38e503369 100644
--- a/src/lib/downloads/downloadfilehelper.h
+++ b/src/lib/downloads/downloadfilehelper.h
@@ -19,21 +19,20 @@
 #define DOWNLOADFILEHELPER_H
 
 #include <QObject>
-#include <QTime>
-#include <QNetworkReply>
 #include <QPixmap>
-#include <QListWidget>
-#include <QFileInfo>
-#include <QTemporaryFile>
-#include <QFileIconProvider>
-#include <QFileDialog>
+#include <QUrl>
 
+#include "qz_namespace.h"
 #include "downloadmanager.h"
 
+class QFileIconProvider;
+class QListWidget;
+
 class DownloadItem;
 class DownloadManager;
 class WebPage;
-class DownloadFileHelper : public QObject
+
+class QT_QUPZILLA_EXPORT DownloadFileHelper : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/downloads/downloaditem.cpp b/src/lib/downloads/downloaditem.cpp
index 2fef86cba..aa5edc4fa 100644
--- a/src/lib/downloads/downloaditem.cpp
+++ b/src/lib/downloads/downloaditem.cpp
@@ -25,6 +25,15 @@
 #include "iconprovider.h"
 #include "networkmanager.h"
 
+#include <QMenu>
+#include <QClipboard>
+#include <QListWidgetItem>
+#include <QMouseEvent>
+#include <QTimer>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QDesktopServices>
+
 //#define DOWNMANAGER_DEBUG
 
 DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, const QString &path, const QString &fileName, const QPixmap &fileIcon, QTime* timer, bool openAfterFinishedDownload, const QUrl &downloadPage, DownloadManager* manager)
diff --git a/src/lib/downloads/downloaditem.h b/src/lib/downloads/downloaditem.h
index a38685ba6..e76877356 100644
--- a/src/lib/downloads/downloaditem.h
+++ b/src/lib/downloads/downloaditem.h
@@ -19,28 +19,24 @@
 #define DOWNLOADITEM_H
 
 #include <QWidget>
-#include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QFile>
-#include <QFileInfo>
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QFileIconProvider>
+#include <QBasicTimer>
+#include <QUrl>
+#include <QNetworkReply>
 #include <QTime>
-#include <QTimer>
-#include <QDebug>
-#include <QListWidgetItem>
-#include <QMenu>
-#include <QMessageBox>
-#include <QClipboard>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class DownloadItem;
 }
 
+class QListWidgetItem;
+
 class DownloadManager;
-class DownloadItem : public QWidget
+
+class QT_QUPZILLA_EXPORT DownloadItem : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/downloads/downloadmanager.cpp b/src/lib/downloads/downloadmanager.cpp
index 0cd501806..f99f0d161 100644
--- a/src/lib/downloads/downloadmanager.cpp
+++ b/src/lib/downloads/downloadmanager.cpp
@@ -30,6 +30,11 @@
 #include "downloadfilehelper.h"
 #include "settings.h"
 
+#include <QCloseEvent>
+#include <QDir>
+#include <QProcess>
+#include <QMessageBox>
+
 #ifdef Q_WS_WIN
 #define DEFAULT_USE_NATIVE_DIALOG false
 #else
diff --git a/src/lib/downloads/downloadmanager.h b/src/lib/downloads/downloadmanager.h
index 6146a76ee..d53f8e3d1 100644
--- a/src/lib/downloads/downloadmanager.h
+++ b/src/lib/downloads/downloadmanager.h
@@ -18,21 +18,9 @@
 #ifndef DOWNLOADMANAGER_H
 #define DOWNLOADMANAGER_H
 
-#include <QDialog>
-#include <QLabel>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QDebug>
-#include <QFile>
-#include <QDateTime>
-#include <QDesktopServices>
-#include <QCloseEvent>
-#include <QMessageBox>
-#include <QTimer>
-#include <QNetworkReply>
-#include <QListWidgetItem>
-#include <QProcess>
+#include <QBasicTimer>
 
+#include "qz_namespace.h"
 #include "ecwin7.h"
 
 namespace Ui
@@ -40,11 +28,17 @@ namespace Ui
 class DownloadManager;
 }
 
+class QNetworkReply;
+class QNetworkRequest;
+class QListWidgetItem;
+class QUrl;
+
 class DownloadItem;
 class EcWin7;
 class NetworkManager;
 class WebPage;
-class DownloadManager : public QWidget
+
+class QT_QUPZILLA_EXPORT DownloadManager : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/downloads/downloadoptionsdialog.cpp b/src/lib/downloads/downloadoptionsdialog.cpp
index 7f1f7b4dc..0ea68e7a9 100644
--- a/src/lib/downloads/downloadoptionsdialog.cpp
+++ b/src/lib/downloads/downloadoptionsdialog.cpp
@@ -18,6 +18,8 @@
 #include "downloadoptionsdialog.h"
 #include "ui_downloadoptionsdialog.h"
 
+#include <QUrl>
+
 DownloadOptionsDialog::DownloadOptionsDialog(const QString &fileName, const QPixmap &fileIcon, const QString &mimeType, const QUrl &url, QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::DownloadOptionsDialog)
diff --git a/src/lib/downloads/downloadoptionsdialog.h b/src/lib/downloads/downloadoptionsdialog.h
index db0c769d3..f55ee9164 100644
--- a/src/lib/downloads/downloadoptionsdialog.h
+++ b/src/lib/downloads/downloadoptionsdialog.h
@@ -19,9 +19,8 @@
 #define DOWNLOADOPTIONSDIALOG_H
 
 #include <QDialog>
-#include <QUrl>
-#include <QCloseEvent>
 
+#include "qz_namespace.h"
 #include "downloadmanager.h"
 
 namespace Ui
@@ -29,7 +28,7 @@ namespace Ui
 class DownloadOptionsDialog;
 }
 
-class DownloadOptionsDialog : public QDialog
+class QT_QUPZILLA_EXPORT DownloadOptionsDialog : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/history/historymanager.cpp b/src/lib/history/historymanager.cpp
index b2d5e55b4..3a4faaf71 100644
--- a/src/lib/history/historymanager.cpp
+++ b/src/lib/history/historymanager.cpp
@@ -25,6 +25,12 @@
 #include "globalfunctions.h"
 #include "tabwidget.h"
 
+#include <QMenu>
+#include <QMessageBox>
+#include <QClipboard>
+#include <QTimer>
+#include <QSqlQuery>
+
 HistoryManager::HistoryManager(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::HistoryManager)
diff --git a/src/lib/history/historymanager.h b/src/lib/history/historymanager.h
index cceb074d5..2d47a34f7 100644
--- a/src/lib/history/historymanager.h
+++ b/src/lib/history/historymanager.h
@@ -19,11 +19,9 @@
 #define HISTORYMANAGER_H
 
 #include <QWidget>
-#include <QTreeWidgetItem>
 #include <QWeakPointer>
-#include <QClipboard>
-#include <QHash>
 
+#include "qz_namespace.h"
 #include "historymodel.h"
 
 namespace Ui
@@ -31,8 +29,11 @@ namespace Ui
 class HistoryManager;
 }
 
+class QTreeWidgetItem;
+
 class QupZilla;
-class HistoryManager : public QWidget
+
+class QT_QUPZILLA_EXPORT HistoryManager : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/history/historymodel.cpp b/src/lib/history/historymodel.cpp
index 3f7ff13e4..90b0a5776 100644
--- a/src/lib/history/historymodel.cpp
+++ b/src/lib/history/historymodel.cpp
@@ -22,6 +22,8 @@
 #include "databasewriter.h"
 #include "settings.h"
 
+#include <QThread>
+
 HistoryModel::HistoryModel(QupZilla* mainClass)
     : QObject()
     , m_isSaving(true)
diff --git a/src/lib/history/historymodel.h b/src/lib/history/historymodel.h
index 64c8f6296..46eeaa58e 100644
--- a/src/lib/history/historymodel.h
+++ b/src/lib/history/historymodel.h
@@ -18,18 +18,19 @@
 #ifndef HISTORYMODEL_H
 #define HISTORYMODEL_H
 
-#include <QtSql/QSqlDatabase>
-#include <QSqlQuery>
+#include <QObject>
+#include <QList>
 #include <QDateTime>
-#include <QFile>
-#include <QIcon>
 #include <QUrl>
-#include <QThread>
+
+#include "qz_namespace.h"
+
+class QIcon;
 
 class QupZilla;
 class WebView;
-class QIcon;
-class HistoryModel : public QObject
+
+class QT_QUPZILLA_EXPORT HistoryModel : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/history/webhistoryinterface.h b/src/lib/history/webhistoryinterface.h
index d50f4e002..7610d03db 100644
--- a/src/lib/history/webhistoryinterface.h
+++ b/src/lib/history/webhistoryinterface.h
@@ -21,7 +21,9 @@
 #include <QWebHistoryInterface>
 #include <QStringList>
 
-class WebHistoryInterface : public QWebHistoryInterface
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT WebHistoryInterface : public QWebHistoryInterface
 {
 public:
     explicit WebHistoryInterface(QObject* parent = 0);
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 52eeeca0c..e9233508f 100644
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -3,6 +3,8 @@ unix:QT += dbus
 TARGET = qupzilla
 TEMPLATE = lib
 
+DEFINES += QUPZILLA_SHAREDLIBRARY
+
 include(3rdparty/qtsingleapplication.pri)
 include(../defines.pri)
 include(../../translations/translations.pri)
diff --git a/src/lib/navigation/downicon.cpp b/src/lib/navigation/downicon.cpp
index 22ff5d8cb..0d0ee80ff 100644
--- a/src/lib/navigation/downicon.cpp
+++ b/src/lib/navigation/downicon.cpp
@@ -1,5 +1,24 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "downicon.h"
 
+#include <QMouseEvent>
+
 DownIcon::DownIcon(QWidget* parent)
     : ClickableLabel(parent)
 {
diff --git a/src/lib/navigation/downicon.h b/src/lib/navigation/downicon.h
index 2c7d63f42..4f247f990 100644
--- a/src/lib/navigation/downicon.h
+++ b/src/lib/navigation/downicon.h
@@ -1,9 +1,27 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef DOWNICON_H
 #define DOWNICON_H
 
+#include "qz_namespace.h"
 #include "clickablelabel.h"
 
-class DownIcon : public ClickableLabel
+class QT_QUPZILLA_EXPORT DownIcon : public ClickableLabel
 {
 public:
     explicit DownIcon(QWidget* parent = 0);
diff --git a/src/lib/navigation/goicon.cpp b/src/lib/navigation/goicon.cpp
index 3e5f1aa02..cf62a9d66 100644
--- a/src/lib/navigation/goicon.cpp
+++ b/src/lib/navigation/goicon.cpp
@@ -1,5 +1,24 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "goicon.h"
 
+#include <QMouseEvent>
+
 GoIcon::GoIcon(QWidget* parent)
     : ClickableLabel(parent)
 {
diff --git a/src/lib/navigation/goicon.h b/src/lib/navigation/goicon.h
index 457cda747..bbeb6e6e5 100644
--- a/src/lib/navigation/goicon.h
+++ b/src/lib/navigation/goicon.h
@@ -1,9 +1,27 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef GOICON_H
 #define GOICON_H
 
+#include "qz_namespace.h"
 #include "clickablelabel.h"
 
-class GoIcon : public ClickableLabel
+class QT_QUPZILLA_EXPORT GoIcon : public ClickableLabel
 {
 public:
     explicit GoIcon(QWidget* parent = 0);
diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp
index addbbdb52..674958970 100644
--- a/src/lib/navigation/locationbar.cpp
+++ b/src/lib/navigation/locationbar.cpp
@@ -38,6 +38,8 @@
 #include "downicon.h"
 #include "globalfunctions.h"
 
+#include <QClipboard>
+
 LocationBar::LocationBar(QupZilla* mainClass)
     : LineEdit()
     , p_QupZilla(mainClass)
diff --git a/src/lib/navigation/locationbar.h b/src/lib/navigation/locationbar.h
index 680b94181..29be93be6 100644
--- a/src/lib/navigation/locationbar.h
+++ b/src/lib/navigation/locationbar.h
@@ -18,19 +18,9 @@
 #ifndef LOCATIONBAR_H
 #define LOCATIONBAR_H
 
-#include <QLabel>
-#include <QCompleter>
-#include <QStandardItemModel>
-#include <QTreeView>
-#include <QHeaderView>
-#include <QStandardItem>
 #include <QUrl>
-#include <QAction>
-#include <QToolButton>
-#include <QMenu>
-#include <QTableView>
-#include <QShortcut>
 
+#include "qz_namespace.h"
 #include "lineedit.h"
 
 class QupZilla;
@@ -42,7 +32,8 @@ class TabbedWebView;
 class SiteIcon;
 class GoIcon;
 class RssIcon;
-class LocationBar : public LineEdit
+
+class QT_QUPZILLA_EXPORT LocationBar : public LineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)
diff --git a/src/lib/navigation/locationbarsettings.h b/src/lib/navigation/locationbarsettings.h
index 83be224dc..5bf1bd0ca 100644
--- a/src/lib/navigation/locationbarsettings.h
+++ b/src/lib/navigation/locationbarsettings.h
@@ -18,7 +18,9 @@
 #ifndef LOCATIONBARSETTINGS_H
 #define LOCATIONBARSETTINGS_H
 
-class LocationBarSettings
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT LocationBarSettings
 {
 public:
     LocationBarSettings();
diff --git a/src/lib/navigation/locationcompleter.cpp b/src/lib/navigation/locationcompleter.cpp
index 2a9f2cb09..35c412d9d 100644
--- a/src/lib/navigation/locationcompleter.cpp
+++ b/src/lib/navigation/locationcompleter.cpp
@@ -20,6 +20,11 @@
 #include "iconprovider.h"
 #include "mainapplication.h"
 
+#include <QStandardItemModel>
+#include <QTreeView>
+#include <QHeaderView>
+#include <QSqlQuery>
+
 LocationCompleter::LocationCompleter(QObject* parent)
     : QCompleter(parent)
 {
diff --git a/src/lib/navigation/locationcompleter.h b/src/lib/navigation/locationcompleter.h
index d0973781b..280fe52d9 100644
--- a/src/lib/navigation/locationcompleter.h
+++ b/src/lib/navigation/locationcompleter.h
@@ -19,16 +19,10 @@
 #define LOCATIONCOMPLETER_H
 
 #include <QCompleter>
-#include <QDebug>
-#include <QStringList>
-#include <QSqlQuery>
-#include <QTreeView>
-#include <QStandardItemModel>
-#include <QTimer>
-#include <QHeaderView>
-#include <QUrl>
 
-class LocationCompleter : public QCompleter
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT LocationCompleter : public QCompleter
 {
     Q_OBJECT
 public:
diff --git a/src/lib/navigation/locationpopup.cpp b/src/lib/navigation/locationpopup.cpp
index a662f3bd9..eeb3bb371 100644
--- a/src/lib/navigation/locationpopup.cpp
+++ b/src/lib/navigation/locationpopup.cpp
@@ -16,6 +16,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "locationpopup.h"
+
 LocationPopup::LocationPopup(QWidget* parent)
     : QAbstractItemView()
     , m_parent(parent)
diff --git a/src/lib/navigation/locationpopup.h b/src/lib/navigation/locationpopup.h
index f05439b83..1573dcb8e 100644
--- a/src/lib/navigation/locationpopup.h
+++ b/src/lib/navigation/locationpopup.h
@@ -19,9 +19,10 @@
 #define LOCATIONPOPUP_H
 
 #include <QAbstractItemView>
-#include <QDebug>
 
-class LocationPopup : public QAbstractItemView
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT LocationPopup : public QAbstractItemView
 {
     Q_OBJECT
 public:
diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp
index 80b1015cd..a5149c9a5 100644
--- a/src/lib/navigation/navigationbar.cpp
+++ b/src/lib/navigation/navigationbar.cpp
@@ -27,6 +27,11 @@
 #include "tabwidget.h"
 #include "tabbedwebview.h"
 
+#include <QSplitter>
+#include <QHBoxLayout>
+#include <QStackedWidget>
+#include <QWebHistory>
+
 QString titleForUrl(QString title, const QUrl &url)
 {
     if (title.isEmpty()) {
diff --git a/src/lib/navigation/navigationbar.h b/src/lib/navigation/navigationbar.h
index 26e73c33b..8a1a88b53 100644
--- a/src/lib/navigation/navigationbar.h
+++ b/src/lib/navigation/navigationbar.h
@@ -19,16 +19,18 @@
 #define NAVIGATIONBAR_H
 
 #include <QWidget>
-#include <QHBoxLayout>
-#include <QMenu>
-#include <QSplitter>
+
+#include "qz_namespace.h"
+
+class QHBoxLayout;
+class QSplitter;
 
 class ToolButton;
 class WebSearchBar;
 class QupZilla;
 class ReloadStopButton;
 class Menu;
-class NavigationBar : public QWidget
+class QT_QUPZILLA_EXPORT NavigationBar : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/navigation/reloadstopbutton.cpp b/src/lib/navigation/reloadstopbutton.cpp
index 29a931e7f..5f9cc3d17 100644
--- a/src/lib/navigation/reloadstopbutton.cpp
+++ b/src/lib/navigation/reloadstopbutton.cpp
@@ -17,6 +17,8 @@
 * ============================================================ */
 #include "reloadstopbutton.h"
 
+#include <QHBoxLayout>
+
 ReloadStopButton::ReloadStopButton(QWidget* parent)
     : QWidget(parent)
 {
diff --git a/src/lib/navigation/reloadstopbutton.h b/src/lib/navigation/reloadstopbutton.h
index 7b46d9276..9864b430e 100644
--- a/src/lib/navigation/reloadstopbutton.h
+++ b/src/lib/navigation/reloadstopbutton.h
@@ -18,11 +18,10 @@
 #ifndef RELOADSTOPBUTTON_H
 #define RELOADSTOPBUTTON_H
 
-#include <QHBoxLayout>
-
+#include "qz_namespace.h"
 #include "toolbutton.h"
 
-class ReloadStopButton : public QWidget
+class QT_QUPZILLA_EXPORT ReloadStopButton : public QWidget
 {
 public:
     explicit ReloadStopButton(QWidget* parent = 0);
diff --git a/src/lib/navigation/siteicon.cpp b/src/lib/navigation/siteicon.cpp
index 0c196114d..4bb8dba0e 100644
--- a/src/lib/navigation/siteicon.cpp
+++ b/src/lib/navigation/siteicon.cpp
@@ -19,6 +19,8 @@
 #include "locationbar.h"
 #include "tabbedwebview.h"
 
+#include <QApplication>
+
 SiteIcon::SiteIcon(LocationBar* parent)
     : ToolButton(parent)
     , m_locationBar(parent)
diff --git a/src/lib/navigation/siteicon.h b/src/lib/navigation/siteicon.h
index 214572be9..c846b8db4 100644
--- a/src/lib/navigation/siteicon.h
+++ b/src/lib/navigation/siteicon.h
@@ -18,12 +18,12 @@
 #ifndef SITEICON_H
 #define SITEICON_H
 
-#include <QApplication>
-
+#include "qz_namespace.h"
 #include "toolbutton.h"
 
 class LocationBar;
-class SiteIcon : public ToolButton
+
+class QT_QUPZILLA_EXPORT SiteIcon : public ToolButton
 {
 public:
     explicit SiteIcon(LocationBar* parent);
diff --git a/src/lib/navigation/websearchbar.cpp b/src/lib/navigation/websearchbar.cpp
index 03d8c7e3f..17e805638 100644
--- a/src/lib/navigation/websearchbar.cpp
+++ b/src/lib/navigation/websearchbar.cpp
@@ -27,6 +27,13 @@
 #include "searchenginesdialog.h"
 #include "networkmanager.h"
 
+#include <QCompleter>
+#include <QStringListModel>
+#include <QMenu>
+#include <QTimer>
+#include <QWebFrame>
+#include <QClipboard>
+
 WebSearchBar::WebSearchBar(QupZilla* mainClass, QWidget* parent)
     : LineEdit(parent)
     , p_QupZilla(mainClass)
diff --git a/src/lib/navigation/websearchbar.h b/src/lib/navigation/websearchbar.h
index 6adcaa539..df8daee18 100644
--- a/src/lib/navigation/websearchbar.h
+++ b/src/lib/navigation/websearchbar.h
@@ -18,25 +18,23 @@
 #ifndef WEBSEARCHBAR_H
 #define WEBSEARCHBAR_H
 
-#include <QWidget>
-#include <QPushButton>
-#include <QToolButton>
-#include <QMenu>
 #include <QWeakPointer>
-#include <QCompleter>
-#include <QStringListModel>
 
+#include "qz_namespace.h"
 #include "lineedit.h"
 #include "buttonwithmenu.h"
 #include "searchenginesmanager.h"
 
+class QStringListModel;
+
 class QupZilla;
 class LineEdit;
 class ClickableLabel;
 class SearchEnginesManager;
 class SearchEnginesDialog;
 class OpenSearchEngine;
-class WebSearchBar : public LineEdit
+
+class QT_QUPZILLA_EXPORT WebSearchBar : public LineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)
diff --git a/src/lib/network/cabundleupdater.cpp b/src/lib/network/cabundleupdater.cpp
index 36ae6e919..56c84b81d 100644
--- a/src/lib/network/cabundleupdater.cpp
+++ b/src/lib/network/cabundleupdater.cpp
@@ -1,9 +1,32 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "cabundleupdater.h"
 #include "mainapplication.h"
 #include "networkmanager.h"
 #include "qupzilla.h"
 #include "globalfunctions.h"
 
+#include <QTimer>
+#include <QDateTime>
+#include <QNetworkReply>
+#include <QDebug>
+#include <QFile>
+
 CaBundleUpdater::CaBundleUpdater(NetworkManager* manager, QObject* parent)
     : QObject(parent)
     , m_manager(manager)
diff --git a/src/lib/network/cabundleupdater.h b/src/lib/network/cabundleupdater.h
index 560e3f8ea..6093076ef 100644
--- a/src/lib/network/cabundleupdater.h
+++ b/src/lib/network/cabundleupdater.h
@@ -1,14 +1,32 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef CABUNDLEUPDATER_H
 #define CABUNDLEUPDATER_H
 
 #include <QObject>
-#include <QTimer>
-#include <QFile>
-#include <QDateTime>
-#include <QNetworkReply>
+
+#include "qz_namespace.h"
+
+class QNetworkReply;
 
 class NetworkManager;
-class CaBundleUpdater : public QObject
+
+class QT_QUPZILLA_EXPORT CaBundleUpdater : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp
index 077800bf4..2931371d6 100644
--- a/src/lib/network/networkmanager.cpp
+++ b/src/lib/network/networkmanager.cpp
@@ -32,6 +32,21 @@
 #include "cabundleupdater.h"
 #include "settings.h"
 
+#include <QFormLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QTextDocument>
+#include <QNetworkDiskCache>
+#include <QDir>
+#include <QSslSocket>
+#include <QSslConfiguration>
+#include <QDateTime>
+#include <QMessageBox>
+#include <QAuthenticator>
+#include <QDirIterator>
+
 QString fileNameForCert(const QSslCertificate &cert)
 {
     QString certFileName = CertificateInfoWidget::certificateItemText(cert);
diff --git a/src/lib/network/networkmanager.h b/src/lib/network/networkmanager.h
index 9b292ca50..274c9e83d 100644
--- a/src/lib/network/networkmanager.h
+++ b/src/lib/network/networkmanager.h
@@ -18,27 +18,20 @@
 #ifndef NETWORKMANAGER_H
 #define NETWORKMANAGER_H
 
-#include <QNetworkAccessManager>
-#include <QDialogButtonBox>
-#include <QBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QUrl>
-#include <QFormLayout>
-#include <QCheckBox>
 #include <QSslError>
-#include <QNetworkDiskCache>
-#include <QSslSocket>
-#include <QSslConfiguration>
-#include <QTextDocument>
+#include <QStringList>
 
+#include "qz_namespace.h"
 #include "networkmanagerproxy.h"
 
+class QNetworkDiskCache;
+
 class QupZilla;
 class AdBlockNetwork;
 class NetworkProxyFactory;
 class QupZillaSchemeHandler;
-class NetworkManager : public NetworkManagerProxy
+
+class QT_QUPZILLA_EXPORT NetworkManager : public NetworkManagerProxy
 {
     Q_OBJECT
 public:
diff --git a/src/lib/network/networkmanagerproxy.cpp b/src/lib/network/networkmanagerproxy.cpp
index 5b4942266..da8969ab8 100644
--- a/src/lib/network/networkmanagerproxy.cpp
+++ b/src/lib/network/networkmanagerproxy.cpp
@@ -21,6 +21,8 @@
 #include "cookiejar.h"
 #include "mainapplication.h"
 
+#include <QNetworkRequest>
+
 NetworkManagerProxy::NetworkManagerProxy(QObject* parent)
     : QNetworkAccessManager(parent)
     , m_page(0)
diff --git a/src/lib/network/networkmanagerproxy.h b/src/lib/network/networkmanagerproxy.h
index b1f075bd3..7e8399393 100644
--- a/src/lib/network/networkmanagerproxy.h
+++ b/src/lib/network/networkmanagerproxy.h
@@ -18,14 +18,14 @@
 #ifndef NETWORKMANAGERPROXY_H
 #define NETWORKMANAGERPROXY_H
 
-#include <QObject>
-#include <QNetworkRequest>
 #include <QNetworkAccessManager>
 
+#include "qz_namespace.h"
+
 class WebPage;
 class NetworkManager;
 
-class NetworkManagerProxy : public QNetworkAccessManager
+class QT_QUPZILLA_EXPORT NetworkManagerProxy : public QNetworkAccessManager
 {
 public:
     explicit NetworkManagerProxy(QObject* parent = 0);
diff --git a/src/lib/network/networkproxyfactory.h b/src/lib/network/networkproxyfactory.h
index 3ad568ddb..47efe7839 100644
--- a/src/lib/network/networkproxyfactory.h
+++ b/src/lib/network/networkproxyfactory.h
@@ -19,10 +19,11 @@
 #define NETWORKPROXYFACTORY_H
 
 #include <QNetworkProxyFactory>
-#include <QUrl>
 #include <QStringList>
 
-class NetworkProxyFactory : public QNetworkProxyFactory
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT NetworkProxyFactory : public QNetworkProxyFactory
 {
 public:
     enum ProxyPreference { SystemProxy, NoProxy, DefinedProxy };
diff --git a/src/lib/network/qupzillaschemehandler.cpp b/src/lib/network/qupzillaschemehandler.cpp
index 02aee448f..88a64794f 100644
--- a/src/lib/network/qupzillaschemehandler.cpp
+++ b/src/lib/network/qupzillaschemehandler.cpp
@@ -26,6 +26,11 @@
 #include "plugininterface.h"
 #include "settings.h"
 
+#include <QTextDocument>
+#include <QTextStream>
+#include <QTimer>
+#include <QSettings>
+
 QString authorString(const char* name, const QString &mail)
 {
     return QString("%1 &lt;<a href=\"mailto:%2\">%2</a>&gt;").arg(QString::fromUtf8(name), mail);
diff --git a/src/lib/network/qupzillaschemehandler.h b/src/lib/network/qupzillaschemehandler.h
index a9553fc85..99d94e57d 100644
--- a/src/lib/network/qupzillaschemehandler.h
+++ b/src/lib/network/qupzillaschemehandler.h
@@ -18,13 +18,11 @@
 #ifndef QUPZILLASCHEMEHANDLER_H
 #define QUPZILLASCHEMEHANDLER_H
 
-#include <QObject>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QBuffer>
-#include <QTimer>
-#include <QTextStream>
-#include <QTextDocument>
+
+#include "qz_namespace.h"
 
 class QupZillaSchemeHandler
 {
@@ -34,7 +32,7 @@ public:
     QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice* outgoingData);
 };
 
-class QupZillaSchemeReply : public QNetworkReply
+class QT_QUPZILLA_EXPORT QupZillaSchemeReply : public QNetworkReply
 {
     Q_OBJECT
 public:
diff --git a/src/lib/opensearch/editsearchengine.cpp b/src/lib/opensearch/editsearchengine.cpp
index 298933e47..655188a74 100644
--- a/src/lib/opensearch/editsearchengine.cpp
+++ b/src/lib/opensearch/editsearchengine.cpp
@@ -18,6 +18,8 @@
 #include "editsearchengine.h"
 #include "ui_editsearchengine.h"
 
+#include <QFileDialog>
+
 EditSearchEngine::EditSearchEngine(const QString &title, QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::EditSearchEngine)
diff --git a/src/lib/opensearch/editsearchengine.h b/src/lib/opensearch/editsearchengine.h
index 2601270a0..927f8cd64 100644
--- a/src/lib/opensearch/editsearchengine.h
+++ b/src/lib/opensearch/editsearchengine.h
@@ -18,15 +18,16 @@
 #ifndef EDITSEARCHENGINES_H
 #define EDITSEARCHENGINES_H
 
+#include "qz_namespace.h"
+
 #include <QDialog>
-#include <QFileDialog>
 
 namespace Ui
 {
 class EditSearchEngine;
 }
 
-class EditSearchEngine : public QDialog
+class QT_QUPZILLA_EXPORT EditSearchEngine : public QDialog
 {
     Q_OBJECT
 public:
diff --git a/src/lib/opensearch/opensearchengine.h b/src/lib/opensearch/opensearchengine.h
index fcebfa831..133d533ca 100644
--- a/src/lib/opensearch/opensearchengine.h
+++ b/src/lib/opensearch/opensearchengine.h
@@ -37,6 +37,8 @@
 #ifndef OPENSEARCHENGINE_H
 #define OPENSEARCHENGINE_H
 
+#include "qz_namespace.h"
+
 #include <qpair.h>
 #include <qimage.h>
 #include <qmap.h>
@@ -48,7 +50,7 @@ class QNetworkReply;
 class QScriptEngine;
 
 class OpenSearchEngineDelegate;
-class OpenSearchEngine : public QObject
+class QT_QUPZILLA_EXPORT OpenSearchEngine : public QObject
 {
     Q_OBJECT
 
diff --git a/src/lib/opensearch/opensearchenginedelegate.h b/src/lib/opensearch/opensearchenginedelegate.h
index 5de3c5980..cfd4d633d 100644
--- a/src/lib/opensearch/opensearchenginedelegate.h
+++ b/src/lib/opensearch/opensearchenginedelegate.h
@@ -20,6 +20,8 @@
 #ifndef OPENSEARCHENGINEDELEGATE_H
 #define OPENSEARCHENGINEDELEGATE_H
 
+#include "qz_namespace.h"
+
 #include <qnetworkaccessmanager.h>
 #include <qnetworkrequest.h>
 
diff --git a/src/lib/opensearch/opensearchreader.h b/src/lib/opensearch/opensearchreader.h
index f40b6cc99..a8e58e9b8 100644
--- a/src/lib/opensearch/opensearchreader.h
+++ b/src/lib/opensearch/opensearchreader.h
@@ -36,11 +36,13 @@
 #ifndef OPENSEARCHREADER_H
 #define OPENSEARCHREADER_H
 
+#include "qz_namespace.h"
+
 #include <qxmlstream.h>
 
 class OpenSearchEngine;
 
-class OpenSearchReader : public QXmlStreamReader
+class QT_QUPZILLA_EXPORT OpenSearchReader : public QXmlStreamReader
 {
 public:
     OpenSearchReader();
diff --git a/src/lib/opensearch/searchenginesdialog.h b/src/lib/opensearch/searchenginesdialog.h
index 77885e80b..2c643dd3e 100644
--- a/src/lib/opensearch/searchenginesdialog.h
+++ b/src/lib/opensearch/searchenginesdialog.h
@@ -18,6 +18,8 @@
 #ifndef SEARCHENGINESDIALOG_H
 #define SEARCHENGINESDIALOG_H
 
+#include "qz_namespace.h"
+
 #include <QDialog>
 
 namespace Ui
@@ -26,7 +28,7 @@ class SearchEnginesDialog;
 }
 
 class SearchEnginesManager;
-class SearchEnginesDialog : public QDialog
+class QT_QUPZILLA_EXPORT SearchEnginesDialog : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp
index 2ae7436c9..bb0adccea 100644
--- a/src/lib/opensearch/searchenginesmanager.cpp
+++ b/src/lib/opensearch/searchenginesmanager.cpp
@@ -24,6 +24,9 @@
 #include "databasewriter.h"
 #include "settings.h"
 
+#include <QNetworkReply>
+#include <QMessageBox>
+
 #define ENSURE_LOADED if (!m_settingsLoaded) loadSettings();
 
 QIcon SearchEnginesManager::iconForSearchEngine(const QUrl &url)
diff --git a/src/lib/opensearch/searchenginesmanager.h b/src/lib/opensearch/searchenginesmanager.h
index 7ec4885bf..6e23c5a0f 100644
--- a/src/lib/opensearch/searchenginesmanager.h
+++ b/src/lib/opensearch/searchenginesmanager.h
@@ -20,15 +20,13 @@
 
 #include <QObject>
 #include <QIcon>
-#include <QSqlQuery>
 #include <QList>
 #include <QVariant>
-#include <QNetworkReply>
-#include <QMessageBox>
 
+#include "qz_namespace.h"
 #include "opensearchengine.h"
 
-class SearchEnginesManager : public QObject
+class QT_QUPZILLA_EXPORT SearchEnginesManager : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/other/aboutdialog.h b/src/lib/other/aboutdialog.h
index 0af965d70..5f219d88f 100644
--- a/src/lib/other/aboutdialog.h
+++ b/src/lib/other/aboutdialog.h
@@ -20,12 +20,14 @@
 
 #include <QDialog>
 
+#include "qz_namespace.h"
+
 namespace Ui
 {
 class AboutDialog;
 }
 
-class AboutDialog : public QDialog
+class QT_QUPZILLA_EXPORT AboutDialog : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/other/browsinglibrary.cpp b/src/lib/other/browsinglibrary.cpp
index d786a0482..a90fceef5 100644
--- a/src/lib/other/browsinglibrary.cpp
+++ b/src/lib/other/browsinglibrary.cpp
@@ -25,6 +25,10 @@
 #include "globalfunctions.h"
 #include "settings.h"
 
+#include <QMessageBox>
+#include <QCloseEvent>
+#include <QFileInfo>
+
 BrowsingLibrary::BrowsingLibrary(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::BrowsingLibrary)
diff --git a/src/lib/other/browsinglibrary.h b/src/lib/other/browsinglibrary.h
index 6b869e364..220a8d2ed 100644
--- a/src/lib/other/browsinglibrary.h
+++ b/src/lib/other/browsinglibrary.h
@@ -19,8 +19,8 @@
 #define LIBRARY_H
 
 #include <QWidget>
-#include <QFileInfo>
-#include <QCloseEvent>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
@@ -31,7 +31,7 @@ class HistoryManager;
 class BookmarksManager;
 class RSSManager;
 class QupZilla;
-class BrowsingLibrary : public QWidget
+class QT_QUPZILLA_EXPORT BrowsingLibrary : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/other/clearprivatedata.cpp b/src/lib/other/clearprivatedata.cpp
index 5973cf83b..5c790a978 100644
--- a/src/lib/other/clearprivatedata.cpp
+++ b/src/lib/other/clearprivatedata.cpp
@@ -25,6 +25,11 @@
 #include "ui_clearprivatedata.h"
 #include "iconprovider.h"
 
+#include <QWebSettings>
+#include <QNetworkDiskCache>
+#include <QDateTime>
+#include <QSqlQuery>
+
 ClearPrivateData::ClearPrivateData(QupZilla* mainClass, QWidget* parent)
     : QDialog(parent)
     , p_QupZilla(mainClass)
diff --git a/src/lib/other/clearprivatedata.h b/src/lib/other/clearprivatedata.h
index 67bdfc2b0..7e0e74f93 100644
--- a/src/lib/other/clearprivatedata.h
+++ b/src/lib/other/clearprivatedata.h
@@ -19,10 +19,8 @@
 #define CLEARPRIVATEDATA_H
 
 #include <QDialog>
-#include <QBoxLayout>
-#include <QDialogButtonBox>
-#include <QCheckBox>
-#include <QLabel>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
@@ -30,7 +28,7 @@ class ClearPrivateData;
 }
 
 class QupZilla;
-class ClearPrivateData : public QDialog
+class QT_QUPZILLA_EXPORT ClearPrivateData : public QDialog
 {
     Q_OBJECT
 public:
diff --git a/src/lib/other/databasewriter.cpp b/src/lib/other/databasewriter.cpp
index 44911c2c2..a0c6d269c 100644
--- a/src/lib/other/databasewriter.cpp
+++ b/src/lib/other/databasewriter.cpp
@@ -17,6 +17,9 @@
 * ============================================================ */
 #include "databasewriter.h"
 
+#include <QThread>
+#include <QTimer>
+
 DatabaseWriter::DatabaseWriter()
     : QObject()
 {
diff --git a/src/lib/other/databasewriter.h b/src/lib/other/databasewriter.h
index f7dfbe49e..7280c3e62 100644
--- a/src/lib/other/databasewriter.h
+++ b/src/lib/other/databasewriter.h
@@ -19,12 +19,12 @@
 #define DATABASEWRITER_H
 
 #include <QObject>
-#include <QThread>
 #include <QSqlQuery>
 #include <QList>
-#include <QTimer>
 
-class DatabaseWriter : public QObject
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT DatabaseWriter : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/other/pagescreen.cpp b/src/lib/other/pagescreen.cpp
index 6b8616ea8..90a74b463 100644
--- a/src/lib/other/pagescreen.cpp
+++ b/src/lib/other/pagescreen.cpp
@@ -20,6 +20,9 @@
 #include "tabbedwebview.h"
 #include "globalfunctions.h"
 
+#include <QFileDialog>
+#include <QWebFrame>
+
 PageScreen::PageScreen(WebView* view, QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::PageScreen)
diff --git a/src/lib/other/pagescreen.h b/src/lib/other/pagescreen.h
index 37d6f016e..66689b4de 100644
--- a/src/lib/other/pagescreen.h
+++ b/src/lib/other/pagescreen.h
@@ -19,18 +19,19 @@
 #define PAGESCREEN_H
 
 #include <QDialog>
-#include <QWebFrame>
-#include <QDialogButtonBox>
-#include <QAbstractButton>
-#include <QFileDialog>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class PageScreen;
 }
 
+class QAbstractButton;
+
 class WebView;
-class PageScreen : public QDialog
+
+class QT_QUPZILLA_EXPORT PageScreen : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/other/sourceviewer.cpp b/src/lib/other/sourceviewer.cpp
index a0c02f606..8eea13b9f 100644
--- a/src/lib/other/sourceviewer.cpp
+++ b/src/lib/other/sourceviewer.cpp
@@ -23,6 +23,15 @@
 #include "iconprovider.h"
 #include "enhancedmenu.h"
 
+#include <QBoxLayout>
+#include <QMenuBar>
+#include <QTextEdit>
+#include <QStatusBar>
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QInputDialog>
+#include <QWebFrame>
+
 SourceViewer::SourceViewer(QWebFrame* frame, const QString &selectedHtml)
     : QWidget(0)
     , m_frame(frame)
diff --git a/src/lib/other/sourceviewer.h b/src/lib/other/sourceviewer.h
index 8cbbd074a..e6136421b 100644
--- a/src/lib/other/sourceviewer.h
+++ b/src/lib/other/sourceviewer.h
@@ -19,26 +19,22 @@
 #define SOURCEVIEWER_H
 
 #include <QWidget>
-#include <QBoxLayout>
-#include <QTextEdit>
-#include <QApplication>
-#include <QMenu>
-#include <QMenuBar>
-#include <QWebPage>
-#include <QWebFrame>
-#include <QStyle>
-#include <QInputDialog>
-#include <QFileDialog>
-#include <QFile>
-#include <QMessageBox>
-#include <QStatusBar>
+#include <QWeakPointer>
 
-class SourceViewer : public QWidget
+#include "qz_namespace.h"
+
+class QTextEdit;
+class QBoxLayout;
+class QStatusBar;
+class QWebFrame;
+
+class QT_QUPZILLA_EXPORT SourceViewer : public QWidget
 {
     Q_OBJECT
 public:
     explicit SourceViewer(QWebFrame* frame, const QString &selectedHtml);
     QTextEdit* sourceEdit() { return m_sourceEdit; }
+
 signals:
 
 public slots:
diff --git a/src/lib/other/sourceviewersearch.cpp b/src/lib/other/sourceviewersearch.cpp
index e74939b26..badea08c4 100644
--- a/src/lib/other/sourceviewersearch.cpp
+++ b/src/lib/other/sourceviewersearch.cpp
@@ -20,6 +20,10 @@
 #include "sourceviewer.h"
 #include "iconprovider.h"
 
+#include <QTextEdit>
+#include <QShortcut>
+#include <QKeyEvent>
+
 SourceViewerSearch::SourceViewerSearch(SourceViewer* parent)
     : AnimatedWidget(AnimatedWidget::Up)
     , m_sourceViewer(parent)
diff --git a/src/lib/other/sourceviewersearch.h b/src/lib/other/sourceviewersearch.h
index 9b993965a..1a86ecc1f 100644
--- a/src/lib/other/sourceviewersearch.h
+++ b/src/lib/other/sourceviewersearch.h
@@ -17,11 +17,10 @@
 * ============================================================ */
 #ifndef SOURCEVIEWERSEARCH_H
 #define SOURCEVIEWERSEARCH_H
-#include <QDebug>
-#include <QTextDocument>
-#include <QTextCursor>
-#include <QShortcut>
 
+#include <QTextDocument>
+
+#include "qz_namespace.h"
 #include "animatedwidget.h"
 
 namespace Ui
@@ -30,7 +29,8 @@ class SourceViewerSearch;
 }
 
 class SourceViewer;
-class SourceViewerSearch : public AnimatedWidget
+
+class QT_QUPZILLA_EXPORT SourceViewerSearch : public AnimatedWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/other/statusbarmessage.cpp b/src/lib/other/statusbarmessage.cpp
index 42a20d2ce..20919bfa4 100644
--- a/src/lib/other/statusbarmessage.cpp
+++ b/src/lib/other/statusbarmessage.cpp
@@ -22,6 +22,12 @@
 #include "squeezelabelv1.h"
 #include "mainapplication.h"
 
+#include <QStyleOptionFrame>
+#include <QStatusBar>
+#include <QToolTip>
+#include <QStylePainter>
+#include <QWebFrame>
+
 TipLabel::TipLabel(QupZilla* parent)
     : SqueezeLabelV1(parent)
     , p_QupZilla(parent)
diff --git a/src/lib/other/statusbarmessage.h b/src/lib/other/statusbarmessage.h
index 32884d2b4..a7f2fa1a7 100644
--- a/src/lib/other/statusbarmessage.h
+++ b/src/lib/other/statusbarmessage.h
@@ -19,14 +19,15 @@
 #define STATUSBARMESSAGE_H
 
 #include <QObject>
-#include <QToolTip>
+
+#include "qz_namespace.h"
 #include "squeezelabelv1.h"
 #include "animatedwidget.h"
 
 class QupZilla;
 class TipLabel;
 
-class TipLabel : public SqueezeLabelV1
+class QT_QUPZILLA_EXPORT TipLabel : public SqueezeLabelV1
 {
 public:
     TipLabel(QupZilla* parent);
@@ -41,7 +42,7 @@ private:
     bool m_connected;
 };
 
-class StatusBarMessage : public QObject
+class QT_QUPZILLA_EXPORT StatusBarMessage : public QObject
 {
 public:
     explicit StatusBarMessage(QupZilla* mainClass);
diff --git a/src/lib/other/updater.cpp b/src/lib/other/updater.cpp
index c1e42c8b3..b582b5bf0 100644
--- a/src/lib/other/updater.cpp
+++ b/src/lib/other/updater.cpp
@@ -21,6 +21,11 @@
 #include "tabwidget.h"
 #include "desktopnotificationsfactory.h"
 
+#include <QTimer>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+
 Updater::Updater(QupZilla* mainClass, QObject* parent)
     : QObject(parent)
     , p_QupZilla(mainClass)
diff --git a/src/lib/other/updater.h b/src/lib/other/updater.h
index 88e000be3..3170846f5 100644
--- a/src/lib/other/updater.h
+++ b/src/lib/other/updater.h
@@ -19,12 +19,15 @@
 #define UPDATER_H
 
 #include <QObject>
-#include <QSystemTrayIcon>
-#include <QMenu>
-#include <QNetworkReply>
+
+#include "qz_namespace.h"
+
+class QNetworkReply;
+class QUrl;
 
 class QupZilla;
-class Updater : public QObject
+
+class QT_QUPZILLA_EXPORT Updater : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/plugins/clicktoflash.cpp b/src/lib/plugins/clicktoflash.cpp
index 40cbbbc04..d134d3718 100644
--- a/src/lib/plugins/clicktoflash.cpp
+++ b/src/lib/plugins/clicktoflash.cpp
@@ -37,7 +37,6 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * ============================================================ */
-
 #include "clicktoflash.h"
 #include "clickablelabel.h"
 #include "mainapplication.h"
@@ -50,6 +49,13 @@
 #include "qupzilla.h"
 #include "tabbedwebview.h"
 
+#include <QHBoxLayout>
+#include <QToolButton>
+#include <QFormLayout>
+#include <QMenu>
+#include <QTimer>
+#include <QWebHitTestResult>
+
 QUrl ClickToFlash::acceptedUrl;
 QStringList ClickToFlash::acceptedArgNames;
 QStringList ClickToFlash::acceptedArgValues;
diff --git a/src/lib/plugins/clicktoflash.h b/src/lib/plugins/clicktoflash.h
index 9fd248cab..3a350df3b 100644
--- a/src/lib/plugins/clicktoflash.h
+++ b/src/lib/plugins/clicktoflash.h
@@ -42,23 +42,20 @@
 #ifndef CLICKTOFLASH_H
 #define CLICKTOFLASH_H
 
+#include "qz_namespace.h"
+
 // Qt Includes
 #include <QUrl>
 #include <QWidget>
-#include <QHBoxLayout>
-#include <QToolButton>
 #include <QWebElement>
-#include <QWebFrame>
-#include <QWebView>
-#include <QDebug>
-#include <QFrame>
-#include <QAction>
-#include <QMenu>
-#include <QFormLayout>
 
-class QWebElement;
+class QToolButton;
+class QHBoxLayout;
+class QFrame;
+
 class WebPage;
-class ClickToFlash : public QWidget
+
+class QT_QUPZILLA_EXPORT ClickToFlash : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/plugins/plugininterface.h b/src/lib/plugins/plugininterface.h
index 1774232f1..60036975b 100644
--- a/src/lib/plugins/plugininterface.h
+++ b/src/lib/plugins/plugininterface.h
@@ -18,12 +18,8 @@
 #ifndef PLUGININTERFACE_H
 #define PLUGININTERFACE_H
 
+#include <QPixmap>
 #include <QtPlugin>
-#include <QIcon>
-#include <QTranslator>
-#include <QMenu>
-#include <QNetworkRequest>
-#include <QWebView>
 #include <QWebHitTestResult>
 
 #include "qz_namespace.h"
@@ -46,7 +42,14 @@ struct PluginSpec {
     }
 };
 
+class QTranslator;
+class QMenu;
+class QWebHitTestResult;
+class QMouseEvent;
+class QKeyEvent;
+
 class WebView;
+
 class PluginInterface
 {
 public:
diff --git a/src/lib/plugins/pluginproxy.cpp b/src/lib/plugins/pluginproxy.cpp
index 07a95919f..1651bb356 100644
--- a/src/lib/plugins/pluginproxy.cpp
+++ b/src/lib/plugins/pluginproxy.cpp
@@ -20,6 +20,8 @@
 #include "mainapplication.h"
 #include "settings.h"
 
+#include <QMenu>
+
 PluginProxy::PluginProxy()
     : Plugins()
 {
diff --git a/src/lib/plugins/pluginproxy.h b/src/lib/plugins/pluginproxy.h
index 7acec433f..438850081 100644
--- a/src/lib/plugins/pluginproxy.h
+++ b/src/lib/plugins/pluginproxy.h
@@ -18,16 +18,11 @@
 #ifndef PLUGINPROXY_H
 #define PLUGINPROXY_H
 
-#include <QDebug>
-#include <QMenu>
-#include <QWebView>
-#include <QWebHitTestResult>
-
 #include "mainapplication.h"
 #include "plugins.h"
 #include "qz_namespace.h"
 
-class PluginProxy : public Plugins
+class QT_QUPZILLA_EXPORT PluginProxy : public Plugins
 {
 public:
     enum EventHandlerType { MousePressHandler, MouseReleaseHandler, MouseMoveHandler, KeyPressHandler, KeyReleaseHandler };
diff --git a/src/lib/plugins/plugins.cpp b/src/lib/plugins/plugins.cpp
index 16c3a4c66..a7fbdf508 100644
--- a/src/lib/plugins/plugins.cpp
+++ b/src/lib/plugins/plugins.cpp
@@ -21,6 +21,9 @@
 #include "speeddial.h"
 #include "settings.h"
 
+#include <QPluginLoader>
+#include <QDir>
+
 #ifdef PORTABLE_BUILD
 #define DEFAULT_ENABLE_PLUGINS false
 #else
diff --git a/src/lib/plugins/plugins.h b/src/lib/plugins/plugins.h
index 78cc25d21..c19c4d9a4 100644
--- a/src/lib/plugins/plugins.h
+++ b/src/lib/plugins/plugins.h
@@ -19,16 +19,17 @@
 #define PLUGINLOADER_H
 
 #include <QObject>
-#include <QtPlugin>
-#include <QPluginLoader>
-#include <QDir>
+#include <QVariant>
 #include <QWeakPointer>
 
-#include <iostream>
+#include "qz_namespace.h"
 #include "plugininterface.h"
 
+class QPluginLoader;
+
 class SpeedDial;
-class Plugins : public QObject
+
+class QT_QUPZILLA_EXPORT Plugins : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp
index 7d6f60819..8bd8479b8 100644
--- a/src/lib/plugins/speeddial.cpp
+++ b/src/lib/plugins/speeddial.cpp
@@ -20,6 +20,13 @@
 #include "pagethumbnailer.h"
 #include "settings.h"
 
+#include <QDir>
+#include <QCryptographicHash>
+#include <QFileDialog>
+#include <QDebug>
+#include <QWebFrame>
+#include <QWebPage>
+
 #define ENSURE_LOADED if (!m_loaded) loadSettings();
 
 SpeedDial::SpeedDial(QObject* parent)
diff --git a/src/lib/plugins/speeddial.h b/src/lib/plugins/speeddial.h
index 7cc04b72c..df51f441d 100644
--- a/src/lib/plugins/speeddial.h
+++ b/src/lib/plugins/speeddial.h
@@ -19,15 +19,17 @@
 #define SPEEDDIAL_H
 
 #include <QObject>
-#include <QCryptographicHash>
-#include <QDir>
-#include <QDebug>
-#include <QWebFrame>
 #include <QWeakPointer>
-#include <QFileDialog>
+
+#include "qz_namespace.h"
+
+class QUrl;
+class QWebFrame;
+class QPixmap;
 
 class PageThumbnailer;
-class SpeedDial : public QObject
+
+class QT_QUPZILLA_EXPORT SpeedDial : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/plugins/webpluginfactory.cpp b/src/lib/plugins/webpluginfactory.cpp
index 5af798811..4c426613b 100644
--- a/src/lib/plugins/webpluginfactory.cpp
+++ b/src/lib/plugins/webpluginfactory.cpp
@@ -21,6 +21,8 @@
 #include "pluginproxy.h"
 #include "webpage.h"
 
+#include <QDebug>
+
 WebPluginFactory::WebPluginFactory(WebPage* page)
     : QWebPluginFactory(page)
     , m_page(page)
diff --git a/src/lib/plugins/webpluginfactory.h b/src/lib/plugins/webpluginfactory.h
index 0c0a51cc0..00446ba8f 100644
--- a/src/lib/plugins/webpluginfactory.h
+++ b/src/lib/plugins/webpluginfactory.h
@@ -19,10 +19,12 @@
 #define WEB_PLUGIN_FACTORY_H
 
 #include <QWebPluginFactory>
-#include <QDebug>
+
+#include "qz_namespace.h"
 
 class WebPage;
-class WebPluginFactory : public QWebPluginFactory
+
+class QT_QUPZILLA_EXPORT WebPluginFactory : public QWebPluginFactory
 {
 public:
     WebPluginFactory(WebPage* page);
diff --git a/src/lib/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp
index 89819eeee..33597adf2 100644
--- a/src/lib/popupwindow/popuplocationbar.cpp
+++ b/src/lib/popupwindow/popuplocationbar.cpp
@@ -20,7 +20,7 @@
 #include "toolbutton.h"
 #include "globalfunctions.h"
 
-class PopupSiteIcon : public QWidget
+class QT_QUPZILLA_EXPORT PopupSiteIcon : public QWidget
 {
 public:
     explicit PopupSiteIcon(QWidget* parent = 0) : QWidget(parent) { }
diff --git a/src/lib/popupwindow/popuplocationbar.h b/src/lib/popupwindow/popuplocationbar.h
index 180a316f7..9c4a59aad 100644
--- a/src/lib/popupwindow/popuplocationbar.h
+++ b/src/lib/popupwindow/popuplocationbar.h
@@ -18,13 +18,15 @@
 #ifndef POPUPLOCATIONBAR_H
 #define POPUPLOCATIONBAR_H
 
-#include <QUrl>
-
+#include "qz_namespace.h"
 #include "lineedit.h"
 
+class QUrl;
+
 class PopupSiteIcon;
 class PopupWebView;
-class PopupLocationBar : public LineEdit
+
+class QT_QUPZILLA_EXPORT PopupLocationBar : public LineEdit
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)
diff --git a/src/lib/popupwindow/popupwebpage.cpp b/src/lib/popupwindow/popupwebpage.cpp
index 2dec8998b..4c8add33e 100644
--- a/src/lib/popupwindow/popupwebpage.cpp
+++ b/src/lib/popupwindow/popupwebpage.cpp
@@ -21,6 +21,7 @@
 #include "qupzilla.h"
 #include "tabwidget.h"
 #include "tabbedwebview.h"
+#include <QTimer>
 
 // Wrapper class to detect whether window is opened from JavaScript window.open method
 // It has to be done this way, because QtWebKit has really bad API when it comes to opening
diff --git a/src/lib/popupwindow/popupwebpage.h b/src/lib/popupwindow/popupwebpage.h
index 36b6a84b4..8b8c6cbd3 100644
--- a/src/lib/popupwindow/popupwebpage.h
+++ b/src/lib/popupwindow/popupwebpage.h
@@ -18,10 +18,12 @@
 #ifndef POPUPWEBPAGE_H
 #define POPUPWEBPAGE_H
 
+#include "qz_namespace.h"
 #include "webpage.h"
 
 class QupZilla;
-class PopupWebPage : public WebPage
+
+class QT_QUPZILLA_EXPORT PopupWebPage : public WebPage
 {
     Q_OBJECT
 public:
diff --git a/src/lib/popupwindow/popupwindow.cpp b/src/lib/popupwindow/popupwindow.cpp
index a6a9f788e..6ab60a64e 100644
--- a/src/lib/popupwindow/popupwindow.cpp
+++ b/src/lib/popupwindow/popupwindow.cpp
@@ -21,7 +21,9 @@
 #include "popuplocationbar.h"
 #include "globalfunctions.h"
 
-#include <QDebug>
+#include <QVBoxLayout>
+#include <QStatusBar>
+#include <QWebFrame>
 
 PopupWindow::PopupWindow(PopupWebView* view)
     : QWidget()
diff --git a/src/lib/popupwindow/popupwindow.h b/src/lib/popupwindow/popupwindow.h
index bab63ea20..429e35198 100644
--- a/src/lib/popupwindow/popupwindow.h
+++ b/src/lib/popupwindow/popupwindow.h
@@ -19,13 +19,17 @@
 #define POPUPWINDOW_H
 
 #include <QWidget>
-#include <QVBoxLayout>
-#include <QStatusBar>
+
+#include "qz_namespace.h"
+
+class QVBoxLayout;
+class QStatusBar;
 
 class PopupWebView;
 class PopupWebPage;
 class PopupLocationBar;
-class PopupWindow : public QWidget
+
+class QT_QUPZILLA_EXPORT PopupWindow : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/preferences/acceptlanguage.h b/src/lib/preferences/acceptlanguage.h
index a018c7f22..b206923d3 100644
--- a/src/lib/preferences/acceptlanguage.h
+++ b/src/lib/preferences/acceptlanguage.h
@@ -21,12 +21,14 @@
 #include <QDialog>
 #include <QLocale>
 
+#include "qz_namespace.h"
+
 namespace Ui
 {
 class AcceptLanguage;
 }
 
-class AcceptLanguage : public QDialog
+class QT_QUPZILLA_EXPORT AcceptLanguage : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp
index 22ca59119..6618307a9 100644
--- a/src/lib/preferences/autofillmanager.cpp
+++ b/src/lib/preferences/autofillmanager.cpp
@@ -19,6 +19,14 @@
 #include "autofillmodel.h"
 #include "ui_autofillmanager.h"
 
+#include <QMenu>
+#include <QTimer>
+#include <QSqlQuery>
+#include <QMessageBox>
+#include <QInputDialog>
+#include <QUrl>
+#include <QFileDialog>
+
 AutoFillManager::AutoFillManager(QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::AutoFillManager)
diff --git a/src/lib/preferences/autofillmanager.h b/src/lib/preferences/autofillmanager.h
index be08278a1..ee2842af9 100644
--- a/src/lib/preferences/autofillmanager.h
+++ b/src/lib/preferences/autofillmanager.h
@@ -19,24 +19,15 @@
 #define AUTOFILLMANAGER_H
 
 #include <QWidget>
-#include <QTimer>
-#include <QtSql/QSqlDatabase>
-#include <QSqlQuery>
-#include <QTreeWidgetItem>
-#include <QDebug>
-#include <QMessageBox>
-#include <QInputDialog>
-#include <QUrl>
-#include <QMenu>
-#include <QFileDialog>
-#include <QFile>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class AutoFillManager;
 }
 
-class AutoFillManager : public QWidget
+class QT_QUPZILLA_EXPORT AutoFillManager : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/preferences/pluginlistdelegate.cpp b/src/lib/preferences/pluginlistdelegate.cpp
index ca22134b0..529035184 100644
--- a/src/lib/preferences/pluginlistdelegate.cpp
+++ b/src/lib/preferences/pluginlistdelegate.cpp
@@ -1,5 +1,28 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "pluginlistdelegate.h"
 
+#include <QListWidget>
+#include <QTextLayout>
+#include <QTextDocument>
+#include <QTextBlock>
+#include <QApplication>
+
 PluginListDelegate::PluginListDelegate(QListWidget* parent)
     : QItemDelegate(parent)
     , m_listWidget(parent)
diff --git a/src/lib/preferences/pluginlistdelegate.h b/src/lib/preferences/pluginlistdelegate.h
index d3a3b6d66..4eaa70357 100644
--- a/src/lib/preferences/pluginlistdelegate.h
+++ b/src/lib/preferences/pluginlistdelegate.h
@@ -1,15 +1,30 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef PLUGINLISTDELEGATE_H
 #define PLUGINLISTDELEGATE_H
 
 #include <QItemDelegate>
-#include <QPainter>
-#include <QTextDocument>
-#include <QTextLayout>
-#include <QTextBlock>
-#include <QListWidget>
-#include <QApplication>
 
-class PluginListDelegate : public QItemDelegate
+#include "qz_namespace.h"
+
+class QListWidget;
+
+class QT_QUPZILLA_EXPORT PluginListDelegate : public QItemDelegate
 {
 public:
     PluginListDelegate(QListWidget* parent);
diff --git a/src/lib/preferences/pluginslist.cpp b/src/lib/preferences/pluginslist.cpp
index 99ed8d447..d5c249bed 100644
--- a/src/lib/preferences/pluginslist.cpp
+++ b/src/lib/preferences/pluginslist.cpp
@@ -23,6 +23,9 @@
 #include "pluginlistdelegate.h"
 #include "settings.h"
 
+#include <QInputDialog>
+#include <QMessageBox>
+
 #ifdef PORTABLE_BUILD
 #define DEFAULT_ENABLE_PLUGINS false
 #else
diff --git a/src/lib/preferences/pluginslist.h b/src/lib/preferences/pluginslist.h
index 9e7ae021d..ea88a9351 100644
--- a/src/lib/preferences/pluginslist.h
+++ b/src/lib/preferences/pluginslist.h
@@ -19,16 +19,17 @@
 #define PLUGINSLIST_H
 
 #include <QWidget>
-#include <QListWidgetItem>
-#include <QInputDialog>
-#include <QMessageBox>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class PluginsList;
 }
 
-class PluginsList : public QWidget
+class QListWidgetItem;
+
+class QT_QUPZILLA_EXPORT PluginsList : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp
index 1aa3e8fd3..edb01bef1 100644
--- a/src/lib/preferences/preferences.cpp
+++ b/src/lib/preferences/preferences.cpp
@@ -26,9 +26,9 @@
 #include "autofillmanager.h"
 #include "mainapplication.h"
 #include "cookiemanager.h"
+#include "pluginproxy.h"
 #include "pluginslist.h"
 #include "qtwin.h"
-#include "pluginproxy.h"
 #include "sslmanager.h"
 #include "networkproxyfactory.h"
 #include "networkmanager.h"
@@ -42,6 +42,11 @@
 #include "settings.h"
 #include "tabbedwebview.h"
 
+#include <QSettings>
+#include <QInputDialog>
+#include <QFileDialog>
+#include <QMessageBox>
+
 #ifdef Q_WS_WIN
 #define DEFAULT_CHECK_UPDATES true
 #define DEFAULT_USE_NATIVE_DIALOG false
diff --git a/src/lib/preferences/preferences.h b/src/lib/preferences/preferences.h
index e3b0b3105..546f56b44 100644
--- a/src/lib/preferences/preferences.h
+++ b/src/lib/preferences/preferences.h
@@ -19,23 +19,25 @@
 #define PREFERENCES_H
 
 #include <QDialog>
-#include <QFileDialog>
-#include <QListWidgetItem>
-#include <QColorDialog>
-#include <QAbstractButton>
 #include <QWeakPointer>
 
+#include "qz_namespace.h"
+
 namespace Ui
 {
 class Preferences;
 }
 
+class QAbstractButton;
+class QListWidgetItem;
+
 class AutoFillManager;
 class QupZilla;
 class PluginsList;
 class DesktopNotification;
 class ThemeManager;
-class Preferences : public QDialog
+
+class QT_QUPZILLA_EXPORT Preferences : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/preferences/sslmanager.cpp b/src/lib/preferences/sslmanager.cpp
index c78fb349b..f33ee597b 100644
--- a/src/lib/preferences/sslmanager.cpp
+++ b/src/lib/preferences/sslmanager.cpp
@@ -22,6 +22,9 @@
 #include "globalfunctions.h"
 #include "certificateinfowidget.h"
 
+#include <QFileDialog>
+#include <QSslSocket>
+
 SSLManager::SSLManager(QWidget* parent)
     : QDialog(parent)
     , ui(new Ui::SSLManager)
diff --git a/src/lib/preferences/sslmanager.h b/src/lib/preferences/sslmanager.h
index c62ed25c1..6e92cb943 100644
--- a/src/lib/preferences/sslmanager.h
+++ b/src/lib/preferences/sslmanager.h
@@ -19,19 +19,16 @@
 #define SSLMANAGER_H
 
 #include <QDialog>
-#include <QDebug>
-#include <QMessageBox>
 #include <QSslCertificate>
-#include <QDateTime>
-#include <QFileDialog>
-#include <QCloseEvent>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class SSLManager;
 }
 
-class SSLManager : public QDialog
+class QT_QUPZILLA_EXPORT SSLManager : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/preferences/thememanager.cpp b/src/lib/preferences/thememanager.cpp
index d552eb372..4509aa3b3 100644
--- a/src/lib/preferences/thememanager.cpp
+++ b/src/lib/preferences/thememanager.cpp
@@ -21,6 +21,9 @@
 #include "globalfunctions.h"
 #include "settings.h"
 
+#include <QTextBrowser>
+#include <QDir>
+
 #ifdef Q_WS_WIN
 #define DEFAULT_THEME_NAME "windows"
 #else
diff --git a/src/lib/preferences/thememanager.h b/src/lib/preferences/thememanager.h
index efbf7d67d..30239443b 100644
--- a/src/lib/preferences/thememanager.h
+++ b/src/lib/preferences/thememanager.h
@@ -19,17 +19,18 @@
 #define THEMEMANAGER_H
 
 #include <QWidget>
-#include <QDir>
-#include <QListWidgetItem>
+#include <QIcon>
 #include <QHash>
-#include <QTextBrowser>
+
+#include "qz_namespace.h"
+
 
 namespace Ui
 {
 class ThemeManager;
 }
 
-class ThemeManager : public QWidget
+class QT_QUPZILLA_EXPORT ThemeManager : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/rss/rssicon.cpp b/src/lib/rss/rssicon.cpp
index f1e6045cf..334880c60 100644
--- a/src/lib/rss/rssicon.cpp
+++ b/src/lib/rss/rssicon.cpp
@@ -17,6 +17,8 @@
 * ============================================================ */
 #include "rssicon.h"
 
+#include <QMouseEvent>
+
 RssIcon::RssIcon(QWidget* parent)
     : ClickableLabel(parent)
 {
diff --git a/src/lib/rss/rssicon.h b/src/lib/rss/rssicon.h
index e2cc793f2..9cdc0e497 100644
--- a/src/lib/rss/rssicon.h
+++ b/src/lib/rss/rssicon.h
@@ -18,9 +18,10 @@
 #ifndef RSSICON_H
 #define RSSICON_H
 
+#include "qz_namespace.h"
 #include "clickablelabel.h"
 
-class RssIcon : public ClickableLabel
+class QT_QUPZILLA_EXPORT RssIcon : public ClickableLabel
 {
     Q_OBJECT
 public:
diff --git a/src/lib/rss/rssmanager.cpp b/src/lib/rss/rssmanager.cpp
index 43f867d3f..eb1e8d575 100644
--- a/src/lib/rss/rssmanager.cpp
+++ b/src/lib/rss/rssmanager.cpp
@@ -28,6 +28,14 @@
 #include "databasewriter.h"
 #include "networkmanager.h"
 
+#include <QMenu>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QWebSettings>
+#include <QMessageBox>
+#include <QNetworkReply>
+#include <QBuffer>
+
 RSSManager::RSSManager(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::RSSManager)
diff --git a/src/lib/rss/rssmanager.h b/src/lib/rss/rssmanager.h
index 8ed80da8b..08c49b02f 100644
--- a/src/lib/rss/rssmanager.h
+++ b/src/lib/rss/rssmanager.h
@@ -18,6 +18,8 @@
 #ifndef RSSMANAGER_H
 #define RSSMANAGER_H
 
+#include "qz_namespace.h"
+
 #include <QWidget>
 #include <QTreeWidget>
 #include <QUrl>
@@ -36,7 +38,7 @@ class RSSManager;
 class QupZilla;
 class FollowRedirectReply;
 class NetworkManager;
-class RSSManager : public QWidget
+class QT_QUPZILLA_EXPORT RSSManager : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/rss/rssnotification.h b/src/lib/rss/rssnotification.h
index 83ca81ce4..e3531c2ed 100644
--- a/src/lib/rss/rssnotification.h
+++ b/src/lib/rss/rssnotification.h
@@ -18,8 +18,7 @@
 #ifndef RSSNOTIFICATION_H
 #define RSSNOTIFICATION_H
 
-#include <QWidget>
-
+#include "qz_namespace.h"
 #include "animatedwidget.h"
 
 namespace Ui
@@ -28,7 +27,7 @@ class RSSNotification;
 }
 
 class AnimatedWidget;
-class RSSNotification : public AnimatedWidget
+class QT_QUPZILLA_EXPORT RSSNotification : public AnimatedWidget
 {
 public:
     explicit RSSNotification(QString host, QWidget* parent = 0);
diff --git a/src/lib/rss/rsswidget.cpp b/src/lib/rss/rsswidget.cpp
index e9b591f2e..b71e39191 100644
--- a/src/lib/rss/rsswidget.cpp
+++ b/src/lib/rss/rsswidget.cpp
@@ -22,6 +22,10 @@
 #include "rssmanager.h"
 #include "rssnotification.h"
 
+#include <QToolTip>
+#include <QPushButton>
+#include <QWebFrame>
+
 RSSWidget::RSSWidget(WebView* view, QWidget* parent)
     : QMenu(parent)
     , ui(new Ui::RSSWidget)
diff --git a/src/lib/rss/rsswidget.h b/src/lib/rss/rsswidget.h
index 2da8f52f2..b6975aa09 100644
--- a/src/lib/rss/rsswidget.h
+++ b/src/lib/rss/rsswidget.h
@@ -18,12 +18,9 @@
 #ifndef RSSWIDGET_H
 #define RSSWIDGET_H
 
-#include <QWidget>
 #include <QMenu>
-#include <QPushButton>
-#include <QDebug>
-#include <QWebFrame>
-#include <QToolTip>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
@@ -31,7 +28,8 @@ class RSSWidget;
 }
 
 class WebView;
-class RSSWidget : public QMenu
+
+class QT_QUPZILLA_EXPORT RSSWidget : public QMenu
 {
     Q_OBJECT
 
diff --git a/src/lib/sidebar/bookmarkssidebar.cpp b/src/lib/sidebar/bookmarkssidebar.cpp
index 567370674..3f147d1cc 100644
--- a/src/lib/sidebar/bookmarkssidebar.cpp
+++ b/src/lib/sidebar/bookmarkssidebar.cpp
@@ -25,6 +25,11 @@
 #include "tabwidget.h"
 #include "bookmarksmodel.h"
 
+#include <QMenu>
+#include <QTimer>
+#include <QClipboard>
+#include <QSqlQuery>
+
 BookmarksSideBar::BookmarksSideBar(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , m_isRefreshing(false)
diff --git a/src/lib/sidebar/bookmarkssidebar.h b/src/lib/sidebar/bookmarkssidebar.h
index 5c450d50b..0140ab167 100644
--- a/src/lib/sidebar/bookmarkssidebar.h
+++ b/src/lib/sidebar/bookmarkssidebar.h
@@ -19,9 +19,8 @@
 #define BOOKMARKSSIDEBAR_H
 
 #include <QWidget>
-#include <QTreeWidgetItem>
-#include <QInputDialog>
 
+#include "qz_namespace.h"
 #include "bookmarksmodel.h"
 
 namespace Ui
@@ -29,9 +28,12 @@ namespace Ui
 class BookmarksSideBar;
 }
 
+class QTreeWidgetItem;
+
 class QupZilla;
 class BookmarksModel;
-class BookmarksSideBar : public QWidget
+
+class QT_QUPZILLA_EXPORT BookmarksSideBar : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/sidebar/historysidebar.cpp b/src/lib/sidebar/historysidebar.cpp
index 849e2fc4e..99e22ea77 100644
--- a/src/lib/sidebar/historysidebar.cpp
+++ b/src/lib/sidebar/historysidebar.cpp
@@ -23,6 +23,11 @@
 #include "historymodel.h"
 #include "iconprovider.h"
 
+#include <QMenu>
+#include <QClipboard>
+#include <QTimer>
+#include <QSqlQuery>
+
 HistorySideBar::HistorySideBar(QupZilla* mainClass, QWidget* parent)
     : QWidget(parent)
     , ui(new Ui::HistorySideBar)
diff --git a/src/lib/sidebar/historysidebar.h b/src/lib/sidebar/historysidebar.h
index fe5d8634e..300705010 100644
--- a/src/lib/sidebar/historysidebar.h
+++ b/src/lib/sidebar/historysidebar.h
@@ -19,11 +19,8 @@
 #define HISTORYSIDEBAR_H
 
 #include <QWidget>
-#include <QTreeWidgetItem>
-#include <QShortcut>
-#include <QClipboard>
-#include <QHash>
 
+#include "qz_namespace.h"
 #include "historymodel.h"
 
 namespace Ui
@@ -31,8 +28,11 @@ namespace Ui
 class HistorySideBar;
 }
 
+class QTreeWidgetItem;
+
 class QupZilla;
-class HistorySideBar : public QWidget
+
+class QT_QUPZILLA_EXPORT HistorySideBar : public QWidget
 {
     Q_OBJECT
 
diff --git a/src/lib/sidebar/sidebar.h b/src/lib/sidebar/sidebar.h
index 29f5a5bc7..a9ba8374f 100644
--- a/src/lib/sidebar/sidebar.h
+++ b/src/lib/sidebar/sidebar.h
@@ -19,11 +19,15 @@
 #define SIDEBAR_H
 
 #include <QWidget>
-#include <QVBoxLayout>
+
+#include "qz_namespace.h"
+
+class QVBoxLayout;
 
 class DockTitleBarWidget;
 class QupZilla;
-class SideBar : public QWidget
+
+class QT_QUPZILLA_EXPORT SideBar : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/animatedwidget.cpp b/src/lib/tools/animatedwidget.cpp
index b938caf65..bd079e60f 100644
--- a/src/lib/tools/animatedwidget.cpp
+++ b/src/lib/tools/animatedwidget.cpp
@@ -16,7 +16,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "animatedwidget.h"
-#include <QDebug>
+
+#include <QPropertyAnimation>
+#include <QParallelAnimationGroup>
+#include <QResizeEvent>
 
 AnimatedWidget::AnimatedWidget(const Direction &direction, int duration, QWidget* parent)
     : QWidget(parent)
diff --git a/src/lib/tools/animatedwidget.h b/src/lib/tools/animatedwidget.h
index 495288b87..6cabb6c64 100644
--- a/src/lib/tools/animatedwidget.h
+++ b/src/lib/tools/animatedwidget.h
@@ -19,11 +19,13 @@
 #define NOTIFICATION_H
 
 #include <QWidget>
-#include <QPropertyAnimation>
-#include <QParallelAnimationGroup>
-#include <QResizeEvent>
 
-class AnimatedWidget : public QWidget
+#include "qz_namespace.h"
+
+class QPropertyAnimation;
+class QParallelAnimationGroup;
+
+class QT_QUPZILLA_EXPORT AnimatedWidget : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight)
diff --git a/src/lib/tools/buttonbox.h b/src/lib/tools/buttonbox.h
index d4f1e52b7..36a6a6087 100644
--- a/src/lib/tools/buttonbox.h
+++ b/src/lib/tools/buttonbox.h
@@ -19,9 +19,12 @@
 #define BUTTONBOX_H
 
 #include <QDialogButtonBox>
-#include <QAbstractButton>
 
-class ButtonBox : public QDialogButtonBox
+#include "qz_namespace.h"
+
+class QAbstractButton;
+
+class QT_QUPZILLA_EXPORT ButtonBox : public QDialogButtonBox
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/buttonwithmenu.cpp b/src/lib/tools/buttonwithmenu.cpp
index 838f7e5d6..c7f6a9bec 100644
--- a/src/lib/tools/buttonwithmenu.cpp
+++ b/src/lib/tools/buttonwithmenu.cpp
@@ -17,6 +17,9 @@
 * ============================================================ */
 #include "buttonwithmenu.h"
 
+#include <QMenu>
+#include <QWheelEvent>
+
 ButtonWithMenu::ButtonWithMenu(QWidget* parent)
     : ToolButton(parent)
     , m_menu(new QMenu(this))
diff --git a/src/lib/tools/buttonwithmenu.h b/src/lib/tools/buttonwithmenu.h
index f3cd632ef..6c2aa106d 100644
--- a/src/lib/tools/buttonwithmenu.h
+++ b/src/lib/tools/buttonwithmenu.h
@@ -18,14 +18,10 @@
 #ifndef BUTTONWITHMENU_H
 #define BUTTONWITHMENU_H
 
-#include <QToolButton>
-#include <QAction>
-#include <QMenu>
-#include <QWheelEvent>
-
 #include "toolbutton.h"
+#include "qz_namespace.h"
 
-class ButtonWithMenu : public ToolButton
+class QT_QUPZILLA_EXPORT ButtonWithMenu : public ToolButton
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/certificateinfowidget.cpp b/src/lib/tools/certificateinfowidget.cpp
index fbdaa18f1..080e4a804 100644
--- a/src/lib/tools/certificateinfowidget.cpp
+++ b/src/lib/tools/certificateinfowidget.cpp
@@ -19,6 +19,10 @@
 #include "ui_certificateinfowidget.h"
 #include "mainapplication.h"
 
+#include <QSslCertificate>
+#include <QTextDocument>
+#include <QDateTime>
+
 QString CertificateInfoWidget::certificateItemText(const QSslCertificate &cert)
 {
     QString commonName = cert.subjectInfo(QSslCertificate::CommonName);
@@ -39,7 +43,7 @@ QString CertificateInfoWidget::clearCertSpecialSymbols(const QString &string)
         return n;
     }
 
-    //Credits to http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/176679?help-en
+    // Credits to http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/176679?help-en
     n.replace("\\xC3\\x80", "A");
     n.replace("\\xC3\\x81", "A");
     n.replace("\\xC3\\x82", "A");
diff --git a/src/lib/tools/certificateinfowidget.h b/src/lib/tools/certificateinfowidget.h
index 26efdb52b..8b3f27678 100644
--- a/src/lib/tools/certificateinfowidget.h
+++ b/src/lib/tools/certificateinfowidget.h
@@ -19,16 +19,17 @@
 #define CERTIFICATEINFOWIDGET_H
 
 #include <QWidget>
-#include <QSslCertificate>
-#include <QDateTime>
-#include <QTextDocument>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
 class CertificateInfoWidget;
 }
 
-class CertificateInfoWidget : public QWidget
+class QSslCertificate;
+
+class QT_QUPZILLA_EXPORT CertificateInfoWidget : public QWidget
 {
 public:
     explicit CertificateInfoWidget(const QSslCertificate &cert, QWidget* parent = 0);
diff --git a/src/lib/tools/clickablelabel.cpp b/src/lib/tools/clickablelabel.cpp
index c13ca7e92..f5932ef5c 100644
--- a/src/lib/tools/clickablelabel.cpp
+++ b/src/lib/tools/clickablelabel.cpp
@@ -17,6 +17,8 @@
 * ============================================================ */
 #include "clickablelabel.h"
 
+#include <QMouseEvent>
+
 ClickableLabel::ClickableLabel(QWidget* parent)
     : QLabel(parent)
 {
diff --git a/src/lib/tools/clickablelabel.h b/src/lib/tools/clickablelabel.h
index 44245b6ff..b363e110d 100644
--- a/src/lib/tools/clickablelabel.h
+++ b/src/lib/tools/clickablelabel.h
@@ -19,9 +19,12 @@
 #define CLICKABLELABEL_H
 
 #include <QLabel>
-#include <QMouseEvent>
 
-class ClickableLabel : public QLabel
+#include "qz_namespace.h"
+
+class QMouseEvent;
+
+class QT_QUPZILLA_EXPORT ClickableLabel : public QLabel
 {
     Q_OBJECT
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)
diff --git a/src/lib/tools/closedtabsmanager.cpp b/src/lib/tools/closedtabsmanager.cpp
index 8ce0f5b7a..99d720dad 100644
--- a/src/lib/tools/closedtabsmanager.cpp
+++ b/src/lib/tools/closedtabsmanager.cpp
@@ -19,8 +19,9 @@
 #include "webview.h"
 #include "mainapplication.h"
 
-ClosedTabsManager::ClosedTabsManager(QObject* parent)
-    : QObject(parent)
+#include <QWebHistory>
+
+ClosedTabsManager::ClosedTabsManager()
 {
 }
 
diff --git a/src/lib/tools/closedtabsmanager.h b/src/lib/tools/closedtabsmanager.h
index 2c5d0c0c8..6307d94ce 100644
--- a/src/lib/tools/closedtabsmanager.h
+++ b/src/lib/tools/closedtabsmanager.h
@@ -18,15 +18,15 @@
 #ifndef CLOSEDTABSMANAGER_H
 #define CLOSEDTABSMANAGER_H
 
-#include <QObject>
 #include <QUrl>
-#include <QWebHistory>
+
+#include "qz_namespace.h"
 
 class WebView;
-class ClosedTabsManager : public QObject
+
+class QT_QUPZILLA_EXPORT ClosedTabsManager
 {
 public:
-    explicit ClosedTabsManager(QObject* parent = 0);
     struct Tab {
         QUrl url;
         QByteArray history;
@@ -40,6 +40,8 @@ public:
         }
     };
 
+    explicit ClosedTabsManager();
+
     void saveView(WebView* view, int position);
     ClosedTabsManager::Tab getFirstClosedTab();
     ClosedTabsManager::Tab getTabAt(int index);
diff --git a/src/lib/tools/docktitlebarwidget.h b/src/lib/tools/docktitlebarwidget.h
index 1b96bc5d8..098dbaccf 100644
--- a/src/lib/tools/docktitlebarwidget.h
+++ b/src/lib/tools/docktitlebarwidget.h
@@ -20,9 +20,10 @@
 
 #include <QWidget>
 
+#include "qz_namespace.h"
 #include "ui_docktitlebarwidget.h"
 
-class DockTitleBarWidget : public QWidget, public Ui_DockTitleBarWidget
+class QT_QUPZILLA_EXPORT DockTitleBarWidget : public QWidget, public Ui_DockTitleBarWidget
 {
 public:
     explicit DockTitleBarWidget(const QString &title, QWidget* parent = 0);
diff --git a/src/lib/tools/enhancedmenu.cpp b/src/lib/tools/enhancedmenu.cpp
index 948119c74..56961b825 100644
--- a/src/lib/tools/enhancedmenu.cpp
+++ b/src/lib/tools/enhancedmenu.cpp
@@ -17,6 +17,8 @@
 * ============================================================ */
 #include "enhancedmenu.h"
 
+#include <QMouseEvent>
+
 Menu::Menu(QWidget* parent)
     : QMenu(parent)
 {
diff --git a/src/lib/tools/enhancedmenu.h b/src/lib/tools/enhancedmenu.h
index 284f02a86..7aebbcc35 100644
--- a/src/lib/tools/enhancedmenu.h
+++ b/src/lib/tools/enhancedmenu.h
@@ -19,11 +19,13 @@
 #define ENHANCEDMENU_H
 
 #include <QMenu>
-#include <QMouseEvent>
-#include <QStyle>
+
+#include "qz_namespace.h"
+
 
 class Action;
-class Menu : public QMenu
+
+class QT_QUPZILLA_EXPORT Menu : public QMenu
 {
     Q_OBJECT
 public:
@@ -40,7 +42,7 @@ private:
     void closeAllMenus();
 };
 
-class Action : public QAction
+class QT_QUPZILLA_EXPORT Action : public QAction
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/followredirectreply.cpp b/src/lib/tools/followredirectreply.cpp
index 0909d483d..75c36a154 100644
--- a/src/lib/tools/followredirectreply.cpp
+++ b/src/lib/tools/followredirectreply.cpp
@@ -1,5 +1,26 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "followredirectreply.h"
 
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+
 FollowRedirectReply::FollowRedirectReply(const QUrl &url, QNetworkAccessManager* manager)
     : QObject()
     , m_manager(manager)
diff --git a/src/lib/tools/followredirectreply.h b/src/lib/tools/followredirectreply.h
index c6f2e562c..78526e4fb 100644
--- a/src/lib/tools/followredirectreply.h
+++ b/src/lib/tools/followredirectreply.h
@@ -1,12 +1,33 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
+
 #ifndef FOLLOWREDIRECTREPLY_H
 #define FOLLOWREDIRECTREPLY_H
 
 #include <QObject>
-#include <QUrl>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
 
-class FollowRedirectReply : public QObject
+#include "qz_namespace.h"
+
+class QNetworkAccessManager;
+class QNetworkReply;
+class QUrl;
+
+class QT_QUPZILLA_EXPORT FollowRedirectReply : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/frame.cpp b/src/lib/tools/frame.cpp
index e50519de8..9361255bb 100644
--- a/src/lib/tools/frame.cpp
+++ b/src/lib/tools/frame.cpp
@@ -17,6 +17,8 @@
 * ============================================================ */
 #include "frame.h"
 
+#include <QMouseEvent>
+
 Frame::Frame(QWidget* parent)
     : QFrame(parent)
 {
diff --git a/src/lib/tools/frame.h b/src/lib/tools/frame.h
index 0265ba5f8..e1ca084c8 100644
--- a/src/lib/tools/frame.h
+++ b/src/lib/tools/frame.h
@@ -19,9 +19,10 @@
 #define FRAME_H
 
 #include <QFrame>
-#include <QMouseEvent>
 
-class Frame : public QFrame
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT Frame : public QFrame
 {
 public:
     explicit Frame(QWidget* parent = 0);
diff --git a/src/lib/tools/globalfunctions.cpp b/src/lib/tools/globalfunctions.cpp
index 81a6724a1..98f21d760 100644
--- a/src/lib/tools/globalfunctions.cpp
+++ b/src/lib/tools/globalfunctions.cpp
@@ -17,6 +17,17 @@
 * ============================================================ */
 #include "globalfunctions.h"
 
+#include <QByteArray>
+#include <QPixmap>
+#include <QBuffer>
+#include <QFile>
+#include <QDir>
+#include <QWidget>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QUrl>
+#include <QIcon>
+
 QByteArray qz_pixmapToByteArray(const QPixmap &pix)
 {
     QByteArray bytes;
diff --git a/src/lib/tools/globalfunctions.h b/src/lib/tools/globalfunctions.h
index 2298ae3ad..2154b8e41 100644
--- a/src/lib/tools/globalfunctions.h
+++ b/src/lib/tools/globalfunctions.h
@@ -18,37 +18,32 @@
 #ifndef GLOBALFUNCTIONS_H
 #define GLOBALFUNCTIONS_H
 
-#include <QByteArray>
-#include <QPixmap>
-#include <QBuffer>
-#include <QFile>
-#include <QDir>
-#include <QWidget>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QUrl>
-#include <QIcon>
+#include "qz_namespace.h"
 
-QByteArray qz_pixmapToByteArray(const QPixmap &pix);
-QPixmap qz_pixmapFromByteArray(const QByteArray &data);
+class QPixmap;
+class QWidget;
+class QUrl;
 
-QByteArray qz_readAllFileContents(const QString &filename);
+QByteArray QT_QUPZILLA_EXPORT qz_pixmapToByteArray(const QPixmap &pix);
+QPixmap QT_QUPZILLA_EXPORT qz_pixmapFromByteArray(const QByteArray &data);
 
-void qz_centerWidgetOnScreen(QWidget* w);
-void qz_centerWidgetToParent(QWidget* w, QWidget* parent);
+QByteArray QT_QUPZILLA_EXPORT qz_readAllFileContents(const QString &filename);
 
-bool qz_removeFile(const QString &fullFileName);
-void qz_removeDir(const QString &d);
+void QT_QUPZILLA_EXPORT qz_centerWidgetOnScreen(QWidget* w);
+void QT_QUPZILLA_EXPORT qz_centerWidgetToParent(QWidget* w, QWidget* parent);
 
-QString qz_samePartOfStrings(const QString &one, const QString &other);
-QUrl qz_makeRelativeUrl(const QUrl &baseUrl, const QUrl &rUrl);
-QString qz_urlEncodeQueryString(const QUrl &url);
+bool QT_QUPZILLA_EXPORT qz_removeFile(const QString &fullFileName);
+void QT_QUPZILLA_EXPORT qz_removeDir(const QString &d);
 
-QString qz_ensureUniqueFilename(const QString &name);
-QString qz_getFileNameFromUrl(const QUrl &url);
+QString QT_QUPZILLA_EXPORT qz_samePartOfStrings(const QString &one, const QString &other);
+QUrl QT_QUPZILLA_EXPORT qz_makeRelativeUrl(const QUrl &baseUrl, const QUrl &rUrl);
+QString QT_QUPZILLA_EXPORT qz_urlEncodeQueryString(const QUrl &url);
 
-QString qz_filterCharsFromFilename(const QString &name);
+QString QT_QUPZILLA_EXPORT qz_ensureUniqueFilename(const QString &name);
+QString QT_QUPZILLA_EXPORT qz_getFileNameFromUrl(const QUrl &url);
 
-QString qz_buildSystem();
+QString QT_QUPZILLA_EXPORT qz_filterCharsFromFilename(const QString &name);
+
+QString QT_QUPZILLA_EXPORT qz_buildSystem();
 
 #endif // GLOBALFUNCTIONS_H
diff --git a/src/lib/tools/htmlhighlighter.h b/src/lib/tools/htmlhighlighter.h
index 05d0442d6..cc53df565 100644
--- a/src/lib/tools/htmlhighlighter.h
+++ b/src/lib/tools/htmlhighlighter.h
@@ -59,12 +59,13 @@
 #define HTMLHIGHLIGHTER_H
 
 #include <QSyntaxHighlighter>
-#include <QHash>
 #include <QTextCharFormat>
 
+#include "qz_namespace.h"
+
 class QTextDocument;
 
-class HtmlHighlighter : public QSyntaxHighlighter
+class QT_QUPZILLA_EXPORT HtmlHighlighter : public QSyntaxHighlighter
 {
 public:
     HtmlHighlighter(QTextDocument* parent = 0);
diff --git a/src/lib/tools/iconfetcher.cpp b/src/lib/tools/iconfetcher.cpp
index 787473bec..26d192cb7 100644
--- a/src/lib/tools/iconfetcher.cpp
+++ b/src/lib/tools/iconfetcher.cpp
@@ -15,6 +15,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
+#include <QNetworkReply>
 #include "iconfetcher.h"
 #include "followredirectreply.h"
 
diff --git a/src/lib/tools/iconfetcher.h b/src/lib/tools/iconfetcher.h
index e29f72c90..2e81bc104 100644
--- a/src/lib/tools/iconfetcher.h
+++ b/src/lib/tools/iconfetcher.h
@@ -18,13 +18,17 @@
 #ifndef ICONFETCHER_H
 #define ICONFETCHER_H
 
+#include "qz_namespace.h"
+
 #include <QObject>
 #include <QIcon>
-#include <QUrl>
-#include <QNetworkAccessManager>
+
+class QNetworkAccessManager;
+class QUrl;
 
 class FollowRedirectReply;
-class IconFetcher : public QObject
+
+class QT_QUPZILLA_EXPORT IconFetcher : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/iconprovider.cpp b/src/lib/tools/iconprovider.cpp
index 086da7577..b9a15250d 100644
--- a/src/lib/tools/iconprovider.cpp
+++ b/src/lib/tools/iconprovider.cpp
@@ -20,6 +20,9 @@
 #include "mainapplication.h"
 #include "databasewriter.h"
 
+#include <QTimer>
+#include <QBuffer>
+
 IconProvider::IconProvider(QObject* parent)
     : QObject(parent)
 {
diff --git a/src/lib/tools/iconprovider.h b/src/lib/tools/iconprovider.h
index ee4a297dd..bd7d6432f 100644
--- a/src/lib/tools/iconprovider.h
+++ b/src/lib/tools/iconprovider.h
@@ -21,15 +21,18 @@
 #define _iconForUrl(url) IconProvider::iconFromImage(mApp->iconProvider()->iconForUrl(url))
 
 #include <QObject>
-#include <QIcon>
+#include <QImage>
 #include <QUrl>
-#include <QSqlQuery>
-#include <QBuffer>
-#include <QTimer>
 #include <QStyle>
 
+#include "qz_namespace.h"
+
+class QTimer;
+class QIcon;
+
 class WebView;
-class IconProvider : public QObject
+
+class QT_QUPZILLA_EXPORT IconProvider : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/pagethumbnailer.cpp b/src/lib/tools/pagethumbnailer.cpp
index 4ab44666e..17dfc7ce1 100644
--- a/src/lib/tools/pagethumbnailer.cpp
+++ b/src/lib/tools/pagethumbnailer.cpp
@@ -19,6 +19,10 @@
 #include "mainapplication.h"
 #include "networkmanagerproxy.h"
 
+#include <QWebPage>
+#include <QWebFrame>
+#include <QPainter>
+
 CleanPluginFactory::CleanPluginFactory(QObject* parent)
     : QWebPluginFactory(parent)
 {
diff --git a/src/lib/tools/pagethumbnailer.h b/src/lib/tools/pagethumbnailer.h
index 20c2ed4be..e6ab8dc5f 100644
--- a/src/lib/tools/pagethumbnailer.h
+++ b/src/lib/tools/pagethumbnailer.h
@@ -19,12 +19,16 @@
 #define PAGETHUMBNAILER_H
 
 #include <QObject>
-#include <QWebPage>
-#include <QWebFrame>
-#include <QPainter>
+#include <QSize>
+#include <QUrl>
 #include <QWebPluginFactory>
+#include <QPixmap>
 
-class CleanPluginFactory : public QWebPluginFactory
+#include "qz_namespace.h"
+
+class QWebPage;
+
+class QT_QUPZILLA_EXPORT CleanPluginFactory : public QWebPluginFactory
 {
     Q_OBJECT
 public:
@@ -34,7 +38,7 @@ public:
     QObject* create(const QString &mimeType, const QUrl &url, const QStringList &argumentNames, const QStringList &argumentValues) const;
 };
 
-class PageThumbnailer : public QObject
+class QT_QUPZILLA_EXPORT PageThumbnailer : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/progressbar.cpp b/src/lib/tools/progressbar.cpp
index cdc9325d1..1ed33f84a 100644
--- a/src/lib/tools/progressbar.cpp
+++ b/src/lib/tools/progressbar.cpp
@@ -17,6 +17,9 @@
 * ============================================================ */
 #include "progressbar.h"
 
+#include <QStylePainter>
+#include <QStyleOptionProgressBarV2>
+
 ProgressBar::ProgressBar(QWidget* parent)
     : QWidget(parent)
     , m_value(0)
diff --git a/src/lib/tools/progressbar.h b/src/lib/tools/progressbar.h
index 194f97596..9a37d2064 100644
--- a/src/lib/tools/progressbar.h
+++ b/src/lib/tools/progressbar.h
@@ -18,11 +18,13 @@
 #ifndef PROGRESSBAR_H
 #define PROGRESSBAR_H
 
-#include <QStylePainter>
-#include <QStyleOptionProgressBarV2>
-#include <QStyleOptionProgressBar>
+#include <QWidget>
 
-class ProgressBar : public QWidget
+#include "qz_namespace.h"
+
+class QStyleOptionProgressBar;
+
+class QT_QUPZILLA_EXPORT ProgressBar : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/toolbutton.cpp b/src/lib/tools/toolbutton.cpp
index 25008f308..df217917c 100644
--- a/src/lib/tools/toolbutton.cpp
+++ b/src/lib/tools/toolbutton.cpp
@@ -17,6 +17,10 @@
 * ============================================================ */
 #include "toolbutton.h"
 
+#include <QMouseEvent>
+#include <QPainter>
+#include <QStyleOptionToolButton>
+
 ToolButton::ToolButton(QWidget* parent)
     : QToolButton(parent)
     , m_usingMultiIcon(false)
diff --git a/src/lib/tools/toolbutton.h b/src/lib/tools/toolbutton.h
index 4c87792d4..dd07290ed 100644
--- a/src/lib/tools/toolbutton.h
+++ b/src/lib/tools/toolbutton.h
@@ -19,14 +19,14 @@
 #define TOOLBUTTON_H
 
 #include <QToolButton>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QStyleOptionToolButton>
-#include <QMouseEvent>
+#include <QVariant>
 
-class ToolButton : public QToolButton
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT ToolButton : public QToolButton
 {
     Q_OBJECT
+
     Q_PROPERTY(QSize fixedsize READ size WRITE setFixedSize)
     Q_PROPERTY(int fixedwidth READ width WRITE setFixedWidth)
     Q_PROPERTY(int fixedheight READ height WRITE setFixedHeight)
diff --git a/src/lib/tools/treewidget.cpp b/src/lib/tools/treewidget.cpp
index 918071e98..c69110d63 100644
--- a/src/lib/tools/treewidget.cpp
+++ b/src/lib/tools/treewidget.cpp
@@ -17,6 +17,8 @@
 * ============================================================ */
 #include "treewidget.h"
 
+#include <QMouseEvent>
+
 TreeWidget::TreeWidget(QWidget* parent)
     : QTreeWidget(parent)
     , m_refreshAllItemsNeeded(true)
diff --git a/src/lib/tools/treewidget.h b/src/lib/tools/treewidget.h
index cb7712763..3cd8bd1ea 100644
--- a/src/lib/tools/treewidget.h
+++ b/src/lib/tools/treewidget.h
@@ -18,11 +18,11 @@
 #ifndef BOOKMARKSTREEWIDGET_H
 #define BOOKMARKSTREEWIDGET_H
 
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QMouseEvent>
+#include "qz_namespace.h"
 
-class TreeWidget : public QTreeWidget
+#include <QTreeWidget>
+
+class QT_QUPZILLA_EXPORT TreeWidget : public QTreeWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/tools/widget.h b/src/lib/tools/widget.h
index c229f4290..62fe94a5f 100644
--- a/src/lib/tools/widget.h
+++ b/src/lib/tools/widget.h
@@ -21,7 +21,9 @@
 #include <QWidget>
 #include <QFrame>
 
-class Widget : public QWidget
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT Widget : public QWidget
 {
     Q_OBJECT
 public:
@@ -34,7 +36,7 @@ public slots:
 
 };
 
-class ResizableFrame : public QFrame
+class QT_QUPZILLA_EXPORT ResizableFrame : public QFrame
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/popupwebview.cpp b/src/lib/webview/popupwebview.cpp
index 7ea538b36..014b42add 100644
--- a/src/lib/webview/popupwebview.cpp
+++ b/src/lib/webview/popupwebview.cpp
@@ -6,6 +6,8 @@
 #include "iconprovider.h"
 #include "enhancedmenu.h"
 
+#include <QWebFrame>
+
 PopupWebView::PopupWebView(QWidget* parent)
     : WebView(parent)
     , m_page(0)
diff --git a/src/lib/webview/popupwebview.h b/src/lib/webview/popupwebview.h
index 1ea61fb95..46e8fd519 100644
--- a/src/lib/webview/popupwebview.h
+++ b/src/lib/webview/popupwebview.h
@@ -1,13 +1,13 @@
 #ifndef POPUPWEBVIEW_H
 #define POPUPWEBVIEW_H
 
-#include <QMenu>
-
+#include "qz_namespace.h"
 #include "webview.h"
 
 class PopupWebPage;
 class Menu;
-class PopupWebView : public WebView
+
+class QT_QUPZILLA_EXPORT PopupWebView : public WebView
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/searchtoolbar.cpp b/src/lib/webview/searchtoolbar.cpp
index 8b6b449c8..fae843d34 100644
--- a/src/lib/webview/searchtoolbar.cpp
+++ b/src/lib/webview/searchtoolbar.cpp
@@ -22,6 +22,8 @@
 #include "ui_searchtoolbar.h"
 #include "iconprovider.h"
 
+#include <QShortcut>
+
 SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget* parent)
     : AnimatedWidget(AnimatedWidget::Up, 300, parent)
     , ui(new Ui::SearchToolbar)
diff --git a/src/lib/webview/searchtoolbar.h b/src/lib/webview/searchtoolbar.h
index faa3ab304..18cdb5df4 100644
--- a/src/lib/webview/searchtoolbar.h
+++ b/src/lib/webview/searchtoolbar.h
@@ -18,14 +18,9 @@
 #ifndef SEARCHTOOLBAR_H
 #define SEARCHTOOLBAR_H
 
-#include <QLineEdit>
-#include <QToolButton>
 #include <QWebPage>
-#include <QLabel>
-#include <QFlags>
-#include <QPropertyAnimation>
-#include <QShortcut>
 
+#include "qz_namespace.h"
 #include "animatedwidget.h"
 
 namespace Ui
@@ -33,9 +28,12 @@ namespace Ui
 class SearchToolbar;
 }
 
+class QLineEdit;
+
 class QupZilla;
 class LineEdit;
-class SearchToolBar : public AnimatedWidget
+
+class QT_QUPZILLA_EXPORT SearchToolBar : public AnimatedWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/siteinfo.cpp b/src/lib/webview/siteinfo.cpp
index 6a500d863..ab20f4ebb 100644
--- a/src/lib/webview/siteinfo.cpp
+++ b/src/lib/webview/siteinfo.cpp
@@ -25,6 +25,13 @@
 #include "globalfunctions.h"
 #include "iconprovider.h"
 
+#include <QMenu>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QNetworkDiskCache>
+#include <QWebFrame>
+#include <QClipboard>
+
 QString SiteInfo::showCertInfo(const QString &string)
 {
     if (string.isEmpty()) {
diff --git a/src/lib/webview/siteinfo.h b/src/lib/webview/siteinfo.h
index 917e06caa..bdfc5a9ab 100644
--- a/src/lib/webview/siteinfo.h
+++ b/src/lib/webview/siteinfo.h
@@ -18,10 +18,9 @@
 #ifndef SITEINFO_H
 #define SITEINFO_H
 
+#include "qz_namespace.h"
+
 #include <QDialog>
-#include <QListWidgetItem>
-#include <QTreeWidgetItem>
-#include <QGraphicsItem>
 #include <QUrl>
 
 namespace Ui
@@ -29,9 +28,13 @@ namespace Ui
 class SiteInfo;
 }
 
+class QListWidgetItem;
+class QTreeWidgetItem;
+
 class WebView;
 class CertificateInfoWidget;
-class SiteInfo : public QDialog
+
+class QT_QUPZILLA_EXPORT SiteInfo : public QDialog
 {
     Q_OBJECT
 
diff --git a/src/lib/webview/siteinfowidget.cpp b/src/lib/webview/siteinfowidget.cpp
index 47d7913bb..89ddc90f6 100644
--- a/src/lib/webview/siteinfowidget.cpp
+++ b/src/lib/webview/siteinfowidget.cpp
@@ -21,6 +21,9 @@
 #include "webpage.h"
 #include "tabbedwebview.h"
 
+#include <QToolTip>
+#include <QSqlQuery>
+
 SiteInfoWidget::SiteInfoWidget(QupZilla* mainClass, QWidget* parent)
     : QMenu(parent)
     , ui(new Ui::SiteInfoWidget)
diff --git a/src/lib/webview/siteinfowidget.h b/src/lib/webview/siteinfowidget.h
index 9ec453ea8..557a9091d 100644
--- a/src/lib/webview/siteinfowidget.h
+++ b/src/lib/webview/siteinfowidget.h
@@ -18,9 +18,9 @@
 #ifndef SITEINFOWIDGET_H
 #define SITEINFOWIDGET_H
 
-#include <QWidget>
 #include <QMenu>
-#include <QToolTip>
+
+#include "qz_namespace.h"
 
 namespace Ui
 {
@@ -28,7 +28,8 @@ class SiteInfoWidget;
 }
 
 class QupZilla;
-class SiteInfoWidget : public QMenu
+
+class QT_QUPZILLA_EXPORT SiteInfoWidget : public QMenu
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/tabbar.cpp b/src/lib/webview/tabbar.cpp
index f87fb19f3..774651ffc 100644
--- a/src/lib/webview/tabbar.cpp
+++ b/src/lib/webview/tabbar.cpp
@@ -22,6 +22,11 @@
 #include "iconprovider.h"
 #include "toolbutton.h"
 #include "settings.h"
+#include "tabbedwebview.h"
+
+#include <QMenu>
+#include <QApplication>
+#include <QTimer>
 
 #define MAXIMUM_TAB_WIDTH 250
 #define MINIMUM_TAB_WIDTH 50
diff --git a/src/lib/webview/tabbar.h b/src/lib/webview/tabbar.h
index fb440f4e3..e8b640852 100644
--- a/src/lib/webview/tabbar.h
+++ b/src/lib/webview/tabbar.h
@@ -19,16 +19,13 @@
 #define TABBAR_H
 
 #include <QTabBar>
-#include <QAction>
-#include <QDebug>
-#include <QMenu>
-#include <QMouseEvent>
-#include <QStyle>
-#include <QApplication>
+
+#include "qz_namespace.h"
 
 class QupZilla;
 class TabWidget;
-class TabBar : public QTabBar
+
+class QT_QUPZILLA_EXPORT TabBar : public QTabBar
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/tabbedwebview.cpp b/src/lib/webview/tabbedwebview.cpp
index ee61ea8f4..07c6a9c6b 100644
--- a/src/lib/webview/tabbedwebview.cpp
+++ b/src/lib/webview/tabbedwebview.cpp
@@ -31,6 +31,11 @@
 #include "enhancedmenu.h"
 #include "adblockicon.h"
 
+#include <QMovie>
+#include <QStatusBar>
+#include <QHostInfo>
+#include <QWebFrame>
+
 TabbedWebView::TabbedWebView(QupZilla* mainClass, WebTab* webTab)
     : WebView(webTab)
     , p_QupZilla(mainClass)
diff --git a/src/lib/webview/tabbedwebview.h b/src/lib/webview/tabbedwebview.h
index 9771591ac..6dac448b5 100644
--- a/src/lib/webview/tabbedwebview.h
+++ b/src/lib/webview/tabbedwebview.h
@@ -18,20 +18,19 @@
 #ifndef TABBEDWEBVIEW_H
 #define TABBEDWEBVIEW_H
 
-#include <QDebug>
-#include <QTabWidget>
-#include <QContextMenuEvent>
-#include <QLabel>
-#include <QHostInfo>
-
+#include "qz_namespace.h"
 #include "webview.h"
 
+class QLabel;
+class QHostInfo;
+
 class QupZilla;
 class TabWidget;
 class WebPage;
 class WebTab;
 class Menu;
-class TabbedWebView : public WebView
+
+class QT_QUPZILLA_EXPORT TabbedWebView : public WebView
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/tabwidget.cpp b/src/lib/webview/tabwidget.cpp
index 827a0842b..738e39918 100644
--- a/src/lib/webview/tabwidget.cpp
+++ b/src/lib/webview/tabwidget.cpp
@@ -32,7 +32,13 @@
 #include "websearchbar.h"
 #include "settings.h"
 
-class NewTabButton : public QToolButton
+#include <QStyleOptionToolButton>
+#include <QMovie>
+#include <QMenu>
+#include <QStackedWidget>
+#include <QWebHistory>
+
+class QT_QUPZILLA_EXPORT NewTabButton : public QToolButton
 {
 public:
     explicit NewTabButton(QWidget* parent) : QToolButton(parent) {
@@ -65,7 +71,7 @@ private:
 #endif
 };
 
-class TabListButton : public QToolButton
+class QT_QUPZILLA_EXPORT TabListButton : public QToolButton
 {
 public:
     explicit TabListButton(QWidget* parent) : QToolButton(parent) {
@@ -103,8 +109,8 @@ TabWidget::TabWidget(QupZilla* mainClass, QWidget* parent)
     , m_lastTabIndex(0)
     , m_lastBackgroundTabIndex(-1)
     , m_isClosingToLastTabIndex(false)
-    , m_closedTabsManager(new ClosedTabsManager(this))
-    , m_locationBars(new QStackedWidget())
+    , m_closedTabsManager(new ClosedTabsManager)
+    , m_locationBars(new QStackedWidget)
 {
     setObjectName("tabwidget");
     m_tabBar = new TabBar(p_QupZilla, this);
@@ -756,4 +762,5 @@ void TabWidget::disconnectObjects()
 
 TabWidget::~TabWidget()
 {
+    delete m_closedTabsManager;
 }
diff --git a/src/lib/webview/tabwidget.h b/src/lib/webview/tabwidget.h
index 7654e1aff..8b6019dd9 100644
--- a/src/lib/webview/tabwidget.h
+++ b/src/lib/webview/tabwidget.h
@@ -19,16 +19,13 @@
 #define TABWIDGET_H
 
 #include <QTabWidget>
-#include <QTabBar>
-#include <QDateTime>
-#include <QToolButton>
-#include <QStylePainter>
-#include <QStackedWidget>
-#include <QTextDocument>
 #include <QUrl>
 
 #include "qz_namespace.h"
 
+class QStackedWidget;
+class QMenu;
+
 class QupZilla;
 class TabbedWebView;
 class TabBar;
@@ -37,7 +34,8 @@ class TabListButton;
 class NewTabButton;
 class ClosedTabsManager;
 class ToolButton;
-class TabWidget : public QTabWidget
+
+class QT_QUPZILLA_EXPORT TabWidget : public QTabWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/webhistorywrapper.cpp b/src/lib/webview/webhistorywrapper.cpp
index be317985b..d0eaba97e 100644
--- a/src/lib/webview/webhistorywrapper.cpp
+++ b/src/lib/webview/webhistorywrapper.cpp
@@ -17,6 +17,9 @@
 * ============================================================ */
 #include "webhistorywrapper.h"
 
+#include <QUrl>
+#include <QWebHistory>
+
 WebHistoryWrapper::WebHistoryWrapper()
 {
 }
diff --git a/src/lib/webview/webhistorywrapper.h b/src/lib/webview/webhistorywrapper.h
index 638f8328f..0ac4b40ae 100644
--- a/src/lib/webview/webhistorywrapper.h
+++ b/src/lib/webview/webhistorywrapper.h
@@ -18,8 +18,12 @@
 #ifndef WEBHISTORYWRAPPER_H
 #define WEBHISTORYWRAPPER_H
 
-#include <QObject>
-#include <QWebHistory>
+#include <QList>
+
+#include "qz_namespace.h"
+
+class QWebHistory;
+class QWebHistoryItem;
 
 class WebHistoryWrapper
 {
@@ -36,7 +40,6 @@ public:
     static void goForward(QWebHistory* history);
 
     static int indexOfItem(const QList<QWebHistoryItem> &list, const QWebHistoryItem &item);
-
 };
 
 #endif // WEBHISTORYWRAPPER_H
diff --git a/src/lib/webview/webinspectordockwidget.h b/src/lib/webview/webinspectordockwidget.h
index c8d822ff7..fde5998f8 100644
--- a/src/lib/webview/webinspectordockwidget.h
+++ b/src/lib/webview/webinspectordockwidget.h
@@ -18,13 +18,14 @@
 #ifndef WEBINSPECTORDOCKWIDGET_H
 #define WEBINSPECTORDOCKWIDGET_H
 
-#include <QDockWidget>
 #include <QWebInspector>
-#include <QPair>
+#include <QDockWidget>
 #include <QWeakPointer>
 #include <QHash>
 
-class WebInspector : public QWebInspector
+#include "qz_namespace.h"
+
+class QT_QUPZILLA_EXPORT WebInspector : public QWebInspector
 {
 public:
     explicit WebInspector(QWidget* parent) : QWebInspector(parent) { }
@@ -36,7 +37,7 @@ private:
 };
 
 class QupZilla;
-class WebInspectorDockWidget : public QDockWidget
+class QT_QUPZILLA_EXPORT WebInspectorDockWidget : public QDockWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/webpage.cpp b/src/lib/webview/webpage.cpp
index 09babd05f..6401c25dc 100644
--- a/src/lib/webview/webpage.cpp
+++ b/src/lib/webview/webpage.cpp
@@ -37,6 +37,18 @@
 #include "networkmanagerproxy.h"
 #include "adblockicon.h"
 
+#include <QTextDocument>
+#include <QDir>
+#include <QWebHistory>
+#include <QFileSystemWatcher>
+#include <QTimer>
+#include <QNetworkReply>
+#include <QDebug>
+#include <QDesktopServices>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QWebFrame>
+
 QString WebPage::m_lastUploadLocation = QDir::homePath();
 QString WebPage::m_userAgent = QString();
 
@@ -267,7 +279,6 @@ QSslCertificate WebPage::sslCertificate()
 
 bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest &request, NavigationType type)
 {
-    m_lastRequest = request;
     m_lastRequestType = type;
     const QString &scheme = request.url().scheme();
 
diff --git a/src/lib/webview/webpage.h b/src/lib/webview/webpage.h
index 236a8d5ab..120c2b769 100644
--- a/src/lib/webview/webpage.h
+++ b/src/lib/webview/webpage.h
@@ -18,25 +18,20 @@
 #ifndef WEBPAGE_H
 #define WEBPAGE_H
 
-#include <QDebug>
-#include <QUrl>
-#include <QWebView>
-#include <QWebFrame>
-#include <QWebHistory>
-#include <QtNetwork/QtNetwork>
-#include <QDesktopServices>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QStyle>
-#include <QFileDialog>
-#include <QWebInspector>
-#include <QFileSystemWatcher>
+#include <QWebPage>
+#include <QSslCertificate>
+
+#include "qz_namespace.h"
+
+class QFileSystemWatcher;
+class QEventLoop;
 
 class QupZilla;
 class TabbedWebView;
 class SpeedDial;
 class NetworkManagerProxy;
-class WebPage : public QWebPage
+
+class QT_QUPZILLA_EXPORT WebPage : public QWebPage
 {
     Q_OBJECT
 public:
@@ -106,7 +101,6 @@ private:
 
     QupZilla* p_QupZilla;
     NetworkManagerProxy* m_networkProxy;
-    QNetworkRequest m_lastRequest;
     QWebPage::NavigationType m_lastRequestType;
     TabbedWebView* m_view;
     SpeedDial* m_speedDial;
diff --git a/src/lib/webview/webtab.cpp b/src/lib/webview/webtab.cpp
index 15490e8bc..e04e4dc19 100644
--- a/src/lib/webview/webtab.cpp
+++ b/src/lib/webview/webtab.cpp
@@ -23,6 +23,8 @@
 #include "tabwidget.h"
 #include "locationbar.h"
 
+#include <QVBoxLayout>
+
 WebTab::WebTab(QupZilla* mainClass, LocationBar* locationBar)
     : QWidget()
     , p_QupZilla(mainClass)
diff --git a/src/lib/webview/webtab.h b/src/lib/webview/webtab.h
index 494a4f40f..5b91f145a 100644
--- a/src/lib/webview/webtab.h
+++ b/src/lib/webview/webtab.h
@@ -19,14 +19,17 @@
 #define WEBTAB_H
 
 #include <QWidget>
-#include <QLayout>
 #include <QWeakPointer>
-#include "tabbedwebview.h"
-#include "locationbar.h"
+
+#include "qz_namespace.h"
+
+class QVBoxLayout;
 
 class QupZilla;
 class LocationBar;
-class WebTab : public QWidget
+class TabbedWebView;
+
+class QT_QUPZILLA_EXPORT WebTab : public QWidget
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/webview.cpp b/src/lib/webview/webview.cpp
index fd73c4f1e..23ab58d9b 100644
--- a/src/lib/webview/webview.cpp
+++ b/src/lib/webview/webview.cpp
@@ -34,6 +34,14 @@
 #include "enhancedmenu.h"
 #include "pluginproxy.h"
 
+#include <QDir>
+#include <QDesktopServices>
+#include <QNetworkRequest>
+#include <QWebHistory>
+#include <QWebFrame>
+#include <QClipboard>
+#include <QPrintPreviewDialog>
+
 WebView::WebView(QWidget* parent)
     : QWebView(parent)
     , m_currentZoom(100)
diff --git a/src/lib/webview/webview.h b/src/lib/webview/webview.h
index 14840656e..6f8b7d98d 100644
--- a/src/lib/webview/webview.h
+++ b/src/lib/webview/webview.h
@@ -19,17 +19,12 @@
 #define WEBVIEW_H
 
 #include <QWebView>
-#include <QWebFrame>
-#include <QWebElementCollection>
-#include <QWebHitTestResult>
+#include <QWebElement>
 #include <QTouchEvent>
-#include <QClipboard>
-#include <QPrintPreviewDialog>
-#include <QFile>
 
 #include "qz_namespace.h"
 
-class WebView : public QWebView
+class QT_QUPZILLA_EXPORT WebView : public QWebView
 {
     Q_OBJECT
 public:
diff --git a/src/lib/webview/webviewsettings.h b/src/lib/webview/webviewsettings.h
index d65ca4698..ba0c71f1b 100644
--- a/src/lib/webview/webviewsettings.h
+++ b/src/lib/webview/webviewsettings.h
@@ -1,6 +1,8 @@
 #ifndef WEBVIEWSETTINGS_H
 #define WEBVIEWSETTINGS_H
 
+#include "qz_namespace.h"
+
 class WebViewSettings
 {
 public:
diff --git a/src/plugins/MouseGestures/mousegesturesplugin.cpp b/src/plugins/MouseGestures/mousegesturesplugin.cpp
index d5bca66e0..8e1957fa7 100644
--- a/src/plugins/MouseGestures/mousegesturesplugin.cpp
+++ b/src/plugins/MouseGestures/mousegesturesplugin.cpp
@@ -3,6 +3,8 @@
 #include "mousegestures.h"
 #include "qupzilla.h"
 
+#include <QTranslator>
+
 MouseGesturesPlugin::MouseGesturesPlugin()
     : QObject()
     , m_gestures(0)
diff --git a/src/plugins/TestPlugin/TestPlugin.pro b/src/plugins/TestPlugin/TestPlugin.pro
index 71e608f33..179784fab 100644
--- a/src/plugins/TestPlugin/TestPlugin.pro
+++ b/src/plugins/TestPlugin/TestPlugin.pro
@@ -3,7 +3,7 @@
 # Project created by QtCreator 2011-02-13T10:23:13
 #
 #-------------------------------------------------
-QT += network webkit sql
+QT += network webkit
 TARGET = TestPlugin
 
 SOURCES += testplugin.cpp
diff --git a/src/plugins/TestPlugin/testplugin.cpp b/src/plugins/TestPlugin/testplugin.cpp
index 2302cd17c..69446dc60 100644
--- a/src/plugins/TestPlugin/testplugin.cpp
+++ b/src/plugins/TestPlugin/testplugin.cpp
@@ -1,8 +1,30 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #include "testplugin.h"
 #include "qupzilla.h"
 #include "webview.h"
 #include "pluginproxy.h"
 
+#include <QTranslator>
+#include <QPushButton>
+#include <QWebHitTestResult>
+#include <QMenu>
+
 TestPlugin::TestPlugin()
     : QObject()
     , m_view(0)
diff --git a/src/plugins/TestPlugin/testplugin.h b/src/plugins/TestPlugin/testplugin.h
index cf56e6ff8..922c60e45 100644
--- a/src/plugins/TestPlugin/testplugin.h
+++ b/src/plugins/TestPlugin/testplugin.h
@@ -1,3 +1,20 @@
+/* ============================================================
+* QupZilla - WebKit based browser
+* Copyright (C) 2010-2012  David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
 #ifndef TESTPLUGIN_H
 #define TESTPLUGIN_H
 
diff --git a/translations/homepage/fr_FR.php b/translations/homepage/fr_FR.php
index c1f1eb724..d5a9aeffb 100644
--- a/translations/homepage/fr_FR.php
+++ b/translations/homepage/fr_FR.php
@@ -1,73 +1,73 @@
-<?php
-// Header + Footer
-$site_title = "QupZilla - Un navigateur web léger et multi-plateforme";
-$qupzilla = "QupZilla";
-$header_description = "Navigateur web";
-
-$menu_home = "Accueil";
-$menu_screenshots = "Screenshots";
-$menu_download = "Télécharger";
-$menu_faq = "FAQ";
-$menu_about = "Contribuer";
-$footer_site = "www.qupzilla.com";
-$translated_by = "Page traduite par Jérôme Giry et Nicolas Ourceau";
-
-//Home Page
-$actual_version = "Version actuelle";
-$actual_version_text = "La version actuelle date du ". $qupzilla_version_date .
-                        " et la version est " . $qupzilla_version . ". Les changements sont décrits dans le changelog. <br/>N'hésitez pas à la <a  href=\"download\">télécharger</a> maintenant !";
-$actual_version_button = "Télécharger";
-$older_versions = "Changelog";
-$older_versions_text  = "Vous avez toujours voulu savoir ce qu'il s'est passé entre deux versions ? <br/>Vous pouvez tout trouver dans le <a>changelog</a> sur GitHub !";
-$older_versions_button = "Changelog";
-$reportbug = "Rapporter un bug";
-$reportbug_text  = "Avez-vous trouvé un bug ou voulez vous simplement proposer une idée pour <a>améliorer</a> QupZilla ?<br/>
-                  Pour le rapporter, faites un rapport de bug sur GitHub.";
-$reportbug_button = "Rapporter";
-$technology = "Technologie";
-$technology_text  = "QupZilla est un navigateur web basé sur le moteur de rendu WebKit et sur le framework Qt. WebKit garantie une navigation <a>rapide</a>
-                    et Qt une disponibilité sur toutes les plateformes majeures.";
-$technology_button = "WebKit &amp; Qt";
-$looknfeel_header = "Style et comportements natifs";
-$looknfeel_text  = "QupZilla utilise nativement les thèmes pour les principaux bureaux Linux. Il utilise aussi les thèmes d'icônes de l'utilisateur. Si vous vous lassez du thème de base ou si vous avez des problèmes avec, vous pouvez toujours en choisir un autre.";
-$library_header = "Des outils unifiés";
-$library_text  = "QupZilla unifie les marque-pages, l'historique et le lecteur de flux RSS en une page bien organisée. Plus de fenètres multiples, QupZilla n'en utilise qu'une seule !<br/>
-Avec l'intégration du lecteur de flux RSS, vous restez informé des mises à jour de vos sites préférés. QupZilla peut aussi importer les marque-pages des autres navigateurs.";
-$adblock_header = "AdBlock";
-$adblock_text  = "Les sites remplis de publicités vous ennuyent ? Ils gaspillent votre bande-passante et votre temps ? La seule chose dont vous avez besoin, grâce à QupZilla, est de mettre à jour votre EasyList, ou éventuellement d'ajouter vos propres règles de blocage, et ainsi naviguer en paix.";
-$speeddial_header = "Speed Dial";
-$speeddial_text  = "Cette extention populaire est finalement disponible pour les utilisateurs de QupZilla ! Vous pouvez maintenant accéder à vos sites favoris aussi vite que vous le souhaitez en ouvrant une seule page dans un nouvel onglet. Inutile de préciser que le glisser-déposer et le chargement des miniatures sont totalement supportés.";
-$devnews_header = "Nouvelles du développement";
-$feed_loading = "Chargement...";
-
-// Download Page
-$other_linux = "Autres distributions linux";
-$source_code = "Code Source";
-$choose_os = "Choisissez votre système d'exploitation";
-$windows_text = "Les versions 32 et 64 bits peuvent être téléchargés en cliquant sur les liens suivants";
-$ubuntu_text = "Les utilisateurs d'Oneiric, Natty et Maverick peuvent installer QupZilla en exécutant ces commandes";
-$for_development_version = "Pour les versions de développement:";
-$packages_text = "Paquets 32 et 64 bits";
-$tarballs_text = "Tarballs 32 et 64 bits précompilés";
-$can_be_downloaded = "Peuvent être téléchargées en cliquant sur les liens suivants";
-$source_text = "Vous pouvez récupérer le code source en clonant le dépôt (si vous avez installé git)";
-$source_text2 = "Vous pouvez aussi le consulter en ligne et le télécharger au format zip";
-$view_source = "Voir le code source sur GitHub.com";
-$download_snapshot = "Télécharger la version actuelle";
-
-// Contribute Page
-$contribute_to = "Contribuer à QupZilla";
-$contribute_text  = "QupZilla est un projet Open Source, donc votre aide est la bienvenue ! Je serais très heureux d'inclure les patches que vous m'enverriez. Mais coder
-                     n'est pas la seule manière d'aider : vous pouvez traduire QupZilla dans votre langue ou juste en parler à vos amis. Souvenez-vous, toutes les participations (mêmes petites) sont hautement appréciées";
-$getting_source = "Obtenir le fichier source";
-$getting_source_text1  = "La façon la plus simple d'obtenir les sources de QupZilla est de les cloner à partir du dépôt sur GitHub. Vous pouvez le faire en utilisant cette commande";
-$getting_source_text2 = "Vous pouvez ensuite commencer à coder. Vous pouvez m'envoyer vos modifications par e-mail ou sur GitHub.";
-$translating = "Traductions dans d'autres langues";
-$translating_text  = "Une autre façon de participer est d'ajouter ou d'améliorer les traductions existantes. Si vous voulez ajouter une nouvelle langue, vous pouvez générer un nouveau fichier de traduction manuellement, ou me contacter et je le ferai pour vous. Vous pouvez m'envoyer votre traduction à nouveau par e-mail ou sur GitHub.";
-$translating_moreinfo = "Plus d'informations sur la traduction <a href='https://github.com/nowrep/QupZilla/wiki/Translating'>ici</a> [wiki sur GitHub]";
-$creators = "Qui développe QupZilla ?";
-$creators_text  = "Le responsable du projet, mainteneur et développeur principal est un étudiant tchèque <b>David Rosca</b> (nowrep).<br/>
-Outre le codage, d'autres contributeurs participent également en réalisant les traductions ou en soutenant QupZilla. La liste complête des contributeurs peut être trouvée <a href='https://github.com/nowrep/QupZilla/blob/master/AUTHORS'>ici</a>  [sur GitHub].<br/><br/>Vous pouvez aussi rejoindre le canal IRC  <b>#qupzilla</b> sur irc.freenode.net pour discuter avec les gens impliqués dans QupZilla.";
-$share_with_friends = "Partagez avec vos amis!";
-$share_with_friends_text = "Vous aimez QupZilla ? Alors partagez-le avec vos amis !!"
-?>
+<?php
+// Header + Footer
+$site_title = "QupZilla - Un navigateur web léger et multi-plateforme";
+$qupzilla = "QupZilla";
+$header_description = "Navigateur web";
+
+$menu_home = "Accueil";
+$menu_screenshots = "Screenshots";
+$menu_download = "Télécharger";
+$menu_faq = "FAQ";
+$menu_about = "Contribuer";
+$footer_site = "www.qupzilla.com";
+$translated_by = "Page traduite par Jérôme Giry et Nicolas Ourceau";
+
+//Home Page
+$actual_version = "Version actuelle";
+$actual_version_text = "La version actuelle date du ". $qupzilla_version_date .
+                        " et la version est " . $qupzilla_version . ". Les changements sont décrits dans le changelog. <br/>N'hésitez pas à la <a  href=\"download\">télécharger</a> maintenant !";
+$actual_version_button = "Télécharger";
+$older_versions = "Changelog";
+$older_versions_text  = "Vous avez toujours voulu savoir ce qu'il s'est passé entre deux versions ? <br/>Vous pouvez tout trouver dans le <a>changelog</a> sur GitHub !";
+$older_versions_button = "Changelog";
+$reportbug = "Rapporter un bug";
+$reportbug_text  = "Avez-vous trouvé un bug ou voulez vous simplement proposer une idée pour <a>améliorer</a> QupZilla ?<br/>
+                  Pour le rapporter, faites un rapport de bug sur GitHub.";
+$reportbug_button = "Rapporter";
+$technology = "Technologie";
+$technology_text  = "QupZilla est un navigateur web basé sur le moteur de rendu WebKit et sur le framework Qt. WebKit garantie une navigation <a>rapide</a>
+                    et Qt une disponibilité sur toutes les plateformes majeures.";
+$technology_button = "WebKit &amp; Qt";
+$looknfeel_header = "Style et comportements natifs";
+$looknfeel_text  = "QupZilla utilise nativement les thèmes pour les principaux bureaux Linux. Il utilise aussi les thèmes d'icônes de l'utilisateur. Si vous vous lassez du thème de base ou si vous avez des problèmes avec, vous pouvez toujours en choisir un autre.";
+$library_header = "Des outils unifiés";
+$library_text  = "QupZilla unifie les marque-pages, l'historique et le lecteur de flux RSS en une page bien organisée. Plus de fenètres multiples, QupZilla n'en utilise qu'une seule !<br/>
+Avec l'intégration du lecteur de flux RSS, vous restez informé des mises à jour de vos sites préférés. QupZilla peut aussi importer les marque-pages des autres navigateurs.";
+$adblock_header = "AdBlock";
+$adblock_text  = "Les sites remplis de publicités vous ennuyent ? Ils gaspillent votre bande-passante et votre temps ? La seule chose dont vous avez besoin, grâce à QupZilla, est de mettre à jour votre EasyList, ou éventuellement d'ajouter vos propres règles de blocage, et ainsi naviguer en paix.";
+$speeddial_header = "Speed Dial";
+$speeddial_text  = "Cette extention populaire est finalement disponible pour les utilisateurs de QupZilla ! Vous pouvez maintenant accéder à vos sites favoris aussi vite que vous le souhaitez en ouvrant une seule page dans un nouvel onglet. Inutile de préciser que le glisser-déposer et le chargement des miniatures sont totalement supportés.";
+$devnews_header = "Nouvelles du développement";
+$feed_loading = "Chargement...";
+
+// Download Page
+$other_linux = "Autres distributions linux";
+$source_code = "Code Source";
+$choose_os = "Choisissez votre système d'exploitation";
+$windows_text = "Les versions 32 et 64 bits peuvent être téléchargés en cliquant sur les liens suivants";
+$ubuntu_text = "Les utilisateurs d'Oneiric, Natty et Maverick peuvent installer QupZilla en exécutant ces commandes";
+$for_development_version = "Pour les versions de développement:";
+$packages_text = "Paquets 32 et 64 bits";
+$tarballs_text = "Tarballs 32 et 64 bits précompilés";
+$can_be_downloaded = "Peuvent être téléchargées en cliquant sur les liens suivants";
+$source_text = "Vous pouvez récupérer le code source en clonant le dépôt (si vous avez installé git)";
+$source_text2 = "Vous pouvez aussi le consulter en ligne et le télécharger au format zip";
+$view_source = "Voir le code source sur GitHub.com";
+$download_snapshot = "Télécharger la version actuelle";
+
+// Contribute Page
+$contribute_to = "Contribuer à QupZilla";
+$contribute_text  = "QupZilla est un projet Open Source, donc votre aide est la bienvenue ! Je serais très heureux d'inclure les patches que vous m'enverriez. Mais coder
+                     n'est pas la seule manière d'aider : vous pouvez traduire QupZilla dans votre langue ou juste en parler à vos amis. Souvenez-vous, toutes les participations (mêmes petites) sont hautement appréciées";
+$getting_source = "Obtenir le fichier source";
+$getting_source_text1  = "La façon la plus simple d'obtenir les sources de QupZilla est de les cloner à partir du dépôt sur GitHub. Vous pouvez le faire en utilisant cette commande";
+$getting_source_text2 = "Vous pouvez ensuite commencer à coder. Vous pouvez m'envoyer vos modifications par e-mail ou sur GitHub.";
+$translating = "Traductions dans d'autres langues";
+$translating_text  = "Une autre façon de participer est d'ajouter ou d'améliorer les traductions existantes. Si vous voulez ajouter une nouvelle langue, vous pouvez générer un nouveau fichier de traduction manuellement, ou me contacter et je le ferai pour vous. Vous pouvez m'envoyer votre traduction à nouveau par e-mail ou sur GitHub.";
+$translating_moreinfo = "Plus d'informations sur la traduction <a href='https://github.com/nowrep/QupZilla/wiki/Translating'>ici</a> [wiki sur GitHub]";
+$creators = "Qui développe QupZilla ?";
+$creators_text  = "Le responsable du projet, mainteneur et développeur principal est un étudiant tchèque <b>David Rosca</b> (nowrep).<br/>
+Outre le codage, d'autres contributeurs participent également en réalisant les traductions ou en soutenant QupZilla. La liste complête des contributeurs peut être trouvée <a href='https://github.com/nowrep/QupZilla/blob/master/AUTHORS'>ici</a>  [sur GitHub].<br/><br/>Vous pouvez aussi rejoindre le canal IRC  <b>#qupzilla</b> sur irc.freenode.net pour discuter avec les gens impliqués dans QupZilla.";
+$share_with_friends = "Partagez avec vos amis!";
+$share_with_friends_text = "Vous aimez QupZilla ? Alors partagez-le avec vos amis !!"
+?>