diff --git a/src/servers/app/server/RootLayer.cpp b/src/servers/app/server/RootLayer.cpp
index fd9978c192..e2269fb5c5 100644
--- a/src/servers/app/server/RootLayer.cpp
+++ b/src/servers/app/server/RootLayer.cpp
@@ -33,6 +33,7 @@
 #include "PatternHandler.h" // for pattern_union
 #include "ServerConfig.h"
 #include "TokenHandler.h"
+#include <TokenSpace.h>
 #include <stdio.h>
 
 //! TokenHandler object used to provide IDs for RootLayers(WorkSpaces)
diff --git a/src/servers/app/server/WinBorder.cpp b/src/servers/app/server/WinBorder.cpp
index 718b3f7a36..5cd101ec57 100644
--- a/src/servers/app/server/WinBorder.cpp
+++ b/src/servers/app/server/WinBorder.cpp
@@ -29,6 +29,7 @@
 #include <Locker.h>
 #include <Region.h>
 #include <Debug.h>
+#include <TokenSpace.h>
 #include "View.h"	// for mouse button defines
 #include "ServerWindow.h"
 #include "Decorator.h"