diff --git a/src/rcore.c b/src/rcore.c
index 1d9c5a6b0..bd6bec9c5 100644
--- a/src/rcore.c
+++ b/src/rcore.c
@@ -297,10 +297,9 @@ static bool eventsRecording = false;    // Record events
 // Module specific Functions Declaration
 //----------------------------------------------------------------------------------
 
-
 #if defined(SUPPORT_MODULE_RTEXT) && defined(SUPPORT_DEFAULT_FONT)
-static void LoadFontDefault(void);          // [Module: text] Loads default font on InitWindow()
-static void UnloadFontDefault(void);        // [Module: text] Unloads default font from GPU memory
+extern void LoadFontDefault(void);          // [Module: text] Loads default font on InitWindow()
+extern void UnloadFontDefault(void);        // [Module: text] Unloads default font from GPU memory
 #endif
 
 static void InitTimer(void);                            // Initialize timer (hi-resolution if available)
diff --git a/src/rcore_desktop.c b/src/rcore_desktop.c
index 6ddef86b9..758794641 100644
--- a/src/rcore_desktop.c
+++ b/src/rcore_desktop.c
@@ -1,12 +1,12 @@
-#include <stdlib.h>
-
-#include "rcore.h"
+#include "raylib.h"
 
 #define GLFW_INCLUDE_NONE       // Disable the standard OpenGL header inclusion on GLFW3
                                 // NOTE: Already provided by rlgl implementation (on glad.h)
 #include "GLFW/glfw3.h"         // GLFW3 library: Windows, OpenGL context and Input management
                                 // NOTE: GLFW3 already includes gl.h (OpenGL) headers
 
+extern CoreData CORE;               // Global CORE state context
+
 // Support retrieving native window handlers
 #if defined(_WIN32)
     typedef void *PVOID;
@@ -1173,19 +1173,22 @@ void *GetWindowHandle(void)
 // Get number of monitors
 int GetMonitorCount(void)
 {
-    int monitorCount;
+    int monitorCount = 0;
+
     glfwGetMonitors(&monitorCount);
+
     return monitorCount;
 }
+
 // Get number of monitors
 int GetCurrentMonitor(void)
 {
     int index = 0;
-    int monitorCount;
+    int monitorCount = 0;
     GLFWmonitor **monitors = glfwGetMonitors(&monitorCount);
     GLFWmonitor *monitor = NULL;
 
-    if (monitorCount > 1)
+    if (monitorCount >= 1)
     {
         if (IsWindowFullscreen())
         {
@@ -1216,6 +1219,7 @@ int GetCurrentMonitor(void)
                 monitor = monitors[i];
                 glfwGetMonitorPos(monitor, &mx, &my);
                 const GLFWvidmode *mode = glfwGetVideoMode(monitor);
+
                 if (mode)
                 {
                     const int width = mode->width;
@@ -1234,6 +1238,8 @@ int GetCurrentMonitor(void)
             }
         }
     }
+
+    return index;
 }
 
 // Get selected monitor position
@@ -1256,7 +1262,7 @@ Vector2 GetMonitorPosition(int monitor)
 // Get selected monitor width (currently used by monitor)
 int GetMonitorWidth(int monitor)
 {
-    int monitorCount;
+    int monitorCount = 0;
     GLFWmonitor **monitors = glfwGetMonitors(&monitorCount);
 
     if ((monitor >= 0) && (monitor < monitorCount))
@@ -1267,6 +1273,7 @@ int GetMonitorWidth(int monitor)
         else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
     }
     else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor");
+
     return 0;
 }