diff --git a/src/apps/switcher/GroupListView.h b/src/apps/switcher/GroupListView.h
index 4c49a0204b..831b55e07f 100644
--- a/src/apps/switcher/GroupListView.h
+++ b/src/apps/switcher/GroupListView.h
@@ -21,16 +21,6 @@ public:
 };
 
 
-template<typename ItemType, typename GroupType>
-class TypedGroupListModel : public GroupListModel {
-public:
-	virtual ItemType*			ItemAt(int32 index) = 0;
-
-	virtual GroupType*			GroupAt(int32 index) = 0;
-	virtual GroupType*			GroupForItemAt(int32 index) = 0;
-};
-
-
 class ListItemRenderer {
 public:
 	virtual void				SetTo(BView* owner, void* item) = 0;
diff --git a/src/apps/switcher/Jamfile b/src/apps/switcher/Jamfile
index c6c96f39cc..504f6d83ce 100644
--- a/src/apps/switcher/Jamfile
+++ b/src/apps/switcher/Jamfile
@@ -11,6 +11,7 @@ Application Switcher :
 	Switcher.cpp
 	WindowsView.cpp
 
-	: be translation $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS) libshared.a
+	: be translation $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
+		$(HAIKU_LOCALE_LIBS) libshared.a
 	: Switcher.rdef
 ;
diff --git a/src/apps/switcher/WindowsView.cpp b/src/apps/switcher/WindowsView.cpp
index 8fa0dfdba9..2ecc499ca4 100644
--- a/src/apps/switcher/WindowsView.cpp
+++ b/src/apps/switcher/WindowsView.cpp
@@ -24,7 +24,7 @@
 static const uint32 kMsgActivateWindow = 'AcWn';
 
 
-class WindowModel : public TypedGroupListModel<client_window_info, void> {
+class WindowModel : public GroupListModel {
 public:
 	WindowModel(team_id team)
 		:
@@ -86,7 +86,7 @@ public:
 		return fWindows.CountItems();
 	}
 
-	virtual client_window_info* ItemAt(int32 index)
+	virtual void* ItemAt(int32 index)
 	{
 		return fWindows.ItemAt(index);
 	}
@@ -103,7 +103,7 @@ public:
 
 	virtual void* GroupForItemAt(int32 index)
 	{
-		client_window_info* info = ItemAt(index);
+		client_window_info* info = fWindows.ItemAt(index);
 		return (void*)(_NthSetBit(0, info->workspaces) + 1);
 	}