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)