diff --git a/screenedge.h b/screenedge.h
index a4b3e62089..4e3520d867 100644
--- a/screenedge.h
+++ b/screenedge.h
@@ -41,6 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 namespace KWin {
 
+class Client;
 class ScreenEdges;
 
 class Edge : public QObject
diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index 6a1b4b22c4..da5a45602e 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // own
 #include "tabboxhandler.h"
+#include <config-kwin.h>
 #include <kwinglobals.h>
 #include "xcbutils.h"
 // tabbox
diff --git a/xcbutils.cpp b/xcbutils.cpp
index a536f67f7f..c83065a652 100644
--- a/xcbutils.cpp
+++ b/xcbutils.cpp
@@ -19,7 +19,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "xcbutils.h"
-#include "utils.h"
 // Qt
 #include <QDebug>
 // xcb
diff --git a/xcbutils.h b/xcbutils.h
index 39ca05b383..a77e2d89d7 100644
--- a/xcbutils.h
+++ b/xcbutils.h
@@ -21,10 +21,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KWIN_XCB_UTILS_H
 
 #include <kwinglobals.h>
-#include "utils.h"
 
 #include <QRect>
 #include <QRegion>
+#include <QScopedPointer>
 #include <QVector>
 
 #include <xcb/xcb.h>
@@ -35,6 +35,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 namespace KWin {
 
+template <typename T> using ScopedCPointer = QScopedPointer<T, QScopedPointerPodDeleter>;
+
 namespace Xcb {
 
 typedef xcb_window_t WindowId;