diff --git a/libs/main/core/pivariantsimple.h b/libs/main/core/pivariantsimple.h
index 56afc755..dd6067e9 100644
--- a/libs/main/core/pivariantsimple.h
+++ b/libs/main/core/pivariantsimple.h
@@ -51,7 +51,7 @@ public:
 #ifdef MICRO_PIP
 	PIString typeName() const final {static PIString ret(PIVariant(T()).typeName()); return ret;}
 #else
-	PIString typeName() const final {static PIString ret(_TYPENAME_(T)); return ret;}
+	PIString typeName() const final {static PIString ret(typeid(T).name()); return ret;}
 #endif
 	uint hash() const final {static uint ret = typeName().hash(); return ret;}
 	void newT(void *& ptr, const void * value) final {ptr = (void*)(new T(*(const T*)value));}
diff --git a/libs/main/thread/piconditionvar.cpp b/libs/main/thread/piconditionvar.cpp
index 2143ac24..78c4ecb5 100644
--- a/libs/main/thread/piconditionvar.cpp
+++ b/libs/main/thread/piconditionvar.cpp
@@ -17,13 +17,17 @@
 	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "piplatform.h"
+#ifdef WINDOWS
+#  undef _WIN32_WINNT
+#  define _WIN32_WINNT 0x0600
+#endif
+
 #include "piconditionvar.h"
 #include "pithread.h"
 #include "pitime.h"
 #include "piincludes_p.h"
 #ifdef WINDOWS
-#  undef _WIN32_WINNT
-#  define _WIN32_WINNT 0x0600
 #  include <synchapi.h>
 #  include <windef.h>
 #  include <winbase.h>