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)