diff --git a/YACReader/main_window_viewer.h b/YACReader/main_window_viewer.h
index f9282a45..03ebcd76 100644
--- a/YACReader/main_window_viewer.h
+++ b/YACReader/main_window_viewer.h
@@ -8,12 +8,13 @@
 #include <QCloseEvent>
 #include <QSettings>
 
+#include "yacreader_global.h"
+
 #ifdef Y_MAC_UI
 #include "yacreader_macosx_toolbar.h"
 #endif
 
 #include "comic_db.h"
-#include "yacreader_global.h"
 
 class Comic;
 class Viewer;
diff --git a/YACReaderLibrary/classic_comics_view.cpp b/YACReaderLibrary/classic_comics_view.cpp
index 95271b1b..772149f7 100644
--- a/YACReaderLibrary/classic_comics_view.cpp
+++ b/YACReaderLibrary/classic_comics_view.cpp
@@ -1,5 +1,7 @@
 #include "classic_comics_view.h"
 
+#include "yacreader_global.h"
+
 #include "QStackedWidget"
 
 #include "comic_flow_widget.h"
diff --git a/YACReaderLibrary/comics_view_transition.cpp b/YACReaderLibrary/comics_view_transition.cpp
index 83ec804f..bde188b3 100644
--- a/YACReaderLibrary/comics_view_transition.cpp
+++ b/YACReaderLibrary/comics_view_transition.cpp
@@ -8,7 +8,7 @@
 #include <QSizePolicy>
 #include <QPainter>
 
-#include "yacreader_global_gui.h"
+#include "yacreader_global.h"
 
 ComicsViewTransition::ComicsViewTransition(QWidget *parent)
     : QWidget(parent)
diff --git a/YACReaderLibrary/db/folder_model.cpp b/YACReaderLibrary/db/folder_model.cpp
index 6836e48a..b61009ec 100644
--- a/YACReaderLibrary/db/folder_model.cpp
+++ b/YACReaderLibrary/db/folder_model.cpp
@@ -5,6 +5,8 @@
 #include "folder.h"
 #include "db_helper.h"
 #include "qnaturalsorting.h"
+
+#include "yacreader_global.h"
 #include "yacreader_global_gui.h"
 
 #include <QtGui>
diff --git a/YACReaderLibrary/empty_container_info.cpp b/YACReaderLibrary/empty_container_info.cpp
index 56baf984..5fb1d514 100644
--- a/YACReaderLibrary/empty_container_info.cpp
+++ b/YACReaderLibrary/empty_container_info.cpp
@@ -1,5 +1,7 @@
 #include "empty_container_info.h"
 
