diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 94ceaf87..4951c0eb 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -141,7 +141,7 @@ extern "C" {
 /* Include the chosen OpenGL header and, optionally, the GLU header.
  */
 #if defined(__APPLE_CC__)
-  #if defined(GLFW_INCLUDE_GL3)
+  #if defined(GLFW_INCLUDE_GLCOREARB)
     #include <OpenGL/gl3.h>
   #else
     #define GL_GLEXT_LEGACY
@@ -151,8 +151,8 @@ extern "C" {
     #include <OpenGL/glu.h>
   #endif
 #else
-  #if defined(GLFW_INCLUDE_GL3)
-    #include <GL3/gl3.h>
+  #if defined(GLFW_INCLUDE_GLCOREARB)
+    #include <GL/glcorearb.h>
   #else
     #include <GL/gl.h>
   #endif
diff --git a/readme.html b/readme.html
index 95cd2472..e240edd1 100644
--- a/readme.html
+++ b/readme.html
@@ -282,7 +282,7 @@ version of GLFW.</p>
   <li>Added <code>GLFW_OPENGL_ES2_PROFILE</code> profile for creating OpenGL ES 2.0 contexts using the <code>GLX_EXT_create_context_es2_profile</code> and <code>WGL_EXT_create_context_es2_profile</code> extensions</li>
   <li>Added <code>GLFW_OPENGL_ROBUSTNESS</code> window hint and associated strategy tokens for <code>GL_ARB_robustness</code> support</li>
   <li>Added <code>GLFW_OPENGL_REVISION</code> window parameter to make up for removal of <code>glfwGetGLVersion</code></li>
-  <li>Added <code>GLFW_INCLUDE_GL3</code> macro for telling the GLFW header to include <code>gl3.h</code> header instead of <code>gl.h</code></li>
+  <li>Added <code>GLFW_INCLUDE_GLCOREARB</code> macro for including <code>glcorearb.h</code> instead of <code>gl.h</code></li>
   <li>Added <code>GLFW_VISIBLE</code> window hint and parameter for controlling and polling window visibility</li>
   <li>Added <code>windows</code> simple multi-window test program</li>
   <li>Added <code>sharing</code> simple OpenGL object sharing test program</li>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d9ce8fb3..47d99d30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,6 +3,10 @@ include_directories(${GLFW_SOURCE_DIR}/src
                     ${GLFW_BINARY_DIR}/src
                     ${glfw_INCLUDE_DIRS})
 
+if (MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
 set(common_HEADERS ${GLFW_SOURCE_DIR}/include/GL/glfw3.h internal.h)
 set(common_SOURCES clipboard.c gamma.c init.c input.c joystick.c monitor.c
                    opengl.c time.c window.c)
diff --git a/src/window.c b/src/window.c
index 3da4936d..f2bff21d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -269,7 +269,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
     wndconfig.glProfile      = _glfwLibrary.hints.glProfile;
     wndconfig.glRobustness   = _glfwLibrary.hints.glRobustness ? GL_TRUE : GL_FALSE;
     wndconfig.monitor        = (_GLFWmonitor*) monitor;
-    wndconfig.share          = share;
+    wndconfig.share          = (_GLFWwindow*) share;
 
     // Reset to default values for the next call
     _glfwSetDefaultWindowHints();