diff --git a/src/Charts/DiaryWindow.cpp b/deprecated/DiaryWindow.cpp
similarity index 100%
rename from src/Charts/DiaryWindow.cpp
rename to deprecated/DiaryWindow.cpp
diff --git a/src/Charts/DiaryWindow.h b/deprecated/DiaryWindow.h
similarity index 100%
rename from src/Charts/DiaryWindow.h
rename to deprecated/DiaryWindow.h
diff --git a/src/Charts/ChartBar.cpp b/src/Charts/ChartBar.cpp
index e8d373ff0..9a42e77c7 100644
--- a/src/Charts/ChartBar.cpp
+++ b/src/Charts/ChartBar.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "ChartBar.h"
-#include "DiaryWindow.h"
 #include "DiarySidebar.h"
 #include "Context.h"
 
diff --git a/src/Charts/GcOverlayWidget.cpp b/src/Charts/GcOverlayWidget.cpp
index 8655d3560..95b7bfe70 100644
--- a/src/Charts/GcOverlayWidget.cpp
+++ b/src/Charts/GcOverlayWidget.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "GcOverlayWidget.h"
-#include "DiaryWindow.h"
 #include "DiarySidebar.h"
 #include "Context.h"
 #include "Colors.h"
diff --git a/src/Gui/GcSideBarItem.cpp b/src/Gui/GcSideBarItem.cpp
index c5b5ac5d5..18484db00 100644
--- a/src/Gui/GcSideBarItem.cpp
+++ b/src/Gui/GcSideBarItem.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "GcSideBarItem.h"
-#include "DiaryWindow.h"
 #include "DiarySidebar.h"
 
 // fixed width stuff, easier to set globally
diff --git a/src/Gui/GcWindowRegistry.cpp b/src/Gui/GcWindowRegistry.cpp
index a5c566d90..49dba1eb2 100644
--- a/src/Gui/GcWindowRegistry.cpp
+++ b/src/Gui/GcWindowRegistry.cpp
@@ -24,9 +24,6 @@
 #include "AerolabWindow.h"
 #include "AllPlotWindow.h"
 #include "CriticalPowerWindow.h"
-#ifdef GC_HAVE_ICAL
-#include "DiaryWindow.h"
-#endif
 #include "HistogramWindow.h"
 #include "LTMWindow.h"
 #include "VideoWindow.h"
@@ -99,7 +96,7 @@ GcWindowRegistry::initialize()
     //{ VIEW_ANALYSIS, tr("Bing Map"),GcWindowTypes::BingMap },
     { VIEW_ANALYSIS, tr("Scatter"),GcWindowTypes::Scatter },
     { VIEW_ANALYSIS, tr("Aerolab"),GcWindowTypes::Aerolab },
-    { VIEW_TRENDS|VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary },
+    //{ VIEW_TRENDS|VIEW_DIARY, tr("Calendar"),GcWindowTypes::Diary },
     { VIEW_TRENDS|VIEW_DIARY, tr("Navigator"), GcWindowTypes::ActivityNavigator },
     //{ VIEW_DIARY|VIEW_TRENDS, tr("Summary "), GcWindowTypes::DateRangeSummary }, // DEPRECATED IN V3.6
     { VIEW_TRAIN, tr("Telemetry"),GcWindowTypes::DialWindow },
@@ -160,11 +157,6 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context)
     case GcWindowTypes::AllPlot: returning = new AllPlotWindow(context); break;
     case GcWindowTypes::CriticalPower: returning = new CriticalPowerWindow(context, false); break;
     case GcWindowTypes::CriticalPowerSummary: returning = new CriticalPowerWindow(context, true); break;
-#ifdef GC_HAVE_ICAL
-    case GcWindowTypes::Diary: returning = new DiaryWindow(context); break;
-#else
-    case GcWindowTypes::Diary: returning = new GcChartWindow(context); break;
-#endif
     case GcWindowTypes::Histogram: returning = new HistogramWindow(context); break;
 #ifdef GC_WANT_R
     case GcWindowTypes::RConsole: returning = new RChart(context, true); break;
@@ -256,6 +248,7 @@ GcWindowRegistry::newGcWindow(GcWinID id, Context *context)
     case GcWindowTypes::SeasonPlan: returning = new PlanningWindow(context); break;
     case GcWindowTypes::UserAnalysis: returning = new UserChartWindow(context, false); break;
     case GcWindowTypes::UserTrends: returning = new UserChartWindow(context, true); break;
+    case GcWindowTypes::Diary:
     case GcWindowTypes::Calendar: returning = new PlanningCalendarWindow(context); break;
     default: return NULL; break;
     }
diff --git a/src/Gui/RideNavigator.h b/src/Gui/RideNavigator.h
index 4c4de72f3..4455a7d4c 100644
--- a/src/Gui/RideNavigator.h
+++ b/src/Gui/RideNavigator.h
@@ -38,7 +38,6 @@ class NavigatorCellDelegate;
 class GroupByModel;
 class SearchFilter;
 class SearchFilterBox;
-class DiaryWindow;
 class DiarySidebar;
 class QSortFilterProxyModel;
 class RideNavigatorSortProxyModel;
@@ -73,7 +72,6 @@ class RideNavigator : public GcChartWindow
 
     friend class ::NavigatorCellDelegate;
     friend class ::GroupByModel;
-    friend class ::DiaryWindow;
     friend class ::DiarySidebar;
     friend class ::GcMiniCalendar;
     friend class ::DataFilter;
diff --git a/src/src.pro b/src/src.pro
index f6ac6354e..90cca5f16 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -345,8 +345,8 @@ contains(DEFINES, "GC_WANT_R") {
     LIBS        += $${ICAL_LIBS}
 
     # add caldav and diary functions
-    HEADERS     += Core/ICalendar.h Charts/DiaryWindow.h Cloud/CalDAV.h Cloud/CalDAVCloud.h
-    SOURCES     += Core/ICalendar.cpp Charts/DiaryWindow.cpp Cloud/CalDAV.cpp Cloud/CalDAVCloud.cpp
+    HEADERS     += Core/ICalendar.h Cloud/CalDAV.h Cloud/CalDAVCloud.h
+    SOURCES     += Core/ICalendar.cpp Cloud/CalDAV.cpp Cloud/CalDAVCloud.cpp
 }