diff --git a/README b/README
index 029d09b706a..22a86b8fa7c 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ To compile and run Wine, you must have one of the following:
   FreeBSD 5.3 or later
   Solaris x86 2.5 or later
   NetBSD-current
-  MacOS X 10.4 or later
+  Mac OS X 10.4 or later
 
 As Wine requires kernel-level thread support to run, only the operating
 systems mentioned above are supported.
@@ -61,7 +61,7 @@ NetBSD info:
   Make sure you have the USER_LDT, SYSVSHM, SYSVSEM, and SYSVMSG options
   turned on in your kernel.
 
-MacOS info:
+Mac OS X info:
   You need Xcode 2.4 or later to build properly on x86.
 
 
diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h
index 551b6275ac9..07e9d4975b4 100644
--- a/dlls/gdi32/gdi_private.h
+++ b/dlls/gdi32/gdi_private.h
@@ -499,7 +499,7 @@ extern HPALETTE PALETTE_Init(void);
 /* region.c */
 extern BOOL REGION_FrameRgn( HRGN dest, HRGN src, INT x, INT y );
 
-/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal enties */
+/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */
 #define DIB_PAL_MONO 2
 #endif /* __WINE_GDI_PRIVATE_H */
 
diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c
index 8a9135b27a1..52e84135aaa 100644
--- a/dlls/iphlpapi/ifenum.c
+++ b/dlls/iphlpapi/ifenum.c
@@ -22,7 +22,7 @@
  * interface:
  * - a specific IOCTL (Linux)
  * - looking in the ARP cache (at least Solaris)
- * - using the sysctl interface (FreeBSD and MacOSX)
+ * - using the sysctl interface (FreeBSD and Mac OS X)
  * Solaris and some others have SIOCGENADDR, but I haven't gotten that to work
  * on the Solaris boxes at SourceForge's compile farm, whereas SIOCGARP does.
  */
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
index 1f7a73945f0..2d9b13e3253 100644
--- a/dlls/kernel32/cpu.c
+++ b/dlls/kernel32/cpu.c
@@ -326,7 +326,7 @@ VOID WINAPI GetSystemInfo(
 	memset(PF,0,sizeof(PF));
 
 	/* choose sensible defaults ...
-	 * FIXME: perhaps overrideable with precompiler flags?
+	 * FIXME: perhaps overridable with precompiler flags?
 	 */
 	cachedsi.u.s.wProcessorArchitecture     = PROCESSOR_ARCHITECTURE_INTEL;
 	cachedsi.dwPageSize 			= getpagesize();
@@ -341,7 +341,7 @@ VOID WINAPI GetSystemInfo(
 	cachedsi.wProcessorLevel		= 5; /* 586 */
 	cachedsi.wProcessorRevision		= 0;
 
-	cache = 1; /* even if there is no more info, we now have a cacheentry */
+	cache = 1; /* even if there is no more info, we now have a cache entry */
 	memcpy(si,&cachedsi,sizeof(*si));
 
 	/* Hmm, reasonable processor feature defaults? */
diff --git a/dlls/kernel32/instr.c b/dlls/kernel32/instr.c
index eaa849e8da7..90e065ba59f 100644
--- a/dlls/kernel32/instr.c
+++ b/dlls/kernel32/instr.c
@@ -643,10 +643,10 @@ DWORD INSTR_EmulateInstruction( EXCEPTION_RECORD *rec, CONTEXT86 *context )
 	      int seg = outp ? context->SegDs : context->SegEs;  /* FIXME: is this right? */
 
 	      if (outp)
-		/* FIXME: Check segment readable.  */
+		/* FIXME: Check segment is readable.  */
 		(void)0;
 	      else
-		/* FIXME: Check segment writeable.  */
+		/* FIXME: Check segment is writable.  */
 		(void)0;
 
 	      if (repX)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 4a55e0d8d6c..8cdcd724d24 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -1806,7 +1806,7 @@ UINT WINAPI WinExec( LPCSTR lpCmdLine, UINT nCmdShow )
     startup.dwFlags = STARTF_USESHOWWINDOW;
     startup.wShowWindow = nCmdShow;
 
-    /* cmdline needs to be writeable for CreateProcess */
+    /* cmdline needs to be writable for CreateProcess */
     if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, strlen(lpCmdLine)+1 ))) return 0;
     strcpy( cmdline, lpCmdLine );
 
