diff --git a/escher/include/escher/selectable_table_view.h b/escher/include/escher/selectable_table_view.h
index cecd44a74..462041a37 100644
--- a/escher/include/escher/selectable_table_view.h
+++ b/escher/include/escher/selectable_table_view.h
@@ -2,7 +2,6 @@
 #define ESCHER_SELECTABLE_TABLE_VIEW_H
 
 #include <escher/table_view.h>
-#include <escher/app.h>
 #include <escher/selectable_table_view_data_source.h>
 #include <escher/selectable_table_view_delegate.h>
 #include <escher/table_view_data_source.h>
diff --git a/escher/src/nested_menu_controller.cpp b/escher/src/nested_menu_controller.cpp
index e19708512..01e1dc9af 100644
--- a/escher/src/nested_menu_controller.cpp
+++ b/escher/src/nested_menu_controller.cpp
@@ -1,4 +1,5 @@
 #include <escher/nested_menu_controller.h>
+#include <escher/app.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 226701a6d..d525889b3 100644
--- a/escher/src/selectable_table_view.cpp
+++ b/escher/src/selectable_table_view.cpp
@@ -1,4 +1,5 @@
 #include <escher/selectable_table_view.h>
+#include <escher/app.h>
 #include <escher/clipboard.h>
 #include <escher/metric.h>
 #include <assert.h>