diff --git a/src/mapserver/qgsmslayercache.h b/src/mapserver/qgsmslayercache.h
@@ -73,8 +73,6 @@ class QgsMSLayerCache: public QObject
     void freeEntryRessources( QgsMSLayerCacheEntry& entry );
 
   private:
-    static QgsMSLayerCache* mInstance;
-
     /**Cash entries with pair url/layer name as a key. The layer name is necessary for cases where the same
       url is used several time in a request. It ensures that different layer instances are created for different
       layer names*/

diff --git a/src/plugins/spit/qgspgutil.cpp b/src/plugins/spit/qgspgutil.cpp
@@ -14,14 +14,10 @@
  ***************************************************************************/
 #include "qgspgutil.h"
 
-QgsPgUtil *QgsPgUtil::mInstance = 0;
-QgsPgUtil * QgsPgUtil::instance()
+QgsPgUtil *QgsPgUtil::instance()
 {
-  if ( mInstance == 0 )
-  {
-    mInstance = new QgsPgUtil();
-  }
-  return mInstance;
+  static QgsPgUtil mInstance;
+  return &mInstance;
 }
 
 QgsPgUtil::QgsPgUtil()
@@ -36,6 +32,7 @@ void QgsPgUtil::setConnection( PGconn *con )
 {
   mPgConnection = con;
 }
+
 PGconn *QgsPgUtil::connection()
 {
   return mPgConnection;

diff --git a/src/plugins/spit/qgspgutil.h b/src/plugins/spit/qgspgutil.h
@@ -60,8 +60,6 @@ class QgsPgUtil
   private:
     //! Initialize the list of reserved words
     void initReservedWords();
-    //! Instance member
-    static QgsPgUtil* mInstance;
     //! Reserved word list
     QStringList mReservedWords;
     //! PostgreSQL connection