+#include "yacreader_global.h"
+
 EmptyContainerInfo::EmptyContainerInfo(QWidget *parent)
     : QWidget(parent), iconLabel(new QLabel()), titleLabel(new QLabel())
 {
diff --git a/YACReaderLibrary/empty_folder_widget.cpp b/YACReaderLibrary/empty_folder_widget.cpp
index eb964a27..a2bb1d13 100644
--- a/YACReaderLibrary/empty_folder_widget.cpp
+++ b/YACReaderLibrary/empty_folder_widget.cpp
@@ -1,5 +1,7 @@
 #include "empty_folder_widget.h"
 
+#include "yacreader_global.h"
+
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QListView>
diff --git a/YACReaderLibrary/folder_content_view.cpp b/YACReaderLibrary/folder_content_view.cpp
index e06d3117..d546b91b 100644
--- a/YACReaderLibrary/folder_content_view.cpp
+++ b/YACReaderLibrary/folder_content_view.cpp
@@ -2,6 +2,7 @@
 
 #include "folder_model.h"
 #include "grid_comics_view.h"
+#include "yacreader_global.h"
 #include "yacreader_global_gui.h"
 #include "yacreader_tool_bar_stretch.h"
 
diff --git a/YACReaderLibrary/info_comics_view.cpp b/YACReaderLibrary/info_comics_view.cpp
index 7e75cf12..e9dec4f1 100644
--- a/YACReaderLibrary/info_comics_view.cpp
+++ b/YACReaderLibrary/info_comics_view.cpp
@@ -1,5 +1,7 @@
 #include "info_comics_view.h"
 
+#include "yacreader_global.h"
+
 #include <QtQuick>
 #include <QQuickWidget>
 
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 0e54dbc6..81e28285 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -1,5 +1,6 @@
 #include "library_window.h"
-#include "folder_item.h"
+
+#include "yacreader_global.h"
 
 #include <QHBoxLayout>
 #include <QSplitter>
@@ -20,8 +21,8 @@
 #include <thread>
 #include <future>
 
+#include "folder_item.h"
 #include "data_base_management.h"
-#include "yacreader_global.h"
 #include "no_libraries_widget.h"
 #include "import_widget.h"
 
diff --git a/YACReaderLibrary/library_window.h b/YACReaderLibrary/library_window.h
index 7d1f5165..8cba4ffc 100644
--- a/YACReaderLibrary/library_window.h
+++ b/YACReaderLibrary/library_window.h
@@ -6,6 +6,7 @@
 #include <QModelIndex>
 #include <QFileInfo>
 
+#include "yacreader_global.h"
 #include "yacreader_global_gui.h"
 #include "yacreader_libraries.h"
 
diff --git a/YACReaderLibrary/no_search_results_widget.cpp b/YACReaderLibrary/no_search_results_widget.cpp
index e5596455..bda1096c 100644
--- a/YACReaderLibrary/no_search_results_widget.cpp
+++ b/YACReaderLibrary/no_search_results_widget.cpp
@@ -1,5 +1,7 @@
 #include "no_search_results_widget.h"
 
+#include "yacreader_global.h"
+
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QPainter>
diff --git a/YACReaderLibrary/yacreader_content_views_manager.cpp b/YACReaderLibrary/yacreader_content_views_manager.cpp
index e9cd4156..7e1df5a1 100644
--- a/YACReaderLibrary/yacreader_content_views_manager.cpp
+++ b/YACReaderLibrary/yacreader_content_views_manager.cpp
@@ -1,5 +1,7 @@
 #include "yacreader_content_views_manager.h"
 
+#include "yacreader_global.h"
+
 #include "library_window.h"
 
 #include "classic_comics_view.h"
diff --git a/YACReaderLibrary/yacreader_folders_view.cpp b/YACReaderLibrary/yacreader_folders_view.cpp
index bfb7d49f..c042a6e6 100644
--- a/YACReaderLibrary/yacreader_folders_view.cpp
+++ b/YACReaderLibrary/yacreader_folders_view.cpp
@@ -1,5 +1,7 @@
 #include "yacreader_folders_view.h"
 
+#include "yacreader_global.h"
+
 #include "folder_item.h"
 #include "folder_model.h"
 
diff --git a/custom_widgets/yacreader_library_item_widget.cpp b/custom_widgets/yacreader_library_item_widget.cpp
index 4dff3a16..f7cbec8e 100644
--- a/custom_widgets/yacreader_library_item_widget.cpp
+++ b/custom_widgets/yacreader_library_item_widget.cpp
@@ -1,5 +1,6 @@
 #include "yacreader_library_item_widget.h"
 
+#include "yacreader_global.h"
 #include "yacreader_global_gui.h"
 
 #include <QHBoxLayout>
diff --git a/custom_widgets/yacreader_search_line_edit.cpp b/custom_widgets/yacreader_search_line_edit.cpp
index 18908eb0..e1e105b8 100644
--- a/custom_widgets/yacreader_search_line_edit.cpp
+++ b/custom_widgets/yacreader_search_line_edit.cpp
@@ -1,4 +1,6 @@
 #include "yacreader_search_line_edit.h"
+
+#include "yacreader_global.h"
 #include "yacreader_global_gui.h"
 
 #include <QToolButton>
diff --git a/custom_widgets/yacreader_sidebar.cpp b/custom_widgets/yacreader_sidebar.cpp
index 3652e2a4..13f72dc5 100644
--- a/custom_widgets/yacreader_sidebar.cpp
+++ b/custom_widgets/yacreader_sidebar.cpp
@@ -8,6 +8,8 @@
 #include "yacreader_library_list_widget.h"
 #include "yacreader_search_line_edit.h"
 #include "yacreader_titled_toolbar.h"
+
+#include "yacreader_global.h"
 #include "yacreader_global_gui.h"
 
 YACReaderSideBar::YACReaderSideBar(QWidget *parent)
diff --git a/custom_widgets/yacreader_table_view.cpp b/custom_widgets/yacreader_table_view.cpp
index 816dc922..b4eca069 100644
--- a/custom_widgets/yacreader_table_view.cpp
+++ b/custom_widgets/yacreader_table_view.cpp
@@ -1,5 +1,8 @@
 #include "yacreader_table_view.h"
 
+#include "yacreader_global.h"
+#include "yacreader_global_gui.h"
+
 #include <QHeaderView>
 #include <QResizeEvent>
 #include <QPropertyAnimation>
@@ -13,7 +16,6 @@
 #include "QsLog.h"
 
 #include "comic_item.h"
-#include "yacreader_global_gui.h"
 
 YACReaderTableView::YACReaderTableView(QWidget *parent)
     : QTableView(parent), showDelete(false), editing(false), myeditor(0)
diff --git a/custom_widgets/yacreader_titled_toolbar.cpp b/custom_widgets/yacreader_titled_toolbar.cpp
index 383ab16e..79bb43c4 100644
--- a/custom_widgets/yacreader_titled_toolbar.cpp
+++ b/custom_widgets/yacreader_titled_toolbar.cpp
@@ -1,5 +1,7 @@
 #include "yacreader_titled_toolbar.h"
 
+#include "yacreader_global.h"
+
 #include <QAction>
 #include <QHBoxLayout>
 #include <QLabel>
diff --git a/custom_widgets/yacreader_treeview.cpp b/custom_widgets/yacreader_treeview.cpp
index 582788bc..2a9799f2 100644
--- a/custom_widgets/yacreader_treeview.cpp
+++ b/custom_widgets/yacreader_treeview.cpp
@@ -1,5 +1,7 @@
 #include "yacreader_treeview.h"
 
+#include "yacreader_global.h"
+
 YACReaderTreeView::YACReaderTreeView(QWidget *parent)
     : QTreeView(parent), clicking(false)
 {
diff --git a/shortcuts_management/edit_shortcuts_dialog.cpp b/shortcuts_management/edit_shortcuts_dialog.cpp
index 611c2c7f..33ffb3c6 100644
--- a/shortcuts_management/edit_shortcuts_dialog.cpp
+++ b/shortcuts_management/edit_shortcuts_dialog.cpp
@@ -1,5 +1,7 @@
 #include "edit_shortcuts_dialog.h"
 
+#include "yacreader_global.h"
+
 #include "actions_groups_model.h"
 #include "actions_shortcuts_model.h"
 #include "edit_shortcut_item_delegate.h"