diff --git a/dlls/kernel32/selector.c b/dlls/kernel32/selector.c
index 86d150ca790..8136e0bbbf1 100644
--- a/dlls/kernel32/selector.c
+++ b/dlls/kernel32/selector.c
@@ -385,7 +385,7 @@ BOOL16 WINAPI IsBadHugeWritePtr16( SEGPTR ptr, DWORD size )
     if (!sel) return TRUE;
     wine_ldt_get_entry( sel, &entry );
     if (wine_ldt_is_empty( &entry )) return TRUE;
-    /* check for writeable data segment, ignoring expand-down and accessed flags */
+    /* check for writable data segment, ignoring expand-down and accessed flags */
     if ((entry.HighWord.Bits.Type ^ WINE_LDT_FLAGS_DATA) & ~5) return TRUE;
     if (size && (OFFSETOF(ptr) + size - 1 > wine_ldt_get_limit( &entry ))) return TRUE;
     return FALSE;
diff --git a/dlls/msvcrt/tests/headers.c b/dlls/msvcrt/tests/headers.c
index 3ffa6788398..d5efa86aaf9 100644
--- a/dlls/msvcrt/tests/headers.c
+++ b/dlls/msvcrt/tests/headers.c
@@ -17,7 +17,7 @@
  *
  * This file contains tests to ensure the consistency between symbols
  * defined in the regular msvcrt headers, and the corresponding duplicated
