diff --git a/examples/boing.c b/examples/boing.c
index 8c4db2fc..adb814ee 100644
--- a/examples/boing.c
+++ b/examples/boing.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 
 /*****************************************************************************
diff --git a/examples/gears.c b/examples/gears.c
index 16bf14d9..b3894735 100644
--- a/examples/gears.c
+++ b/examples/gears.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #ifndef M_PI
 #define M_PI 3.141592654
diff --git a/examples/listmodes.c b/examples/listmodes.c
index 8a8a470d..9fc7913b 100644
--- a/examples/listmodes.c
+++ b/examples/listmodes.c
@@ -4,7 +4,7 @@
 //========================================================================
 
 #include <stdio.h>
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 // Maximum number of modes that we want to list
 #define MAX_NUM_MODES 400
diff --git a/examples/splitview.c b/examples/splitview.c
index cc178c86..70b81e19 100644
--- a/examples/splitview.c
+++ b/examples/splitview.c
@@ -10,7 +10,7 @@
 //  because I am not a friend of orthogonal projections)
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/examples/triangle.c b/examples/triangle.c
index b17c2daa..b8babb34 100644
--- a/examples/triangle.c
+++ b/examples/triangle.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 
 int main( void )
diff --git a/examples/wave.c b/examples/wave.c
index dbb38b31..fbd07c91 100644
--- a/examples/wave.c
+++ b/examples/wave.c
@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #ifndef M_PI
  #define M_PI 3.1415926535897932384626433832795
diff --git a/include/GL/glfw.h b/include/GL/glfw3.h
similarity index 100%
rename from include/GL/glfw.h
rename to include/GL/glfw3.h
diff --git a/src/x11/platform.h b/src/x11/platform.h
index 1ce57e6b..811d9f22 100644
--- a/src/x11/platform.h
+++ b/src/x11/platform.h
@@ -42,7 +42,7 @@
 #include <X11/Xatom.h>
 #include <GL/glx.h>
 
-#include "../../include/GL/glfw.h"
+#include "../../include/GL/glfw3.h"
 #include "x11_config.h"
 
 // We need declarations for GLX version 1.3 or above even if the server doesn't
diff --git a/tests/accuracy.c b/tests/accuracy.c
index 6ae4379a..5d85ceca 100644
--- a/tests/accuracy.c
+++ b/tests/accuracy.c
@@ -29,7 +29,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/defaults.c b/tests/defaults.c
index 14d85de0..66f4c704 100644
--- a/tests/defaults.c
+++ b/tests/defaults.c
@@ -29,7 +29,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/events.c b/tests/events.c
index e2f095c0..f88725d6 100644
--- a/tests/events.c
+++ b/tests/events.c
@@ -31,7 +31,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/fsaa.c b/tests/fsaa.c
index 4095b650..4f52dfc0 100644
--- a/tests/fsaa.c
+++ b/tests/fsaa.c
@@ -29,7 +29,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/joysticks.c b/tests/joysticks.c
index 7015e131..427e2c8b 100644
--- a/tests/joysticks.c
+++ b/tests/joysticks.c
@@ -3,7 +3,7 @@
  * joystick input test.
  *========================================================================*/
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <math.h>
diff --git a/tests/peter.c b/tests/peter.c
index 4cd5cb45..837a8da0 100644
--- a/tests/peter.c
+++ b/tests/peter.c
@@ -30,7 +30,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/reopen.c b/tests/reopen.c
index 9d6ffe5b..167f9990 100644
--- a/tests/reopen.c
+++ b/tests/reopen.c
@@ -33,7 +33,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/tearing.c b/tests/tearing.c
index 9824c800..cb04662b 100644
--- a/tests/tearing.c
+++ b/tests/tearing.c
@@ -28,7 +28,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tests/version.c b/tests/version.c
index ef91a1f2..2bbdcebf 100644
--- a/tests/version.c
+++ b/tests/version.c
@@ -29,7 +29,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #ifndef GL_VERSION_3_2
 #define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
diff --git a/tests/windows.c b/tests/windows.c
index 1b30fb5e..555da0be 100644
--- a/tests/windows.c
+++ b/tests/windows.c
@@ -27,7 +27,7 @@
 //
 //========================================================================
 
-#include <GL/glfw.h>
+#include <GL/glfw3.h>
 
 #include <stdio.h>
 #include <stdlib.h>