diff --git a/src/servers/app/MessageLooper.cpp b/src/servers/app/MessageLooper.cpp
index 6bcc540756..507092da50 100644
--- a/src/servers/app/MessageLooper.cpp
+++ b/src/servers/app/MessageLooper.cpp
@@ -9,13 +9,15 @@
 
 #include "MessageLooper.h"
 
-#include <Autolock.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <Autolock.h>
+
 
 MessageLooper::MessageLooper(const char* name)
-	: BLocker(name),
+	:
+	BLocker(name),
 	fThread(-1),
 	fQuitting(false),
 	fDeathSemaphore(-1)
diff --git a/src/servers/app/Workspace.cpp b/src/servers/app/Workspace.cpp
index 887ee6cfb4..b2aa0ff25b 100644
--- a/src/servers/app/Workspace.cpp
+++ b/src/servers/app/Workspace.cpp
@@ -7,15 +7,18 @@
  */
 
 
-#include "Desktop.h"
 #include "Workspace.h"
-#include "WorkspacePrivate.h"
-#include "Window.h"
 
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <Debug.h>
+
+#include "Desktop.h"
+#include "WorkspacePrivate.h"
+#include "Window.h"
+
 
 static rgb_color kDefaultColor = (rgb_color){ 51, 102, 152, 255 };
 
@@ -82,6 +85,7 @@ Workspace::Workspace(Desktop& desktop, int32 index)
 	fDesktop(desktop),
 	fCurrentWorkspace(index == desktop.CurrentWorkspace())
 {
+	ASSERT(desktop.IsLocked());
 	RewindWindows();
 }