diff --git a/libs/surfaceflinger/BufferAllocator.cpp b/libs/surfaceflinger/BufferAllocator.cpp
index 28fe810..fec7c87 100644
--- a/libs/surfaceflinger/BufferAllocator.cpp
+++ b/libs/surfaceflinger/BufferAllocator.cpp
@@ -34,8 +34,7 @@
 namespace android {
 // ---------------------------------------------------------------------------
 
-template<class BufferAllocator> Mutex Singleton<BufferAllocator>::sLock; 
-template<> BufferAllocator* Singleton<BufferAllocator>::sInstance(0); 
+ANDROID_SINGLETON_STATIC_INSTANCE( BufferAllocator )
 
 Mutex BufferAllocator::sLock;
 KeyedVector<buffer_handle_t, BufferAllocator::alloc_rec_t> BufferAllocator::sAllocList;
diff --git a/libs/ui/BufferMapper.cpp b/libs/ui/BufferMapper.cpp
index e6ca239..85a029b 100644
--- a/libs/ui/BufferMapper.cpp
+++ b/libs/ui/BufferMapper.cpp
@@ -44,8 +44,7 @@
 namespace android {
 // ---------------------------------------------------------------------------
 
-template<class BufferMapper> Mutex Singleton<BufferMapper>::sLock; 
-template<> BufferMapper* Singleton<BufferMapper>::sInstance(0); 
+ANDROID_SINGLETON_STATIC_INSTANCE( BufferMapper )
 
 BufferMapper::BufferMapper()
     : mAllocMod(0)
diff --git a/libs/ui/Surface.cpp b/libs/ui/Surface.cpp
index 47880f5..fb105b3 100644
--- a/libs/ui/Surface.cpp
+++ b/libs/ui/Surface.cpp
@@ -50,8 +50,7 @@
 //  SurfaceBuffer
 // ============================================================================
 
-template<class SurfaceBuffer> Mutex Singleton<SurfaceBuffer>::sLock; 
-template<> SurfaceBuffer* Singleton<SurfaceBuffer>::sInstance(0); 
+ANDROID_SINGLETON_STATIC_INSTANCE( SurfaceBuffer )
 
 SurfaceBuffer::SurfaceBuffer() 
     : BASE(), handle(0), mOwner(false)