diff --git a/src/AddIntervalDialog.cpp b/src/AddIntervalDialog.cpp
index f19f3eba8..490c2c938 100644
--- a/src/AddIntervalDialog.cpp
+++ b/src/AddIntervalDialog.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "AddIntervalDialog.h"
-#include "MainWindow.h"
 #include "Athlete.h"
 #include "Context.h"
 #include "IntervalItem.h"
diff --git a/src/BasicRideMetrics.cpp b/src/BasicRideMetrics.cpp
index b000e66a3..e0d7a1bdd 100644
--- a/src/BasicRideMetrics.cpp
+++ b/src/BasicRideMetrics.cpp
@@ -207,10 +207,10 @@ class ElevationGain : public RideMetric {
     void compute(const RideFile *ride, const Zones *, int,
                  const HrZones *, int,
                  const QHash<QString,RideMetric*> &,
-                 const Context *context) {
+                 const Context *) {
 
         // hysteresis can be configured, we default to 3.0
-        double hysteresis = appsettings->value((QObject*)context->mainWindow, GC_ELEVATION_HYSTERESIS).toDouble();
+        double hysteresis = appsettings->value(NULL, GC_ELEVATION_HYSTERESIS).toDouble();
         if (hysteresis <= 0.1) hysteresis = 3.00;
 
         bool first = true;
diff --git a/src/BestIntervalDialog.cpp b/src/BestIntervalDialog.cpp
index d08b5a503..ddd8d3681 100644
--- a/src/BestIntervalDialog.cpp
+++ b/src/BestIntervalDialog.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "BestIntervalDialog.h"
-#include "MainWindow.h"
 #include "Athlete.h"
 #include "Context.h"
 #include "IntervalItem.h"
diff --git a/src/BingMap.h b/src/BingMap.h
index 292e20733..07b0065e4 100644
--- a/src/BingMap.h
+++ b/src/BingMap.h
@@ -27,7 +27,6 @@
 #include <sstream>
 #include <string>
 #include "RideFile.h"
-#include "MainWindow.h"
 #include "Context.h"
 
 class QMouseEvent;
diff --git a/src/DownloadRideDialog.cpp b/src/DownloadRideDialog.cpp
index c1e461357..2149a641c 100644
--- a/src/DownloadRideDialog.cpp
+++ b/src/DownloadRideDialog.cpp
@@ -20,7 +20,6 @@
 
 #include "DownloadRideDialog.h"
 #include "Device.h"
-#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
 #include "Settings.h"
diff --git a/src/ErgFilePlot.cpp b/src/ErgFilePlot.cpp
index 4c992c887..e346ecf94 100644
--- a/src/ErgFilePlot.cpp
+++ b/src/ErgFilePlot.cpp
@@ -18,7 +18,6 @@
 
 
 #include "ErgFilePlot.h"
-#include "MainWindow.h"
 #include "Context.h"
 
 // Bridge between QwtPlot and ErgFile to avoid having to
diff --git a/src/GcCalendarModel.h b/src/GcCalendarModel.h
index a8d6514dc..ad7bd2527 100644
--- a/src/GcCalendarModel.h
+++ b/src/GcCalendarModel.h
@@ -39,9 +39,9 @@
 #include <QtGui>
 #include <QDebug>
 #include "qxtscheduleview.h"
-#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
+#include "MainWindow.h"
 #include "RideItem.h"
 #include "RideMetadata.h"
 #ifdef GC_HAVE_ICAL
diff --git a/src/IntervalSummaryWindow.cpp b/src/IntervalSummaryWindow.cpp
index 482759516..3f7be1861 100644
--- a/src/IntervalSummaryWindow.cpp
+++ b/src/IntervalSummaryWindow.cpp
@@ -16,9 +16,10 @@
  * Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
+#include "RideFile.h"
+#include "RideMetric.h"
 #include "IntervalItem.h"
 #include "IntervalSummaryWindow.h"
 #include "Settings.h"
diff --git a/src/Lucene.cpp b/src/Lucene.cpp
index fb3531c3e..f37ab67ad 100644
--- a/src/Lucene.cpp
+++ b/src/Lucene.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "Lucene.h"
-#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
 
diff --git a/src/MainWindow.h b/src/MainWindow.h
index 80b6211a7..0efdce471 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -32,11 +32,8 @@
 #endif
 
 class HomeWindow;
-class IntervalSummaryWindow;
-class RideNavigator;
 class GcToolBar;
 class DiarySidebar;
-class GcMultiCalendar;
 class LTMSidebar;
 class AnalysisSidebar;
 class LionFullScreen;
@@ -51,12 +48,8 @@ class BlankStateAnalysisPage;
 class BlankStateHomePage;
 class BlankStateDiaryPage;
 class BlankStateTrainPage;
-class GcSplitter;
-class GcSplitterItem;
 class QtSegmentControl;
 class SaveSingleDialogWidget;
-class SplitActivityWizard;
-class IntervalItem;
 
 class MainWindow;
 class Athlete;
@@ -73,7 +66,6 @@ class MainWindow : public QMainWindow
     // transitional
     friend class ::Context;
     friend class ::SaveSingleDialogWidget;
-    friend class ::SplitActivityWizard;
 
     public:
 
diff --git a/src/ManualRideDialog.cpp b/src/ManualRideDialog.cpp
index b70732ffa..b7c5be629 100644
--- a/src/ManualRideDialog.cpp
+++ b/src/ManualRideDialog.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "ManualRideDialog.h"
-#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
 #include "Settings.h"
diff --git a/src/ModelWindow.cpp b/src/ModelWindow.cpp
index 6f5227d7d..6eb769a74 100644
--- a/src/ModelWindow.cpp
+++ b/src/ModelWindow.cpp
@@ -18,7 +18,6 @@
 
 #include "ModelWindow.h"
 #include "ModelPlot.h"
-#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
 #include "RideItem.h"
diff --git a/src/PfPvPlot.cpp b/src/PfPvPlot.cpp
index 60b3b067b..2f07a4303 100644
--- a/src/PfPvPlot.cpp
+++ b/src/PfPvPlot.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "PfPvPlot.h"
-#include "MainWindow.h"
 #include "Athlete.h"
 #include "Context.h"
 #include "RideFile.h"
diff --git a/src/PfPvWindow.cpp b/src/PfPvWindow.cpp
index d50c6648f..0f183ef55 100644
--- a/src/PfPvWindow.cpp
+++ b/src/PfPvWindow.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "PfPvWindow.h"
-#include "MainWindow.h"
 #include "Context.h"
 #include "Athlete.h"
 #include "PfPvPlot.h"
diff --git a/src/RealtimePlotWindow.cpp b/src/RealtimePlotWindow.cpp
index bb6d315ac..04cf7dfe6 100644
--- a/src/RealtimePlotWindow.cpp
+++ b/src/RealtimePlotWindow.cpp
@@ -18,7 +18,6 @@
 
 
 #include "RealtimePlotWindow.h"
-#include "MainWindow.h"
 #include "Athlete.h"
 
 RealtimePlotWindow::RealtimePlotWindow(Context *context) :
diff --git a/src/ScatterPlot.cpp b/src/ScatterPlot.cpp
index aa154eb40..845a68664 100644
--- a/src/ScatterPlot.cpp
+++ b/src/ScatterPlot.cpp
@@ -18,7 +18,6 @@
 
 #include "ScatterPlot.h"
 #include "ScatterWindow.h"
-#include "MainWindow.h"
 #include "IntervalItem.h"
 #include "Context.h"
 #include "Context.h"
diff --git a/src/ScatterWindow.cpp b/src/ScatterWindow.cpp
index c2aaa7a26..2637c55c8 100644
--- a/src/ScatterWindow.cpp
+++ b/src/ScatterWindow.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "ScatterWindow.h"
-#include "MainWindow.h"
 #include "ScatterPlot.h"
 #include "Athlete.h"
 #include "Context.h"
diff --git a/src/TtbDialog.cpp b/src/TtbDialog.cpp
index 74ac5fe91..2bee20c44 100644
--- a/src/TtbDialog.cpp
+++ b/src/TtbDialog.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "TtbDialog.h"
-#include "MainWindow.h"
 #include "Athlete.h"
 #include "Settings.h"
 #include "TimeUtils.h"