- * symbol defined in msvcrt.h (prefixed by MSVCRT_).
+ * symbols defined in msvcrt.h (prefixed by MSVCRT_).
  */
 
 #include "dos.h"
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 610f64eda33..5f2aea841c9 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -327,7 +327,7 @@ BlockChainStream* Storage32Impl_SmallBlocksToBigBlocks(
 /****************************************************************************
  * StgStreamImpl definitions.
  *
- * This class imlements the IStream32 inteface and represents a stream
+ * This class implements the IStream32 interface and represents a stream
  * located inside a storage object.
  */
 struct StgStreamImpl
diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h
index be2e3eb57df..c2ce2ebc48e 100644
--- a/dlls/oleaut32/typelib.h
+++ b/dlls/oleaut32/typelib.h
@@ -149,7 +149,7 @@ typedef struct tagMSFT_TypeInfoBase {
 /*050*/ INT     size;           /* size in bytes, at least for structures */
         /* FIXME: name of this field */
         INT     datatype1;      /* position in type description table */
-                                /* or in base intefaces */
+                                /* or in base interfaces */
                                 /* if coclass: offset in reftable */
                                 /* if interface: reference to inherited if */
                                 /* if module: offset to dllname in name table */
@@ -285,7 +285,7 @@ typedef struct {
 			   lower-middle 8 bits are unknown (flags?),
 			   upper 16 bits are hash code */
 } MSFT_NameIntro;
-/* the custom data table directory has enties like this */
+/* the custom data table directory has entries like this */
 typedef struct {
     INT   GuidOffset;
     INT   DataOffset;
diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c
index 949923ce523..cd6314c674c 100644
--- a/dlls/rpcrt4/ndr_stubless.c
+++ b/dlls/rpcrt4/ndr_stubless.c
@@ -1024,7 +1024,7 @@ __ASM_GLOBAL_FUNC(call_server_func,
     "pushl %esi\n\t"
     "movl 16(%ebp), %eax\n\t"   /* Get stack size */
     "subl %eax, %esp\n\t"       /* Make room in stack for arguments */
-    "andl $~15, %esp\n\t"	/* Make sure stack has 16-byte alignment for MacOS X */
+    "andl $~15, %esp\n\t"	/* Make sure stack has 16-byte alignment for Mac OS X */
     "movl %esp, %edi\n\t"
     "movl %eax, %ecx\n\t"
     "movl 12(%ebp), %esi\n\t"
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 0c0c3b8e7ed..1d572c6adbc 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -120,7 +120,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs)
         return argv;
     }
 
-    /* to get a writeable copy */
+    /* to get a writable copy */
     argc=0;
     bcount=0;
     in_quotes=0;
@@ -356,7 +356,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
          (flags & (SHGFI_ATTRIBUTES|SHGFI_EXETYPE|SHGFI_PIDL)))
         return FALSE;
 
-    /* windows initializes this values regardless of the flags */
+    /* windows initializes these values regardless of the flags */
     if (psfi != NULL)
     {
         psfi->szDisplayName[0] = '\0';
diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index d579422052f..f1d62358cb4 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -219,7 +219,7 @@ static BOOL is_close_enabled(HWND hwnd, HMENU hSysMenu)
 /**********************************************************************
  * 			MDI_GetWindow
  *
- * returns "activateable" child different from the current or zero
+ * returns "activatable" child different from the current or zero
  */
 static HWND MDI_GetWindow(MDICLIENTINFO *clientInfo, HWND hWnd, BOOL bNext,
                             DWORD dwStyleMask )
diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h
index 0f7c0c6bc6f..92cbd22d8ad 100644
--- a/include/msvcrt/process.h
+++ b/include/msvcrt/process.h
@@ -31,7 +31,7 @@ typedef unsigned short wchar_t;
 #ifndef __stdcall
 # ifdef __i386__
 #  ifdef __GNUC__
-#   ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */
+#   ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */
 #    define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))
 #   else
 #    define __stdcall __attribute__((__stdcall__))
diff --git a/include/windef.h b/include/windef.h
index c328fb44c06..6106b7a347d 100644
--- a/include/windef.h
+++ b/include/windef.h
@@ -52,7 +52,7 @@ extern "C" {
 #ifndef __stdcall
 # ifdef __i386__
 #  ifdef __GNUC__
-#   ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */
+#   ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */
 #    define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))
 #   else
 #    define __stdcall __attribute__((__stdcall__))
@@ -69,7 +69,7 @@ extern "C" {
 
 #ifndef __cdecl
 # if defined(__i386__) && defined(__GNUC__)
-#  ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */
+#  ifdef __APPLE__ /* Mac OS X uses 16-byte aligned stack and not a 4-byte one */
 #   define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))
 #  else
 #   define __cdecl __attribute__((__cdecl__))
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
index 28659e1c20a..b6f55959f6a 100644
--- a/libs/wine/mmap.c
+++ b/libs/wine/mmap.c
@@ -90,7 +90,7 @@ static inline int get_fdzero(void)
  * the address argument in this case.
  *
  * As Wine code occasionally relies on the Linux behaviour, e.g. to
- * be able to map non-relocateable PE executables to their proper
+ * be able to map non-relocatable PE executables to their proper
  * start addresses, or to map the DOS memory to 0, this routine
  * emulates the Linux behaviour by checking whether the desired
  * address range is still available, and placing the mapping there
diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h
index d3b2ab5b2ba..e16387c8dcd 100644
--- a/tools/widl/typelib_struct.h
+++ b/tools/widl/typelib_struct.h
@@ -148,7 +148,7 @@ typedef struct tagMSFT_TypeInfoBase {
 /*050*/ INT     size;           /* size in bytes, at least for structures */
         /* FIXME: name of this field */
         INT     datatype1;      /* position in type description table */
-                                /* or in base intefaces */
+                                /* or in base interfaces */
                                 /* if coclass: offset in reftable */
                                 /* if interface: reference to inherited if */
         INT     datatype2;      /* for interfaces: hiword is num of inherited funcs */
@@ -286,7 +286,7 @@ typedef struct {
                         /* 0x3800 if name is typeinfo name */
 			/* upper 16 bits are hash code */
 } MSFT_NameIntro;
-/* the custom data table directory has enties like this */
+/* the custom data table directory has entries like this */
 typedef struct {
     INT   GuidOffset;
     INT   DataOffset;
diff --git a/tools/winedump/le.c b/tools/winedump/le.c
index 0cd7084703f..ee043f2a3e4 100644
--- a/tools/winedump/le.c
+++ b/tools/winedump/le.c
@@ -253,7 +253,7 @@ static void dump_le_objects( const IMAGE_VXD_HEADER *le )
         if(pobj->o32_flags & 0x0001)
             printf("\tReadable\n");
         if(pobj->o32_flags & 0x0002)
-            printf("\tWriteable\n");
+            printf("\tWritable\n");
         if(pobj->o32_flags & 0x0004)
             printf("\tExecutable\n");
         if(pobj->o32_flags & 0x0008)
diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c
index 5285a86ccf8..d423d095573 100644
--- a/tools/winedump/msc.c
+++ b/tools/winedump/msc.c
@@ -843,7 +843,7 @@ int codeview_dump_symbols(const void* root, unsigned long size)
 	    break;
 
 	case S_PUB_V3:
-        /* not completly sure of those two anyway */
+        /* not completely sure of those two anyway */
 	case S_PUB_FUNC1_V3:
 	case S_PUB_FUNC2_V3:
             printf("\tS-Public%s V3 '%s' %04x:%08x type:%08x\n",
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 663a029f349..f1aa87e466d 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -285,7 +285,7 @@ static void compile(struct options* opts, const char* lang)
 
     if (gcc_defs)
     {
-#ifdef __APPLE__ /* Mac OSX uses 16-byte aligned stack and not a 4-byte one */
+#ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */
 	strarray_add(comp_args, "-D__stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))");
 	strarray_add(comp_args, "-D__cdecl=__attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__))");
 	strarray_add(comp_args, "-D_stdcall=__attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))");