diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 30adf75e..01db7642 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -79,7 +79,7 @@ static void updateModeCursor(_GLFWwindow* window)
         [(NSCursor*) _glfw.ns.cursor set];
 }
 
-// Enter fullscreen mode
+// Enter full screen mode
 //
 static GLboolean enterFullscreenMode(_GLFWwindow* window)
 {
@@ -95,7 +95,7 @@ static GLboolean enterFullscreenMode(_GLFWwindow* window)
     return status;
 }
 
-// Leave fullscreen mode
+// Leave full screen mode
 //
 static void leaveFullscreenMode(_GLFWwindow* window)
 {
@@ -695,7 +695,7 @@ static NSString* findAppName(void)
 // This is nasty, nasty stuff -- calls to undocumented semi-private APIs that
 // could go away at any moment, lots of stuff that really should be
 // localize(d|able), etc.  Loading a nib would save us this horror, but that
-// doesn't seem like a good thing to require of GLFW's clients.
+// doesn't seem like a good thing to require of GLFW users.
 //
 static void createMenuBar(void)
 {
diff --git a/src/internal.h b/src/internal.h
index c4733556..1e6977ff 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -112,7 +112,7 @@ typedef struct _GLFWcursor      _GLFWcursor;
 // Helper macros
 //========================================================================
 
-// Checks for whether the library has been intitalized
+// Checks for whether the library has been initialized
 #define _GLFW_REQUIRE_INIT()                         \
     if (!_glfwInitialized)                           \
     {                                                \
@@ -184,7 +184,7 @@ struct _GLFWctxconfig
 /*! @brief Framebuffer configuration.
  *
  *  This describes buffers and their sizes.  It also contains
- *  a platform-specific ID used to map back to the backend API's object.
+ *  a platform-specific ID used to map back to the backend API object.
  *
  *  It is used to pass framebuffer parameters from shared code to the platform
  *  API and also to enumerate and select available framebuffer configs.
diff --git a/src/mir_platform.h b/src/mir_platform.h
index 7d477e90..76399c2a 100644
--- a/src/mir_platform.h
+++ b/src/mir_platform.h
@@ -97,7 +97,7 @@ typedef struct _GLFWlibraryMir
 
 
 // Mir-specific per-cursor data
-// TODO: Only system cursors are implemented in mir atm. Need to wait for support.
+// TODO: Only system cursors are implemented in Mir atm. Need to wait for support.
 //
 typedef struct _GLFWcursorMir
 {
diff --git a/src/nsgl_context.m b/src/nsgl_context.m
index 9800977d..0f0fb86e 100644
--- a/src/nsgl_context.m
+++ b/src/nsgl_context.m
@@ -168,7 +168,7 @@ int _glfwCreateContext(_GLFWwindow* window,
                         fbconfig->greenBits +
                         fbconfig->blueBits;
 
-        // OS X needs non-zero color size, so set resonable values
+        // OS X needs non-zero color size, so set reasonable values
         if (colorBits == 0)
             colorBits = 24;
         else if (colorBits < 15)
@@ -206,7 +206,7 @@ int _glfwCreateContext(_GLFWwindow* window,
     }
 
     // NOTE: All NSOpenGLPixelFormats on the relevant cards support sRGB
-    //       frambuffer, so there's no need (and no way) to request it
+    //       framebuffer, so there's no need (and no way) to request it
 
     ADD_ATTR(0);
 
diff --git a/src/win32_init.c b/src/win32_init.c
index a963689d..964b23aa 100644
--- a/src/win32_init.c
+++ b/src/win32_init.c
@@ -39,7 +39,7 @@
 #if defined(_GLFW_USE_OPTIMUS_HPG)
 
 // Applications exporting this symbol with this value will be automatically
-// directed to the high-performance GPU on nVidia Optimus systems
+// directed to the high-performance GPU on Nvidia Optimus systems
 //
 __declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
 
diff --git a/src/win32_window.c b/src/win32_window.c
index ab5b70a8..cf72c206 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -202,7 +202,7 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
     return _glfw.win32.publicKeys[HIWORD(lParam) & 0x1FF];
 }
 
-// Enter fullscreen mode
+// Enter full screen mode
 //
 static GLboolean enterFullscreenMode(_GLFWwindow* window)
 {
@@ -221,7 +221,7 @@ static GLboolean enterFullscreenMode(_GLFWwindow* window)
     return status;
 }
 
-// Leave fullscreen mode
+// Leave full screen mode
 //
 static void leaveFullscreenMode(_GLFWwindow* window)
 {
@@ -280,7 +280,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
                 {
                     if (window->monitor)
                     {
-                        // We are running in fullscreen mode, so disallow
+                        // We are running in full screen mode, so disallow
                         // screen saver and screen blanking
                         return 0;
                     }
diff --git a/src/window.c b/src/window.c
index a7ca2c8c..4a46a6e4 100644
--- a/src/window.c
+++ b/src/window.c
@@ -479,7 +479,7 @@ GLFWAPI void glfwSetWindowPos(GLFWwindow* handle, int xpos, int ypos)
     if (window->monitor)
     {
         _glfwInputError(GLFW_INVALID_VALUE,
-                        "Fullscreen windows cannot be positioned");
+                        "Full screen windows cannot be positioned");
         return;
     }
 
diff --git a/src/wl_window.c b/src/wl_window.c
index 916ba683..3ecb90f8 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -239,7 +239,7 @@ void _glfwPlatformGetWindowPos(_GLFWwindow* window, int* xpos, int* ypos)
     // as (0, 0)
 
     _glfwInputError(GLFW_PLATFORM_ERROR,
-                    "Wayland: Window position retreival not supported");
+                    "Wayland: Window position retrieval not supported");
 }
 
 void _glfwPlatformSetWindowPos(_GLFWwindow* window, int xpos, int ypos)
diff --git a/src/x11_init.c b/src/x11_init.c
index e2063a1a..388105ef 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -42,7 +42,7 @@ static int translateKey(int scancode)
 {
     int keySym;
 
-    // Valid key code range is  [8,255], according to the XLib manual
+    // Valid key code range is  [8,255], according to the Xlib manual
     if (scancode < 8 || scancode > 255)
         return GLFW_KEY_UNKNOWN;
 
@@ -72,7 +72,7 @@ static int translateKey(int scancode)
             default:                break;
         }
 
-        // Now try pimary keysym for function keys (non-printable keys). These
+        // Now try primary keysym for function keys (non-printable keys). These
         // should not be layout dependent (i.e. US layout and international
         // layouts should give the same result).
         keySym = XkbKeycodeToKeysym(_glfw.x11.display, scancode, 0, 0);
diff --git a/src/x11_window.c b/src/x11_window.c
index 5b75b8aa..0380b581 100644
--- a/src/x11_window.c
+++ b/src/x11_window.c
@@ -303,7 +303,7 @@ static GLboolean createWindow(_GLFWwindow* window,
         // This is the butcher's way of removing window decorations
         // Setting the override-redirect attribute on a window makes the window
         // manager ignore the window completely (ICCCM, section 4)
-        // The good thing is that this makes undecorated fullscreen windows
+        // The good thing is that this makes undecorated full screen windows
         // easy to do; the bad thing is that we have to do everything manually
         // and some things (like iconify/restore) won't work at all, as those
         // are tasks usually performed by the window manager
@@ -543,7 +543,7 @@ static Atom writeTargetToProperty(const XSelectionRequestEvent* request)
 
     if (request->property == None)
     {
-        // The requestor is a legacy client (ICCCM section 2.2)
+        // The requester is a legacy client (ICCCM section 2.2)
         // We don't support legacy clients, so fail here
         return None;
     }
@@ -731,7 +731,7 @@ static void pushSelectionToManager(_GLFWwindow* window)
     }
 }
 
-// Enter fullscreen mode
+// Enter full screen mode
 //
 static void enterFullscreenMode(_GLFWwindow* window)
 {
@@ -812,8 +812,8 @@ static void enterFullscreenMode(_GLFWwindow* window)
                        &event);
         }
 
-        // Ask the window manager to make the GLFW window a fullscreen window
-        // Fullscreen windows are undecorated and, when focused, are kept
+        // Ask the window manager to make the GLFW window a full screen window
+        // Full screen windows are undecorated and, when focused, are kept
         // on top of all other windows
 
         changeWindowState(window,
@@ -839,7 +839,7 @@ static void enterFullscreenMode(_GLFWwindow* window)
     }
 }
 
-// Leave fullscreen mode
+// Leave full screen mode
 //
 static void leaveFullscreenMode(_GLFWwindow* window)
 {
@@ -950,7 +950,7 @@ static void processEvent(XEvent *event)
             {
                 // HACK: Key repeat events will arrive as KeyRelease/KeyPress
                 //       pairs with similar or identical time stamps
-                //       The key repeat logic in _glfwInputKey expectes only key
+                //       The key repeat logic in _glfwInputKey expects only key
                 //       presses to repeat, so detect and discard release events
                 if (XEventsQueued(_glfw.x11.display, QueuedAfterReading))
                 {
diff --git a/tests/fsaa.c b/tests/fsaa.c
index 336cdd2b..b368745a 100644
--- a/tests/fsaa.c
+++ b/tests/fsaa.c
@@ -1,5 +1,5 @@
 //========================================================================
-// Fullscreen anti-aliasing test
+// Full screen anti-aliasing test
 // Copyright (c) Camilla Berglund <elmindreda@elmindreda.org>
 //
 // This software is provided 'as-is', without any express or implied
diff --git a/tests/gamma.c b/tests/gamma.c
index c67e128a..93a24e6f 100644
--- a/tests/gamma.c
+++ b/tests/gamma.c
@@ -24,7 +24,7 @@
 //========================================================================
 //
 // This program is used to test the gamma correction functionality for
-// both fullscreen and windowed mode windows
+// both full screen and windowed mode windows
 //
 //========================================================================
 
diff --git a/tests/glfwinfo.c b/tests/glfwinfo.c
index dcf53537..f07d7006 100644
--- a/tests/glfwinfo.c
+++ b/tests/glfwinfo.c
@@ -64,8 +64,8 @@ static void usage(void)
     printf("  -f require a forward-compatible context\n");
     printf("  -h show this help\n");
     printf("  -l list all client API extensions after context creation\n");
-    printf("  -m the major number of the requred client API version\n");
-    printf("  -n the minor number of the requred client API version\n");
+    printf("  -m the major number of the required client API version\n");
+    printf("  -n the minor number of the required client API version\n");
     printf("  -p the OpenGL profile to use (" PROFILE_NAME_CORE " or " PROFILE_NAME_COMPAT ")\n");
     printf("  -s the robustness strategy to use (" STRATEGY_NAME_NONE " or " STRATEGY_NAME_LOSE ")\n");
 }
diff --git a/tests/iconify.c b/tests/iconify.c
index d1c8d682..037b85ac 100644
--- a/tests/iconify.c
+++ b/tests/iconify.c
@@ -24,7 +24,7 @@
 //========================================================================
 //
 // This program is used to test the iconify/restore functionality for
-// both fullscreen and windowed mode windows
+// both full screen and windowed mode windows
 //
 //========================================================================
 
diff --git a/tests/reopen.c b/tests/reopen.c
index ca79eed6..7af8e8a9 100644
--- a/tests/reopen.c
+++ b/tests/reopen.c
@@ -26,7 +26,7 @@
 // This test came about as the result of bug #1262773
 //
 // It closes and re-opens the GLFW window every five seconds, alternating
-// between windowed and fullscreen mode
+// between windowed and full screen mode
 //
 // It also times and logs opening and closing actions and attempts to separate
 // user initiated window closing from its own
diff --git a/tests/threads.c b/tests/threads.c
index 78519c73..0a385787 100644
--- a/tests/threads.c
+++ b/tests/threads.c
@@ -1,5 +1,5 @@
 //========================================================================
-// Multithreading test
+// Multi-threading test
 // Copyright (c) Camilla Berglund <elmindreda@elmindreda.org>
 //
 // This software is provided 'as-is', without any express or implied