diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro
index 738deea..cb7d53d 100644
--- a/libbitdht/src/libbitdht.pro
+++ b/libbitdht/src/libbitdht.pro
@@ -77,9 +77,9 @@ win32 {
 
 		# Switch off optimization for release version
 		QMAKE_CXXFLAGS_RELEASE -= -O2
-		QMAKE_CXXFLAGS_RELEASE += -O0
+		QMAKE_CXXFLAGS_RELEASE += 
 		QMAKE_CFLAGS_RELEASE -= -O2
-		QMAKE_CFLAGS_RELEASE += -O0
+		QMAKE_CFLAGS_RELEASE += 
 
 		# Switch on optimization for debug version
 		#QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index db7066c..f613a21 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -269,9 +269,9 @@ win32 {
 
 	# Switch off optimization for release version
 	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CXXFLAGS_RELEASE += 
 	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE += 
 
 	# Switch on optimization for debug version
 	#QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro
index 8fa292c..116463a 100644
--- a/libretroshare/src/tests/gxs/data_service/nxs_tests.pro
+++ b/libretroshare/src/tests/gxs/data_service/nxs_tests.pro
@@ -101,9 +101,9 @@ win32 {
 
         # Switch off optimization for release version
         QMAKE_CXXFLAGS_RELEASE -= -O2
-        QMAKE_CXXFLAGS_RELEASE += -O0
+        QMAKE_CXXFLAGS_RELEASE += 
         QMAKE_CFLAGS_RELEASE -= -O2
-        QMAKE_CFLAGS_RELEASE += -O0
+        QMAKE_CFLAGS_RELEASE += 
 
         # Switch on optimization for debug version
         #QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro
index d95c4bc..aad0609 100644
--- a/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro
+++ b/libretroshare/src/tests/gxs/gen_exchange/genexchange_test.pro
@@ -86,9 +86,9 @@ win32 {
 
         # Switch off optimization for release version
         QMAKE_CXXFLAGS_RELEASE -= -O2
-        QMAKE_CXXFLAGS_RELEASE += -O0
+        QMAKE_CXXFLAGS_RELEASE += 
         QMAKE_CFLAGS_RELEASE -= -O2
-        QMAKE_CFLAGS_RELEASE += -O0
+        QMAKE_CFLAGS_RELEASE += 
 
         # Switch on optimization for debug version
         #QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro
index 8fa292c..116463a 100644
--- a/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro
+++ b/libretroshare/src/tests/gxs/nxs_test/nxs_tests.pro
@@ -101,9 +101,9 @@ win32 {
 
         # Switch off optimization for release version
         QMAKE_CXXFLAGS_RELEASE -= -O2
-        QMAKE_CXXFLAGS_RELEASE += -O0
+        QMAKE_CXXFLAGS_RELEASE += 
         QMAKE_CFLAGS_RELEASE -= -O2
-        QMAKE_CFLAGS_RELEASE += -O0
+        QMAKE_CFLAGS_RELEASE += 
 
         # Switch on optimization for debug version
         #QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro
index d158cdc..09c4c84 100644
--- a/openpgpsdk/src/openpgpsdk.pro
+++ b/openpgpsdk/src/openpgpsdk.pro
@@ -23,9 +23,9 @@ win32 {
 
 	# Switch off optimization for release version
 	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CXXFLAGS_RELEASE += 
 	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE += 
 
 	# Switch on optimization for debug version
 	#QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri
index cbfec1b..6e4a712 100644
--- a/plugins/Common/retroshare_plugin.pri
+++ b/plugins/Common/retroshare_plugin.pri
@@ -50,9 +50,9 @@ win32 {
 
 	# Switch off optimization for release version
 	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CXXFLAGS_RELEASE += 
 	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE += 
 
 	# Switch on optimization for debug version
 	#QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index ea2bc97..885ae96 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -55,9 +55,9 @@ MOC_DIR = temp/moc
 debug {
 	QMAKE_CFLAGS += -g
 	QMAKE_CXXFLAGS -= -O2
-	QMAKE_CXXFLAGS += -O0
+	QMAKE_CXXFLAGS += 
 	QMAKE_CFLAGS -= -O2
-	QMAKE_CFLAGS += -O0
+	QMAKE_CFLAGS += 
 }
 
 DEPENDPATH *= retroshare-gui
@@ -180,9 +180,9 @@ win32 {
 
 	# Switch off optimization for release version
 	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CXXFLAGS_RELEASE += 
 	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE += 
 
 	# Switch on optimization for debug version
 	#QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index 358cb65..5d9ddbe 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -10,11 +10,11 @@ CONFIG += link_prl
 #CONFIG += debug
 debug {
         QMAKE_CFLAGS -= -O2
-        QMAKE_CFLAGS += -O0
+        QMAKE_CFLAGS += 
         QMAKE_CFLAGS += -g
 
         QMAKE_CXXFLAGS -= -O2
-        QMAKE_CXXFLAGS += -O0
+        QMAKE_CXXFLAGS += 
         QMAKE_CXXFLAGS += -g
 }
 
diff --git a/supportlibs/pegmarkdown/pegmarkdown.pro b/supportlibs/pegmarkdown/pegmarkdown.pro
index cc21cca..727236c 100644
--- a/supportlibs/pegmarkdown/pegmarkdown.pro
+++ b/supportlibs/pegmarkdown/pegmarkdown.pro
@@ -40,7 +40,7 @@ win32 {
 
 		# Switch off optimization for release version
 		QMAKE_CFLAGS_RELEASE -= -O2
-		QMAKE_CFLAGS_RELEASE += -O0
+		QMAKE_CFLAGS_RELEASE += 
 
 		CONFIG += dummy_glib 
 
diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro
index 94c942f..51e9c3f 100644
--- a/tests/librssimulator/librssimulator.pro
+++ b/tests/librssimulator/librssimulator.pro
@@ -160,9 +160,9 @@ win32 {
 
 	# Switch off optimization for release version
 	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CXXFLAGS_RELEASE += 
 	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE += 
 
 	# Switch on optimization for debug version
 	#QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro
index d95c4bc..aad0609 100644
--- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro
+++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchange_test.pro
@@ -86,9 +86,9 @@ win32 {
 
         # Switch off optimization for release version
         QMAKE_CXXFLAGS_RELEASE -= -O2
-        QMAKE_CXXFLAGS_RELEASE += -O0
+        QMAKE_CXXFLAGS_RELEASE += 
         QMAKE_CFLAGS_RELEASE -= -O2
-        QMAKE_CFLAGS_RELEASE += -O0
+        QMAKE_CFLAGS_RELEASE += 
 
         # Switch on optimization for debug version
         #QMAKE_CXXFLAGS_DEBUG += -O2
diff --git a/tests/unittests/unittests.pro b/tests/unittests/unittests.pro
index 790ab1c..04a74ab 100644
--- a/tests/unittests/unittests.pro
+++ b/tests/unittests/unittests.pro
@@ -121,9 +121,9 @@ win32 {
 
 	# Switch off optimization for release version
 	QMAKE_CXXFLAGS_RELEASE -= -O2
-	QMAKE_CXXFLAGS_RELEASE += -O0
+	QMAKE_CXXFLAGS_RELEASE += 
 	QMAKE_CFLAGS_RELEASE -= -O2
-	QMAKE_CFLAGS_RELEASE += -O0
+	QMAKE_CFLAGS_RELEASE += 
 
 	# Switch on optimization for debug version
 	#QMAKE_CXXFLAGS_DEBUG += -O2