3 files changed, 5 insertions, 19 deletions
diff --git a/src/gui/models/listmodel.h b/src/gui/models/listmodel.h
index dfce6d4d5..3f7b964c6 100644
--- a/src/gui/models/listmodel.h
+++ b/src/gui/models/listmodel.h
@@ -75,7 +75,7 @@
   * like ListBox, make a derived class from this class that 
   * represents your list.
   */
-class ListModel
+class ListModel notfinal
 {
     public:
         /**
diff --git a/src/gui/models/tablemodel.cpp b/src/gui/models/tablemodel.cpp
index aad66a6ad..d9498bbd7 100644
--- a/src/gui/models/tablemodel.cpp
+++ b/src/gui/models/tablemodel.cpp
@@ -26,6 +26,8 @@
 
 #include "gui/widgets/widget.h"
 
+#include "listeners/tablemodellistener.h"
+
 #include "debug.h"
 
 void TableModel::installListener(TableModelListener *const listener)
diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h
index 032facadd..1f3f86af7 100644
--- a/src/gui/models/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -30,28 +30,12 @@
 
 class Widget;
 
-class TableModelListener
-{
-public:
-    /**
-     * Must be invoked by the TableModel whenever a global change is about to
-     * occur or has occurred (e.g., when a row or column is being removed or
-     * added).
-     *
-     * This method is triggered twice, once before and once after the update.
-     *
-     * \param completed whether we are signalling the end of the update
-     */
-    virtual void modelUpdated(const bool completed) = 0;
-
-    virtual ~TableModelListener()
-    { }
-};
+class TableModelListener;
 
 /**
  * A model for a regular table of widgets.
  */
-class TableModel
+class TableModel notfinal
 {
 public:
     virtual ~TableModel()