diff --git a/src/Gui/QtMacButton.h b/deprecated/QtMacButton.h
similarity index 100%
rename from src/Gui/QtMacButton.h
rename to deprecated/QtMacButton.h
diff --git a/src/Gui/QtMacButton.mm b/deprecated/QtMacButton.mm
similarity index 100%
rename from src/Gui/QtMacButton.mm
rename to deprecated/QtMacButton.mm
diff --git a/src/Gui/QtMacSegmentedButton.h b/deprecated/QtMacSegmentedButton.h
similarity index 100%
rename from src/Gui/QtMacSegmentedButton.h
rename to deprecated/QtMacSegmentedButton.h
diff --git a/src/Gui/QtMacSegmentedButton.mm b/deprecated/QtMacSegmentedButton.mm
similarity index 100%
rename from src/Gui/QtMacSegmentedButton.mm
rename to deprecated/QtMacSegmentedButton.mm
diff --git a/src/Charts/ChartBar.cpp b/src/Charts/ChartBar.cpp
index 46eba950f..a828779d1 100644
--- a/src/Charts/ChartBar.cpp
+++ b/src/Charts/ChartBar.cpp
@@ -21,7 +21,6 @@
 #include "DiaryWindow.h"
 #include "DiarySidebar.h"
 #include "Context.h"
-#include "QtMacButton.h"
 
 #include <QFontMetrics>
 
diff --git a/src/Charts/GcOverlayWidget.cpp b/src/Charts/GcOverlayWidget.cpp
index ac39b1f96..e37930be9 100644
--- a/src/Charts/GcOverlayWidget.cpp
+++ b/src/Charts/GcOverlayWidget.cpp
@@ -25,7 +25,6 @@
 #include "DiaryWindow.h"
 #include "DiarySidebar.h"
 #include "Context.h"
-#include "QtMacButton.h"
 
 GcOverlayWidget::GcOverlayWidget(Context *context, QWidget *parent) : QWidget(parent), context(context)
 {
diff --git a/src/Charts/GcOverlayWidget.h b/src/Charts/GcOverlayWidget.h
index 582230ccd..215c602d0 100644
--- a/src/Charts/GcOverlayWidget.h
+++ b/src/Charts/GcOverlayWidget.h
@@ -35,11 +35,6 @@
 
 
 class Context;
-#ifdef Q_OS_MAC
-class QtMacButton;
-#else
-class GcScopeButton;
-#endif
 class GcLabel;
 
 class GcOverlayWidgetItem
diff --git a/src/Charts/HomeWindow.h b/src/Charts/HomeWindow.h
index b68c36e0a..8f07e786e 100644
--- a/src/Charts/HomeWindow.h
+++ b/src/Charts/HomeWindow.h
@@ -38,10 +38,6 @@
 #include "Context.h"
 #include "RideItem.h"
 
-#ifdef Q_OS_MAC
-#include "QtMacSegmentedButton.h"
-#endif
-
 class ChartBar;
 class LTMSettings;
 
diff --git a/src/Gui/GcScopeBar.cpp b/src/Gui/GcScopeBar.cpp
index 1fcddfc0e..a4001683a 100644
--- a/src/Gui/GcScopeBar.cpp
+++ b/src/Gui/GcScopeBar.cpp
@@ -20,7 +20,6 @@
 #include "DiaryWindow.h"
 #include "DiarySidebar.h"
 #include "Context.h"
-#include "QtMacButton.h"
 #include "HelpWhatsThis.h"
 
 GcScopeBar::GcScopeBar(Context *context) : QWidget(context->mainWindow), context(context)