diff --git a/src/servers/app/FontCacheEntry.cpp b/src/servers/app/FontCacheEntry.cpp
index d24fe2b3e5..49a4485343 100644
--- a/src/servers/app/FontCacheEntry.cpp
+++ b/src/servers/app/FontCacheEntry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -30,19 +30,17 @@
 
 #include <new>
 
-#include <agg_array.h>
-
-#include <util/OpenHashTable.h>
-
 #include <Autolock.h>
 
-#include "utf8_functions.h"
+#include <agg_array.h>
+#include <utf8_functions.h>
+#include <util/OpenHashTable.h>
 
 #include "GlobalSubpixelSettings.h"
 
 
-BLocker
-FontCacheEntry::sUsageUpdateLock("FontCacheEntry usage lock");
+BLocker FontCacheEntry::sUsageUpdateLock("FontCacheEntry usage lock");
+
 
 class FontCacheEntry::GlyphCachePool {
 public:
@@ -131,7 +129,6 @@ private:
 FontCacheEntry::FontCacheEntry()
 	:
 	MultiLocker("FontCacheEntry lock"),
-	Referenceable(),
 	fGlyphCache(new(std::nothrow) GlyphCachePool()),
 	fEngine(),
 	fLastUsedTime(LONGLONG_MIN),
diff --git a/src/servers/app/FontCacheEntry.h b/src/servers/app/FontCacheEntry.h
index 73f4c26ecf..d16269e033 100644
--- a/src/servers/app/FontCacheEntry.h
+++ b/src/servers/app/FontCacheEntry.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -77,7 +77,7 @@ struct GlyphCache {
 
 class FontCache;
 
-class FontCacheEntry : public MultiLocker, public Referenceable {
+class FontCacheEntry : public MultiLocker, public BReferenceable {
  public:
 	typedef FontEngine::PathAdapter					GlyphPathAdapter;
 	typedef FontEngine::Gray8Adapter				GlyphGray8Adapter;
diff --git a/src/servers/app/ServerBitmap.h b/src/servers/app/ServerBitmap.h
index d1a5de7118..5da3088ac9 100644
--- a/src/servers/app/ServerBitmap.h
+++ b/src/servers/app/ServerBitmap.h
@@ -31,7 +31,7 @@ class ServerApp;
 	managed by the BitmapManager class. It is also the base class for
 	all cursors. Every BBitmap has a shadow ServerBitmap object.
 */
-class ServerBitmap : public Referenceable {
+class ServerBitmap : public BReferenceable {
 public:
 	inline	bool			IsValid() const
 								{ return fBuffer != NULL; }
diff --git a/src/servers/app/ServerPicture.h b/src/servers/app/ServerPicture.h
index ca2ec12723..1b26a70d85 100644
--- a/src/servers/app/ServerPicture.h
+++ b/src/servers/app/ServerPicture.h
@@ -28,7 +28,7 @@ namespace BPrivate {
 class BList;
 
 
-class ServerPicture : public Referenceable, public PictureDataWriter {
+class ServerPicture : public BReferenceable, public PictureDataWriter {
 public:
 								ServerPicture();
 								ServerPicture(const ServerPicture& other);