diff --git a/examples/01.HelloWorld/Makefile b/examples/01.HelloWorld/Makefile
index 0b4f1ab3..333a2709 100644
--- a/examples/01.HelloWorld/Makefile
+++ b/examples/01.HelloWorld/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/02.Quake3Map/Makefile b/examples/02.Quake3Map/Makefile
index 811894f7..3ec2e561 100644
--- a/examples/02.Quake3Map/Makefile
+++ b/examples/02.Quake3Map/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/03.CustomSceneNode/Makefile b/examples/03.CustomSceneNode/Makefile
index 39bdbb5a..35ccd6c6 100644
--- a/examples/03.CustomSceneNode/Makefile
+++ b/examples/03.CustomSceneNode/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/04.Movement/Makefile b/examples/04.Movement/Makefile
index ae62ed6e..534aa128 100644
--- a/examples/04.Movement/Makefile
+++ b/examples/04.Movement/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/05.UserInterface/Makefile b/examples/05.UserInterface/Makefile
index d87d9bef..7974423c 100644
--- a/examples/05.UserInterface/Makefile
+++ b/examples/05.UserInterface/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/06.2DGraphics/Makefile b/examples/06.2DGraphics/Makefile
index 902f78d8..1f78acfa 100644
--- a/examples/06.2DGraphics/Makefile
+++ b/examples/06.2DGraphics/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/07.Collision/Makefile b/examples/07.Collision/Makefile
index 897cdcc4..a9ae395b 100644
--- a/examples/07.Collision/Makefile
+++ b/examples/07.Collision/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/08.SpecialFX/Makefile b/examples/08.SpecialFX/Makefile
index 0829c95a..8e273c85 100644
--- a/examples/08.SpecialFX/Makefile
+++ b/examples/08.SpecialFX/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/09.Meshviewer/Makefile b/examples/09.Meshviewer/Makefile
index abd2ba06..5259d15f 100644
--- a/examples/09.Meshviewer/Makefile
+++ b/examples/09.Meshviewer/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/10.Shaders/Makefile b/examples/10.Shaders/Makefile
index ca98ef56..80ee6480 100644
--- a/examples/10.Shaders/Makefile
+++ b/examples/10.Shaders/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/11.PerPixelLighting/Makefile b/examples/11.PerPixelLighting/Makefile
index 7b9c4c8c..0c1ce190 100644
--- a/examples/11.PerPixelLighting/Makefile
+++ b/examples/11.PerPixelLighting/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/12.TerrainRendering/Makefile b/examples/12.TerrainRendering/Makefile
index d23643e3..faf55b4c 100644
--- a/examples/12.TerrainRendering/Makefile
+++ b/examples/12.TerrainRendering/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/13.RenderToTexture/Makefile b/examples/13.RenderToTexture/Makefile
index 085dfb63..84edd0cb 100644
--- a/examples/13.RenderToTexture/Makefile
+++ b/examples/13.RenderToTexture/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/14.Win32Window/Makefile b/examples/14.Win32Window/Makefile
index fa63f414..531da350 100644
--- a/examples/14.Win32Window/Makefile
+++ b/examples/14.Win32Window/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/15.LoadIrrFile/Makefile b/examples/15.LoadIrrFile/Makefile
index 884cb873..269281f4 100644
--- a/examples/15.LoadIrrFile/Makefile
+++ b/examples/15.LoadIrrFile/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/16.Quake3MapShader/Makefile b/examples/16.Quake3MapShader/Makefile
index 16930aac..ead8b8db 100644
--- a/examples/16.Quake3MapShader/Makefile
+++ b/examples/16.Quake3MapShader/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/17.HelloWorld_Mobile/Makefile b/examples/17.HelloWorld_Mobile/Makefile
index a29ccaa2..c90e93cb 100644
--- a/examples/17.HelloWorld_Mobile/Makefile
+++ b/examples/17.HelloWorld_Mobile/Makefile
@@ -5,7 +5,7 @@ Target = 17.HelloWorld_Mobile
 Sources = main.cpp
 
 # general compiler settings
-CPPFLAGS = -I../../include -I/usr/X11R6/include
+CPPFLAGS = -I../../include
 CXXFLAGS = -O3 -ffast-math
 #CXXFLAGS = -g -Wall
 
