diff --git a/limereport/lrreportdesignwidget.h b/limereport/lrreportdesignwidget.h
index 9a5a68a..ff441a1 100644
--- a/limereport/lrreportdesignwidget.h
+++ b/limereport/lrreportdesignwidget.h
@@ -102,7 +102,7 @@ private:
     Ruler* m_verticalRuller;
 };
 
-class ReportDesignWidget : public QWidget
+class LIMEREPORT_EXPORT ReportDesignWidget : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY(QObject* datasourcesManager READ dataManager)
diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp
index ccf7a93..881184e 100644
--- a/limereport/lrreportdesignwindow.cpp
+++ b/limereport/lrreportdesignwindow.cpp
@@ -107,7 +107,7 @@ ReportDesignWindow::ReportDesignWindow(ReportEnginePrivateInterface* report, QWi
 {
     initReportEditor(report);
     createActions();
-    createMainMenu();
+//    createMainMenu();
     createToolBars();
     createObjectInspector();
     createDataWindow();
@@ -350,10 +350,10 @@ void ReportDesignWindow::createToolBars()
     m_mainToolBar->setFloatable(false);
     m_mainToolBar->setObjectName("mainTools");
 
-    m_mainToolBar->addAction(m_newReportAction);
-    m_mainToolBar->addAction(m_loadReportAction);
-    m_mainToolBar->addAction(m_saveReportAction);
-    m_mainToolBar->addSeparator();
+//    m_mainToolBar->addAction(m_newReportAction);
+//    m_mainToolBar->addAction(m_loadReportAction);
+//    m_mainToolBar->addAction(m_saveReportAction);
+//    m_mainToolBar->addSeparator();
     m_mainToolBar->addAction(m_settingsAction);
     m_mainToolBar->addSeparator();
 
@@ -517,7 +517,7 @@ void ReportDesignWindow::createMainMenu()
     m_fileMenu->addAction(m_saveReportAction);
     m_fileMenu->addAction(m_saveReportAsAction);
     m_fileMenu->addAction(m_previewReportAction);
-    //m_fileMenu->addAction(m_printReportAction);
+    m_fileMenu->addAction(m_printReportAction);
     m_editMenu = menuBar()->addMenu(tr("Edit"));
     m_editMenu->addAction(m_redoAction);
     m_editMenu->addAction(m_undoAction);
diff --git a/limereport/lrreportdesignwindow.h b/limereport/lrreportdesignwindow.h
index b1aef76..365c722 100644
--- a/limereport/lrreportdesignwindow.h
+++ b/limereport/lrreportdesignwindow.h
@@ -42,7 +42,7 @@
 #include "items/editors/lrtextalignmenteditorwidget.h"
 #include "items/editors/lritemsaligneditorwidget.h"
 #include "items/editors/lritemsborderseditorwidget.h"
-#include "lrobjectitemmodel.h"
+#include "objectinspector/lrobjectitemmodel.h"
 #include "lrreportdesignwindowintrerface.h"
 
 namespace LimeReport{
@@ -243,7 +243,7 @@ private:
     QAction* m_unlockSelectedItemsAction;
     QAction* m_selectOneLevelItems;
 
-    QMenu*   m_recentFilesMenu;
+    QMenu*   m_recentFilesMenu =nullptr;
 
     QSignalMapper* m_bandsAddSignalsMap;
     QSignalMapper* m_recentFilesSignalMap;
diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h
index b2ef220..ab4a371 100644
--- a/limereport/lrreportengine_p.h
+++ b/limereport/lrreportengine_p.h
@@ -130,7 +130,7 @@ private:
     bool m_firstPage;
 };
 
-class ReportEnginePrivate : public QObject,
+class LIMEREPORT_EXPORT ReportEnginePrivate : public QObject,
         public ICollectionContainer,
         public ITranslationContainer,
         public IExternalPainter,
diff --git a/limereport/lrscriptenginemanager.h b/limereport/lrscriptenginemanager.h
index d027a1a..8a4d0e3 100644
--- a/limereport/lrscriptenginemanager.h
+++ b/limereport/lrscriptenginemanager.h
@@ -54,8 +54,8 @@
 #include "lrcollection.h"
 #include "lrdatasourceintf.h"
 #include "lrdatasourcemanagerintf.h"
-#include "lrhorizontallayout.h"
-#include "lrverticallayout.h"
+#include "items/lrhorizontallayout.h"
+#include "items/lrverticallayout.h"
 
 namespace LimeReport{
 
diff --git a/limereport/objectinspector/lrobjectpropitem.h b/limereport/objectinspector/lrobjectpropitem.h
index d557cd7..2c622c9 100644
--- a/limereport/objectinspector/lrobjectpropitem.h
+++ b/limereport/objectinspector/lrobjectpropitem.h
@@ -37,8 +37,8 @@
 #include <QAbstractItemModel>
 #include <QDebug>
 
-#include "lrattribsabstractfactory.h"
-#include "lrsingleton.h"
+#include "base/lrattribsabstractfactory.h"
+#include "base/lrsingleton.h"
 
 namespace LimeReport{