diff --git a/escher/include/escher.h b/escher/include/escher.h
index f1b8736fb..d0926e8cb 100644
--- a/escher/include/escher.h
+++ b/escher/include/escher.h
@@ -3,7 +3,6 @@
 
 #include <escher/alternate_empty_view_controller.h>
 #include <escher/alternate_empty_view_delegate.h>
-#include <escher/app.h>
 #include <escher/bank_view_controller.h>
 #include <escher/buffer_text_view.h>
 #include <escher/button.h>
diff --git a/escher/include/escher/app.h b/escher/include/escher/app.h
index c4ad4d5ad..18e7e76a9 100644
--- a/escher/include/escher/app.h
+++ b/escher/include/escher/app.h
@@ -72,8 +72,5 @@ private:
   WarningController m_warningController;
 };
 
-// Make sure App * app() is reachable by anyone including only app.h
-#include <escher/container.h>
-
 #endif
 
diff --git a/escher/src/alternate_empty_view_controller.cpp b/escher/src/alternate_empty_view_controller.cpp
index 43159799e..75314077e 100644
--- a/escher/src/alternate_empty_view_controller.cpp
+++ b/escher/src/alternate_empty_view_controller.cpp
@@ -1,5 +1,5 @@
 #include <escher/alternate_empty_view_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <assert.h>
 
 /* ContentView */
diff --git a/escher/src/bank_view_controller.cpp b/escher/src/bank_view_controller.cpp
index 315088247..71f26468b 100644
--- a/escher/src/bank_view_controller.cpp
+++ b/escher/src/bank_view_controller.cpp
@@ -1,5 +1,5 @@
 #include <escher/bank_view_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 
 BankViewController::BankViewController(Responder * parentViewController) :
   ViewController(parentViewController),
diff --git a/escher/src/button_row_controller.cpp b/escher/src/button_row_controller.cpp
index a010d054d..6139c08a2 100644
--- a/escher/src/button_row_controller.cpp
+++ b/escher/src/button_row_controller.cpp
@@ -1,5 +1,5 @@
 #include <escher/button_row_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <escher/palette.h>
 #include <cmath>
 
diff --git a/escher/src/editable_text_cell.cpp b/escher/src/editable_text_cell.cpp
index f6388bfb0..b03d6bed7 100644
--- a/escher/src/editable_text_cell.cpp
+++ b/escher/src/editable_text_cell.cpp
@@ -1,5 +1,5 @@
 #include <escher/editable_text_cell.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <escher/palette.h>
 #include <assert.h>
 
diff --git a/escher/src/even_odd_editable_text_cell.cpp b/escher/src/even_odd_editable_text_cell.cpp
index 2eb3bbc63..00473c504 100644
--- a/escher/src/even_odd_editable_text_cell.cpp
+++ b/escher/src/even_odd_editable_text_cell.cpp
@@ -1,5 +1,5 @@
 #include <escher/even_odd_editable_text_cell.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <assert.h>
 
 EvenOddEditableTextCell::EvenOddEditableTextCell(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, TextFieldDelegate * delegate, char * draftTextBuffer, const KDFont * font, float horizontalAlignment, float verticalAlignment, KDCoordinate topMargin, KDCoordinate rightMargin, KDCoordinate bottomMargin, KDCoordinate leftMargin) :
diff --git a/escher/src/input_event_handler.cpp b/escher/src/input_event_handler.cpp
index c99fc6524..8d197fb39 100644
--- a/escher/src/input_event_handler.cpp
+++ b/escher/src/input_event_handler.cpp
@@ -1,6 +1,6 @@
 #include <escher/input_event_handler.h>
 #include <escher/input_event_handler_delegate.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <escher/toolbox.h>
 #include <escher/metric.h>
 
diff --git a/escher/src/input_view_controller.cpp b/escher/src/input_view_controller.cpp
index c9e4fac94..8aeccdf25 100644
--- a/escher/src/input_view_controller.cpp
+++ b/escher/src/input_view_controller.cpp
@@ -1,5 +1,5 @@
 #include <escher/input_view_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <escher/palette.h>
 #include <assert.h>
 
diff --git a/escher/src/message_table_cell_with_editable_text.cpp b/escher/src/message_table_cell_with_editable_text.cpp
index a9d2909fb..401ab0084 100644
--- a/escher/src/message_table_cell_with_editable_text.cpp
+++ b/escher/src/message_table_cell_with_editable_text.cpp
@@ -1,6 +1,6 @@
 #include <escher/message_table_cell_with_editable_text.h>
 #include <escher/palette.h>
-#include <escher/app.h>
+#include <escher/container.h>
 
 MessageTableCellWithEditableText::MessageTableCellWithEditableText(Responder * parentResponder, InputEventHandlerDelegate * inputEventHandlerDelegate, TextFieldDelegate * textFieldDelegate, char * draftTextBuffer, I18n::Message message) :
   Responder(parentResponder),
diff --git a/escher/src/modal_view_controller.cpp b/escher/src/modal_view_controller.cpp
index 316a85c26..5b35e1ab3 100644
--- a/escher/src/modal_view_controller.cpp
+++ b/escher/src/modal_view_controller.cpp
@@ -1,5 +1,5 @@
 #include <escher/modal_view_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <assert.h>
 
 ModalViewController::ContentView::ContentView() :
diff --git a/escher/src/nested_menu_controller.cpp b/escher/src/nested_menu_controller.cpp
index 01e1dc9af..afac10050 100644
--- a/escher/src/nested_menu_controller.cpp
+++ b/escher/src/nested_menu_controller.cpp
@@ -1,5 +1,5 @@
 #include <escher/nested_menu_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <escher/metric.h>
 #include <assert.h>
 #include <string.h>
diff --git a/escher/src/selectable_table_view.cpp b/escher/src/selectable_table_view.cpp
index d525889b3..d5c6005b8 100644
--- a/escher/src/selectable_table_view.cpp
+++ b/escher/src/selectable_table_view.cpp
@@ -1,5 +1,5 @@
 #include <escher/selectable_table_view.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <escher/clipboard.h>
 #include <escher/metric.h>
 #include <assert.h>
diff --git a/escher/src/stack_view_controller.cpp b/escher/src/stack_view_controller.cpp
index 795a5ee3a..0facbf629 100644
--- a/escher/src/stack_view_controller.cpp
+++ b/escher/src/stack_view_controller.cpp
@@ -2,7 +2,7 @@ extern "C" {
 #include <assert.h>
 }
 #include <escher/stack_view_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 #include <escher/metric.h>
 
 StackViewController::ControllerView::ControllerView() :
diff --git a/escher/src/tab_view_controller.cpp b/escher/src/tab_view_controller.cpp
index 098663bc7..7c09780d2 100644
--- a/escher/src/tab_view_controller.cpp
+++ b/escher/src/tab_view_controller.cpp
@@ -3,7 +3,7 @@ extern "C" {
 }
 #include <escher/tab_view_controller.h>
 #include <escher/metric.h>
-#include <escher/app.h>
+#include <escher/container.h>
 
 TabViewController::ContentView::ContentView() :
   View(),
diff --git a/escher/src/warning_controller.cpp b/escher/src/warning_controller.cpp
index bbb5cf098..1030d922d 100644
--- a/escher/src/warning_controller.cpp
+++ b/escher/src/warning_controller.cpp
@@ -1,5 +1,5 @@
 #include <escher/warning_controller.h>
-#include <escher/app.h>
+#include <escher/container.h>
 
 static inline KDCoordinate maxCoordinate(KDCoordinate x, KDCoordinate y) { return x > y ? x : y; }