diff --git a/examples/01.HelloWorld/main.cpp b/examples/01.HelloWorld/main.cpp
index 1e2e9917..dbe802a4 100644
--- a/examples/01.HelloWorld/main.cpp
+++ b/examples/01.HelloWorld/main.cpp
@@ -77,7 +77,7 @@ of the console window, which pops up when starting a program with main(). This
 is done by the second pragma. We could also use the WinMain method, though
 losing platform independence then.
 */
-#ifdef _IRR_WINDOWS_
+#ifdef _MSC_VER
 #pragma comment(lib, "Irrlicht.lib")
 #pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
 #endif
diff --git a/examples/05.UserInterface/main.cpp b/examples/05.UserInterface/main.cpp
index 2a62bef8..02dcb22a 100644
--- a/examples/05.UserInterface/main.cpp
+++ b/examples/05.UserInterface/main.cpp
@@ -21,7 +21,7 @@ using namespace video;
 using namespace io;
 using namespace gui;
 
-#ifdef _IRR_WINDOWS_
+#ifdef _MSC_VER
 #pragma comment(lib, "Irrlicht.lib")
 #endif
 
diff --git a/examples/14.Win32Window/main.cpp b/examples/14.Win32Window/main.cpp
index 8de3303e..53091a1a 100644
--- a/examples/14.Win32Window/main.cpp
+++ b/examples/14.Win32Window/main.cpp
@@ -19,7 +19,9 @@ windows book for details.
 
 using namespace irr;
 
+#ifdef _MSC_VER
 #pragma comment(lib, "irrlicht.lib")
+#endif
 
 HWND hOKButton;
 HWND hWnd;
diff --git a/examples/21.Quake3Explorer/sound.cpp b/examples/21.Quake3Explorer/sound.cpp
index 75615c1d..3f2aea39 100644
--- a/examples/21.Quake3Explorer/sound.cpp
+++ b/examples/21.Quake3Explorer/sound.cpp
@@ -12,7 +12,7 @@
 #ifdef USE_IRRKLANG
 
 #include <irrKlang.h>
-#ifdef _IRR_WINDOWS_
+#ifdef _MSC_VER
 	#pragma comment (lib, "irrKlang.lib")
 #endif
 
@@ -22,7 +22,7 @@ struct soundfile: public IFileReader
 {
 	soundfile ( io::IReadFile* f ): file (f ) {}
 	virtual ~soundfile () { file->drop (); }
-	
+
 	virtual ik_s32 read(void* buffer, ik_u32 sizeToRead) { return file->read ( buffer, sizeToRead ); }
 	virtual bool seek(ik_s32 finalPos, bool relativeMovement = false) { return file->seek ( finalPos, relativeMovement ); }
 	virtual ik_s32 getSize(){ return file->getSize (); }
@@ -46,7 +46,7 @@ struct klangFactory : public irrklang::IFileFactory
 
 	IrrlichtDevice *Device;
 };
- 
+
 ISoundEngine *engine = 0;
 ISound *backMusic = 0;
 
diff --git a/examples/24.CursorControl/main.cpp b/examples/24.CursorControl/main.cpp
index ff7c16f2..4f0644a2 100644
--- a/examples/24.CursorControl/main.cpp
+++ b/examples/24.CursorControl/main.cpp
@@ -14,7 +14,7 @@ using namespace video;
 using namespace io;
 using namespace gui;
 
-#ifdef _IRR_WINDOWS_
+#ifdef _MSC_VER
 #pragma comment(lib, "Irrlicht.lib")
 #endif
 
diff --git a/examples/25.XmlHandling/main.cpp b/examples/25.XmlHandling/main.cpp
index 3eb261de..e97cd683 100644
--- a/examples/25.XmlHandling/main.cpp
+++ b/examples/25.XmlHandling/main.cpp
@@ -18,7 +18,7 @@ using namespace video;
 using namespace io;
 using namespace gui;
 
-#ifdef _IRR_WINDOWS_
+#ifdef _MSC_VER
 #pragma comment(lib, "Irrlicht.lib")
 #endif
 
diff --git a/examples/30.Profiling/main.cpp b/examples/30.Profiling/main.cpp
index 34da11f4..e23166e4 100644
--- a/examples/30.Profiling/main.cpp
+++ b/examples/30.Profiling/main.cpp
@@ -54,7 +54,7 @@ collecting profiling information is disabled by default for speed reasons.
 #include <irrlicht.h>
 #include "driverChoice.h"
 
-#ifdef _IRR_WINDOWS_
+#ifdef _MSC_VER
 #pragma comment(lib, "Irrlicht.lib")
 #endif
 
diff --git a/examples/Demo/CDemo.h b/examples/Demo/CDemo.h
index e2c564dc..0b2ca39c 100644
--- a/examples/Demo/CDemo.h
+++ b/examples/Demo/CDemo.h
@@ -21,7 +21,7 @@ using namespace irr;
 	#include <irrKlang.h>	// problem here? go to http://www.ambiera.com/irrklang and download
 							// the irrKlang library or undefine USE_IRRKLANG at the beginning
 							// of this file.
-	#ifdef _IRR_WINDOWS_
+	#ifdef _MSC_VER
 	#pragma comment (lib, "irrKlang.lib")
 	#endif
 #endif
diff --git a/examples/Demo/main.cpp b/examples/Demo/main.cpp
index 3d269990..711910d8 100644
--- a/examples/Demo/main.cpp
+++ b/examples/Demo/main.cpp
@@ -13,7 +13,7 @@
 
 using namespace irr;
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 
 #pragma comment(lib, "Irrlicht.lib")
 INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
diff --git a/tools/MeshConverter/main.cpp b/tools/MeshConverter/main.cpp
index d6b878f6..b1031f06 100644
--- a/tools/MeshConverter/main.cpp
+++ b/tools/MeshConverter/main.cpp
@@ -9,7 +9,7 @@ using namespace video;
 using namespace io;
 using namespace gui;
 
-#ifdef _IRR_WINDOWS_
+#ifdef _MSC_VER
 #pragma comment(lib, "Irrlicht.lib")
 #endif
 
@@ -98,7 +98,7 @@ int main(int argc, char* argv[])
 	IMeshWriter* mw = device->getSceneManager()->createMeshWriter(type);
 	IWriteFile* file = device->getFileSystem()->createAndWriteFile(argv[destmesh]);
 	mw->writeMesh(file, mesh);
-	
+
 	file->drop();
 	mw->drop();
 	device->drop();