diff --git a/escher/Makefile b/escher/Makefile
index f3e655784..ee4f501d2 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -56,7 +56,6 @@ escher_src += $(addprefix escher/src/,\
   scroll_view_indicator.cpp \
   scrollable_view.cpp \
   selectable_table_view.cpp \
-  selectable_table_view_data_source.cpp \
   selectable_table_view_delegate.cpp \
   simple_list_view_data_source.cpp \
   simple_table_view_data_source.cpp \
diff --git a/escher/include/escher/selectable_table_view_data_source.h b/escher/include/escher/selectable_table_view_data_source.h
index 979b6357f..f89cd1127 100644
--- a/escher/include/escher/selectable_table_view_data_source.h
+++ b/escher/include/escher/selectable_table_view_data_source.h
@@ -3,16 +3,21 @@
 
 #include <escher/scroll_view_data_source.h>
 
-class SelectableTableView;
-
 class SelectableTableViewDataSource : public ScrollViewDataSource {
 public:
-  SelectableTableViewDataSource();
-  int selectedRow();
-  int selectedColumn();
-  void selectRow(int j);
-  void selectColumn(int i);
-  void selectCellAtLocation(int i, int j);
+  SelectableTableViewDataSource() :
+    m_selectedCellX(0),
+    m_selectedCellY(-1)
+  {
+  }
+  int selectedRow() { return m_selectedCellY; }
+  int selectedColumn() { return m_selectedCellX; }
+  void selectRow(int j) { m_selectedCellY = j; }
+  void selectColumn(int i) { m_selectedCellX = i; }
+  void selectCellAtLocation(int i, int j) {
+    m_selectedCellX = i;
+    m_selectedCellY = j;
+  }
 private:
   int m_selectedCellX;
   int m_selectedCellY;
diff --git a/escher/src/selectable_table_view_data_source.cpp b/escher/src/selectable_table_view_data_source.cpp
deleted file mode 100644
index 26ddc95d8..000000000
--- a/escher/src/selectable_table_view_data_source.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <escher/selectable_table_view_data_source.h>
-
-SelectableTableViewDataSource::SelectableTableViewDataSource() :
-  m_selectedCellX(0),
-  m_selectedCellY(-1)
-{
-}
-
-int SelectableTableViewDataSource::selectedRow() {
-  return m_selectedCellY;
-}
-
-int SelectableTableViewDataSource::selectedColumn() {
-  return m_selectedCellX;
-}
-
-void SelectableTableViewDataSource::selectRow(int j) {
-  m_selectedCellY = j;
-}
-
-void SelectableTableViewDataSource::selectColumn(int i) {
-  m_selectedCellX = i;
-}
-
-void SelectableTableViewDataSource::selectCellAtLocation(int i, int j) {
-  m_selectedCellX = i;
-  m_selectedCellY = j;
-}