diff --git a/src/servers/app/EventStream.cpp b/src/servers/app/EventStream.cpp
index e5ab9cc69a..8a7c0c99cc 100644
--- a/src/servers/app/EventStream.cpp
+++ b/src/servers/app/EventStream.cpp
@@ -114,7 +114,12 @@ InputServerStream::GetNextCursorPosition(BPoint &where)
 		return false;
 	}
 
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	uint32 pos = atomic_get((int32*)&fCursorBuffer->pos);
+#else
+	uint32 pos = fCursorBuffer->pos;
+#endif
+
 	where.x = pos & 0xffff;
 	where.y = pos >> 16L;
 
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 6c4ffacbd6..d20b7406ff 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -82,6 +82,8 @@ Server haiku_app_server :
 	PNGDump.cpp
 	RAMLinkMsgReader.cpp
 	MessageLooper.cpp
+	EventDispatcher.cpp
+	EventStream.cpp
 
 	# Manager Classes
 	BitmapManager.cpp