diff --git a/examples/18.SplitScreen/Makefile b/examples/18.SplitScreen/Makefile
index 63faa8e4..953060e2 100644
--- a/examples/18.SplitScreen/Makefile
+++ b/examples/18.SplitScreen/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/19.MouseAndJoystick/Makefile b/examples/19.MouseAndJoystick/Makefile
index 173d6c19..aa0ea53d 100644
--- a/examples/19.MouseAndJoystick/Makefile
+++ b/examples/19.MouseAndJoystick/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/20.ManagedLights/Makefile b/examples/20.ManagedLights/Makefile
index 9eec331a..b76a5c68 100644
--- a/examples/20.ManagedLights/Makefile
+++ b/examples/20.ManagedLights/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/21.Quake3Explorer/Makefile b/examples/21.Quake3Explorer/Makefile
index 702983cf..2d8cd5ae 100644
--- a/examples/21.Quake3Explorer/Makefile
+++ b/examples/21.Quake3Explorer/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/22.MaterialViewer/Makefile b/examples/22.MaterialViewer/Makefile
index ef421bc3..6ec3df4b 100644
--- a/examples/22.MaterialViewer/Makefile
+++ b/examples/22.MaterialViewer/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/23.SMeshHandling/Makefile b/examples/23.SMeshHandling/Makefile
index 02837eee..e8ebf7b7 100644
--- a/examples/23.SMeshHandling/Makefile
+++ b/examples/23.SMeshHandling/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/24.CursorControl/Makefile b/examples/24.CursorControl/Makefile
index c2ada6cb..272a431d 100644
--- a/examples/24.CursorControl/Makefile
+++ b/examples/24.CursorControl/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/25.XmlHandling/Makefile b/examples/25.XmlHandling/Makefile
index 71c2e13a..62e6088a 100644
--- a/examples/25.XmlHandling/Makefile
+++ b/examples/25.XmlHandling/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/26.OcclusionQuery/Makefile b/examples/26.OcclusionQuery/Makefile
index 1ee059c6..72b8f135 100644
--- a/examples/26.OcclusionQuery/Makefile
+++ b/examples/26.OcclusionQuery/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/27.PostProcessing/Makefile b/examples/27.PostProcessing/Makefile
index c5905005..ecf44d8a 100644
--- a/examples/27.PostProcessing/Makefile
+++ b/examples/27.PostProcessing/Makefile
@@ -5,7 +5,7 @@ Target = 27.PostProcessing
 Sources = main.cpp
 
 # general compiler settings
-CPPFLAGS = -I../../include -I/usr/X11R6/include
+CPPFLAGS = -I../../include
 CXXFLAGS = -O3 -ffast-math
 #CXXFLAGS = -g -Wall
 
diff --git a/examples/28.CubeMapping/Makefile b/examples/28.CubeMapping/Makefile
index 22514c2c..627c9ea8 100644
--- a/examples/28.CubeMapping/Makefile
+++ b/examples/28.CubeMapping/Makefile
@@ -5,7 +5,7 @@ Target = 28.CubeMapping
 Sources = main.cpp
 
 # general compiler settings
-CPPFLAGS = -I../../include -I/usr/X11R6/include
+CPPFLAGS = -I../../include
 CXXFLAGS = -O3 -ffast-math
 #CXXFLAGS = -g -Wall
 
diff --git a/examples/30.Profiling/Makefile b/examples/30.Profiling/Makefile
index ac80b1eb..a8f345e2 100644
--- a/examples/30.Profiling/Makefile
+++ b/examples/30.Profiling/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else
diff --git a/examples/Demo/Makefile b/examples/Demo/Makefile
index 46156a09..25d85d2b 100644
--- a/examples/Demo/Makefile
+++ b/examples/Demo/Makefile
@@ -12,7 +12,7 @@ IrrlichtHome := ../..
 BinPath = ../../bin/$(SYSTEM)
 
 # general compiler settings (might need to be set when compiling the lib, too)
-CPPFLAGS += -I$(IrrlichtHome)/include -I/usr/X11R6/include
+CPPFLAGS += -I$(IrrlichtHome)/include
 ifndef NDEBUG
 CXXFLAGS += -g -Wall
 else