diff --git a/include/gos/freertos.h b/include/gos/freertos.h
index 3ceb279d..c9d63ec5 100644
--- a/include/gos/freertos.h
+++ b/include/gos/freertos.h
@@ -15,10 +15,10 @@
 
 #if GFX_USE_OS_FREERTOS
 
-#include "freertos/FreeRTOS.h"
-#include "config/FreeRTOSConfig.h"
-#include "freertos/semphr.h"
-#include "freertos/task.h"
+#include "FreeRTOS.h"
+#include "FreeRTOSConfig.h"
+#include "semphr.h"
+#include "task.h"
 
 /*===========================================================================*/
 /* Type definitions                                                          */
diff --git a/src/gos/freertos.c b/src/gos/freertos.c
index 9b22af1b..25166f18 100644
--- a/src/gos/freertos.c
+++ b/src/gos/freertos.c
@@ -9,13 +9,13 @@
  * @file    src/gos/freertos.c
  * @brief   GOS FreeRTOS Operating System support.
  */
-#include "heivs/config.h"
 #include "gfx.h"
-#include "heivs/delay.h"
-#include "freertos/FreeRTOS.h"
-#include "config/FreeRTOSConfig.h"
 #include <string.h>
 
+#if INCLUDE_vTaskDelay != 1
+	#error "GOS: INCLUDE_vTaskDelay must be defined in FreeRTOSConfig.h"
+#endif
+
 #if configUSE_MUTEXES != 1
 	#error "GOS: configUSE_MUTEXES must be defined in FreeRTOSConfig.h"
 #endif
@@ -26,8 +26,7 @@
 
 void _gosInit(void)
 {
-	// IMPORTANT: Check for already started scheduler here!!!
-	vTaskStartScheduler(); 
+	// The user must call vTaskStartScheduler() himself before he calls gfxInit(). 
 }
 
 void* gfxRealloc(void *ptr, size_t oldsz, size_t newsz)