diff --git a/client.cpp b/client.cpp
--- a/client.cpp
+++ b/client.cpp
@@ -32,9 +32,6 @@
 #include "focuschain.h"
 #include "group.h"
 #include "shadow.h"
-#ifdef KWIN_BUILD_TABBOX
-#include "tabbox.h"
-#endif
 #include "workspace.h"
 #include "screenedge.h"
 #include "decorations/decorationbridge.h"
@@ -221,12 +218,6 @@
 {
     assert(!deleting);
     deleting = true;
-#ifdef KWIN_BUILD_TABBOX
-    TabBox::TabBox *tabBox = TabBox::TabBox::self();
-    if (tabBox && tabBox->isDisplayed() && tabBox->currentClient() == this) {
-        tabBox->nextPrev(true);
-    }
-#endif
     destroyWindowManagementInterface();
     Deleted* del = NULL;
     if (!on_shutdown) {
@@ -297,12 +288,6 @@
 {
     assert(!deleting);
     deleting = true;
-#ifdef KWIN_BUILD_TABBOX
-    TabBox::TabBox *tabBox = TabBox::TabBox::self();
-    if (tabBox && tabBox->isDisplayed() && tabBox->currentClient() == this) {
-        tabBox->nextPrev(true);
-    }
-#endif
     destroyWindowManagementInterface();
     Deleted* del = Deleted::create(this);
     if (isMoveResize())
diff --git a/shell_client.cpp b/shell_client.cpp
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -25,9 +25,6 @@
 #include "placement.h"
 #include "screenedge.h"
 #include "screens.h"
-#ifdef KWIN_BUILD_TABBOX
-#include "tabbox.h"
-#endif
 #include "virtualdesktops.h"
 #include "wayland_server.h"
 #include "workspace.h"
@@ -416,12 +413,6 @@
 void ShellClient::destroyClient()
 {
     m_closing = true;
-#ifdef KWIN_BUILD_TABBOX
-    TabBox::TabBox *tabBox = TabBox::TabBox::self();
-    if (tabBox && tabBox->isDisplayed() && tabBox->currentClient() == this) {
-        tabBox->nextPrev(true);
-    }
-#endif
     if (isMoveResize()) {
         leaveMoveResize();
     }