3 files changed, 7 insertions, 7 deletions
diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c
index 09d46304..5891de4f 100644
--- a/demos/modules/gdisp/images_animated/main.c
+++ b/demos/modules/gdisp/images_animated/main.c
@@ -55,7 +55,7 @@ static gdispImage myImage;
  */
 int main(void) {
 	gCoord			swidth, sheight, errx, erry, errcx, errcy;
-	delaytime_t		delay;
+	gDelay		delay;
 
 	gfxInit();		// Initialize the display
 
diff --git a/demos/modules/gos/threads/main.c b/demos/modules/gos/threads/main.c
index 56ea4bb9..4ef81411 100644
--- a/demos/modules/gos/threads/main.c
+++ b/demos/modules/gos/threads/main.c
@@ -22,7 +22,7 @@
 	#error "--"
 #endif
 
-threadreturn_t heartbeat1(void* param)
+gThreadreturn heartbeat1(void* param)
 {
     (void)param;
 
@@ -31,10 +31,10 @@ threadreturn_t heartbeat1(void* param)
         gfxSleepMilliseconds(500);
     }
 
-    return (threadreturn_t)0;
+    return (gThreadreturn)0;
 }
 
-threadreturn_t heartbeat2(void* param)
+gThreadreturn heartbeat2(void* param)
 {
     (void)param;
 
@@ -43,7 +43,7 @@ threadreturn_t heartbeat2(void* param)
         gfxSleepMilliseconds(900);
     }
 
-    return (threadreturn_t)0;
+    return (gThreadreturn)0;
 }
 
 int main(void)
diff --git a/demos/modules/gos/threads_advanced/main.c b/demos/modules/gos/threads_advanced/main.c
index 8527194e..0ae8649c 100644
--- a/demos/modules/gos/threads_advanced/main.c
+++ b/demos/modules/gos/threads_advanced/main.c
@@ -63,7 +63,7 @@ gfxThreadHandle		thd;
  * Thread function
  * Prints a message
  */
-threadreturn_t Thread_function(void* param)
+gThreadreturn Thread_function(void* param)
 {	
 	/* Cast the paramter into a gBool pointer so we can use it */
 	gBool* doExit = (gBool*)param;
@@ -75,7 +75,7 @@ threadreturn_t Thread_function(void* param)
 	}
 
 	/* Don't return anything */
-	return (threadreturn_t)0;
+	return (gThreadreturn)0;
 }
 
 /*