diff --git a/drivers/multiple/X/gdisp_lld.c b/drivers/multiple/X/gdisp_lld.c
index 9de35b03..13368bc1 100644
--- a/drivers/multiple/X/gdisp_lld.c
+++ b/drivers/multiple/X/gdisp_lld.c
@@ -138,7 +138,7 @@ bool_t gdisp_lld_init(void)
 	char *					WindowTitleText;
 	gfxThreadHandle			hth;
 
-	#if GFX_USE_OS_POSIX
+	#if GFX_USE_OS_LINUX || GFX_USE_OS_OSX
 		XInitThreads();
 	#endif
 
@@ -206,7 +206,7 @@ bool_t gdisp_lld_init(void)
 		XCloseDisplay(dis);
 		exit(0);
 	}
-	#if GFX_USE_OS_POSIX
+	#if GFX_USE_OS_LINUX || GFX_USE_OS_OSX
 		pthread_detach(hth);
 	#endif
 	gfxThreadClose(hth);
diff --git a/drivers/multiple/X/readme.txt b/drivers/multiple/X/readme.txt
index fd2e3fc1..908fea31 100644
--- a/drivers/multiple/X/readme.txt
+++ b/drivers/multiple/X/readme.txt
@@ -11,7 +11,7 @@ and a touchscreen driver.
 	d) Optionally the following (with appropriate values):
 		#define GDISP_SCREEN_WIDTH	640
 		#define GDISP_SCREEN_HEIGHT	480
-	e) Optionally change the threading model to POSIX (instead of ChibiOS)
+	e) Optionally change the threading model to LINUX (instead of ChibiOS)
 		#define GDISP_THREAD_CHIBIOS	FALSE
 
 2. To your makefile add the following lines:
diff --git a/include/gdisp/image.h b/include/gdisp/image.h
index 32100dc9..8619cb9c 100644
--- a/include/gdisp/image.h
+++ b/include/gdisp/image.h
@@ -143,7 +143,7 @@ extern "C" {
 		bool_t gdispImageSetBaseFileStreamReader(gdispImage *img, void *BaseFileStreamPtr);
 	#endif
 
-	#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__)
+	#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__)
 		/**
 		 * @brief	Sets the io fields in the image structure to routines
 		 * 			that support reading from an image stored in Win32 simulators native
diff --git a/include/gos/chibios.h b/include/gos/chibios.h
index 14ba4b2e..aa98c645 100644
--- a/include/gos/chibios.h
+++ b/include/gos/chibios.h
@@ -6,7 +6,7 @@
  */
 
 /**
- * @file    include/gos/posix.h
+ * @file    include/gos/chibios.h
  * @brief   GOS - Operating System Support header file for ChibiOS.
  */
 
diff --git a/include/gos/osx.h b/include/gos/osx.h
index a181c2c6..fde1d005 100644
--- a/include/gos/osx.h
+++ b/include/gos/osx.h
@@ -7,7 +7,7 @@
 
 /**
  * @file    include/gos/osx.h
- * @brief   GOS - Operating System Support header file for POSIX.
+ * @brief   GOS - Operating System Support header file for Mac OS-X.
  */
 
 #ifndef _GOS_OSX_H
diff --git a/include/gwin/image.h b/include/gwin/image.h
index 00b6bf30..eae196e9 100644
--- a/include/gwin/image.h
+++ b/include/gwin/image.h
@@ -69,7 +69,7 @@ GHandle gwinImageCreate(GImageObject *widget, GWindowInit *pInit);
  */
 bool_t gwinImageOpenMemory(GHandle gh, const void* memory);
 
-#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__)
+#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__)
 	/**
 	 * @brief				Sets the input routines that support reading the image from a file
 	 * @return				TRUE if the IO open function succeeds
diff --git a/src/gdisp/image.c b/src/gdisp/image.c
index 2e56d068..aba8fe6c 100644
--- a/src/gdisp/image.c
+++ b/src/gdisp/image.c
@@ -117,7 +117,7 @@ bool_t gdispImageSetMemoryReader(gdispImage *img, const void *memimage) {
 	}
 #endif
 
-#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX
+#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX
 	#include <stdio.h>
 
 	static size_t ImageFileRead(struct gdispImageIO *pio, void *buf, size_t len) {
diff --git a/src/gwin/gimage.c b/src/gwin/gimage.c
index 64376b4b..35ca1c6d 100644
--- a/src/gwin/gimage.c
+++ b/src/gwin/gimage.c
@@ -159,7 +159,7 @@ bool_t gwinImageOpenMemory(GHandle gh, const void* memory) {
 	return TRUE;
 }
 
-#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_POSIX || defined(__DOXYGEN__)
+#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX || defined(__DOXYGEN__)
 bool_t gwinImageOpenFile(GHandle gh, const char* filename) {
 	if (gdispImageIsOpen(&widget(gh)->image))
 		gdispImageClose(&widget(gh)->image);