diff --git a/src/declarativeimports/calendar/qml/MonthMenu.qml b/src/declarativeimports/calendar/qml/MonthMenu.qml
index 83acece80..317462c5b 100644
--- a/src/declarativeimports/calendar/qml/MonthMenu.qml
+++ b/src/declarativeimports/calendar/qml/MonthMenu.qml
@@ -17,10 +17,10 @@
  */
 
 import QtQuick 2.0
-import org.kde.plasma.core 2.0 as PlasmaCore
+// import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
-import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+// import org.kde.plasma.extras 2.0 as PlasmaExtras
+// import org.kde.qtextracomponents 2.0 as QtExtras
 
 PlasmaComponents.Menu {
     id: testMenu
diff --git a/src/declarativeimports/calendar/qml/MonthView.qml b/src/declarativeimports/calendar/qml/MonthView.qml
index 5f40d648f..533253fe6 100644
--- a/src/declarativeimports/calendar/qml/MonthView.qml
+++ b/src/declarativeimports/calendar/qml/MonthView.qml
@@ -31,6 +31,7 @@ Item {
 
     property real borderOpacity: 0.2
 
+    property alias calendar: monthCalendar
 
     property alias selectedMonth: monthCalendar.monthName
     property alias selectedYear: monthCalendar.year
diff --git a/src/declarativeimports/calendar/qml/qmldir b/src/declarativeimports/calendar/qml/qmldir
index 32af7ba7f..b86a88c1f 100644
--- a/src/declarativeimports/calendar/qml/qmldir
+++ b/src/declarativeimports/calendar/qml/qmldir
@@ -2,3 +2,4 @@ module org.kde.plasma.calendar
 plugin calendarplugin
 
 MonthView 2.0 MonthView.qml
+MonthMenu 2.0 MonthMenu.qml
diff --git a/src/declarativeimports/calendar/qmldir b/src/declarativeimports/calendar/qmldir
deleted file mode 100644
index 547961ac3..000000000
--- a/src/declarativeimports/calendar/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module org.kde.plasma.calendar
-plugin calendarplugin