3 files changed, 11 insertions, 13 deletions
diff --git a/plugins/AdvaImg/src/Metadata/FreeImageTag.h b/plugins/AdvaImg/src/Metadata/FreeImageTag.h
index beb8bc84b2..23073e4d8d 100644
--- a/plugins/AdvaImg/src/Metadata/FreeImageTag.h
+++ b/plugins/AdvaImg/src/Metadata/FreeImageTag.h
@@ -382,13 +382,6 @@ private:
 	TABLEMAP _table_map;
 
 private:
-	/**
-	Constructor (private)<br>
-	This is where the tag info tables are initialized.
-	@see addMetadataModel
-	*/
-	TagLib();
-
 	/// Assignement operator (disabled)
 	void operator=(TagLib&);
 
@@ -404,6 +397,12 @@ private:
 	BOOL addMetadataModel(MDMODEL md_model, TagInfo *tag_table);
 
 public:
+	/**
+	Constructor (private)<br>
+	This is where the tag info tables are initialized.
+	@see addMetadataModel
+	*/
+	TagLib();
 	/// Destructor
 	~TagLib();
 
diff --git a/plugins/AdvaImg/src/Metadata/TagLib.cpp b/plugins/AdvaImg/src/Metadata/TagLib.cpp
index 580ad6faac..fb6da996c0 100644
--- a/plugins/AdvaImg/src/Metadata/TagLib.cpp
+++ b/plugins/AdvaImg/src/Metadata/TagLib.cpp
@@ -1509,10 +1509,10 @@ TagLib::~TagLib() {
 }
 
 
-TagLib& 
-TagLib::instance() {
-	static TagLib s;
-	return s;
+static TagLib g_hInstance;
+
+TagLib& TagLib::instance() {
+	return g_hInstance;
 }
 
 const TagInfo* 
@@ -1615,4 +1615,3 @@ TagLib::getFreeImageModel(MDMODEL model) {
 
 	return FIMD_NODATA;
 }
-
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp
index b52472d5d6..c08b7f4bb6 100644
--- a/plugins/SmileyAdd/src/smileys.cpp
+++ b/plugins/SmileyAdd/src/smileys.cpp
@@ -1052,6 +1052,7 @@ void SmileyCategoryListType::AddAllProtocolsAsCategory(void)
 	}
 }
 
+static const CMStringW testString(L"Test String");
 
 SmileyLookup::SmileyLookup(const CMStringW &str, const bool regexs, const int ind, const CMStringW &smpt)
 {
@@ -1059,7 +1060,6 @@ SmileyLookup::SmileyLookup(const CMStringW &str, const bool regexs, const int in
 
 	m_ind = ind;
 	if (regexs) {
-		static const CMStringW testString(L"Test String");
 		m_pattern = _TPattern::compile(str);
 		m_valid = m_pattern != NULL;
 		if (m_valid) {