diff --git a/src/rcore.c b/src/rcore.c
index 595cbfe02..8b5b3bf49 100644
--- a/src/rcore.c
+++ b/src/rcore.c
@@ -2285,7 +2285,7 @@ int GetTouchPointCount(void)
 // Module Internal Functions Definition
 //----------------------------------------------------------------------------------
 
-// Platform-specific functions
+// NOTE: Functions with a platform-specific implementation on rcore_<platform>.c
 //static bool InitGraphicsDevice(int width, int height)
 
 // Set viewport for a provided width and height
diff --git a/src/rcore_android.c b/src/rcore_android.c
index 1921ed79b..4413dfa87 100644
--- a/src/rcore_android.c
+++ b/src/rcore_android.c
@@ -347,6 +347,12 @@ void ToggleFullscreen(void)
     TRACELOG(LOG_WARNING, "ToggleFullscreen() not available on target platform");
 }
 
+// Toggle borderless windowed mode
+void ToggleBorderlessWindowed(void)
+{
+    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
+}
+
 // Set window state: maximized, if resizable
 void MaximizeWindow(void)
 {
@@ -365,12 +371,6 @@ void RestoreWindow(void)
     TRACELOG(LOG_WARNING, "RestoreWindow() not available on target platform");
 }
 
-// Toggle borderless windowed mode
-void ToggleBorderlessWindowed(void)
-{
-    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
-}
-
 // Set window configuration state using flags
 void SetWindowState(unsigned int flags)
 {
diff --git a/src/rcore_desktop.c b/src/rcore_desktop.c
index 8c4b73c8c..54b684a0c 100644
--- a/src/rcore_desktop.c
+++ b/src/rcore_desktop.c
@@ -380,35 +380,6 @@ void ToggleFullscreen(void)
     if (CORE.Window.flags & FLAG_VSYNC_HINT) glfwSwapInterval(1);
 }
 
-// Set window state: maximized, if resizable
-void MaximizeWindow(void)
-{
-    if (glfwGetWindowAttrib(platform.handle, GLFW_RESIZABLE) == GLFW_TRUE)
-    {
-        glfwMaximizeWindow(platform.handle);
-        CORE.Window.flags |= FLAG_WINDOW_MAXIMIZED;
-    }
-}
-
-// Set window state: minimized
-void MinimizeWindow(void)
-{
-    // NOTE: Following function launches callback that sets appropriate flag!
-    glfwIconifyWindow(platform.handle);
-}
-
-// Set window state: not minimized/maximized
-void RestoreWindow(void)
-{
-    if (glfwGetWindowAttrib(platform.handle, GLFW_RESIZABLE) == GLFW_TRUE)
-    {
-        // Restores the specified window if it was previously iconified (minimized) or maximized
-        glfwRestoreWindow(platform.handle);
-        CORE.Window.flags &= ~FLAG_WINDOW_MINIMIZED;
-        CORE.Window.flags &= ~FLAG_WINDOW_MAXIMIZED;
-    }
-}
-
 // Toggle borderless windowed mode
 void ToggleBorderlessWindowed(void)
 {
@@ -484,6 +455,35 @@ void ToggleBorderlessWindowed(void)
     else TRACELOG(LOG_WARNING, "GLFW: Failed to find selected monitor");
 }
 
+// Set window state: maximized, if resizable
+void MaximizeWindow(void)
+{
+    if (glfwGetWindowAttrib(platform.handle, GLFW_RESIZABLE) == GLFW_TRUE)
+    {
+        glfwMaximizeWindow(platform.handle);
+        CORE.Window.flags |= FLAG_WINDOW_MAXIMIZED;
+    }
+}
+
+// Set window state: minimized
+void MinimizeWindow(void)
+{
+    // NOTE: Following function launches callback that sets appropriate flag!
+    glfwIconifyWindow(platform.handle);
+}
+
+// Set window state: not minimized/maximized
+void RestoreWindow(void)
+{
+    if (glfwGetWindowAttrib(platform.handle, GLFW_RESIZABLE) == GLFW_TRUE)
+    {
+        // Restores the specified window if it was previously iconified (minimized) or maximized
+        glfwRestoreWindow(platform.handle);
+        CORE.Window.flags &= ~FLAG_WINDOW_MINIMIZED;
+        CORE.Window.flags &= ~FLAG_WINDOW_MAXIMIZED;
+    }
+}
+
 // Set window configuration state using flags
 void SetWindowState(unsigned int flags)
 {
diff --git a/src/rcore_drm.c b/src/rcore_drm.c
index 839edeb47..459444ada 100644
--- a/src/rcore_drm.c
+++ b/src/rcore_drm.c
@@ -448,6 +448,12 @@ void ToggleFullscreen(void)
     TRACELOG(LOG_WARNING, "ToggleFullscreen() not available on target platform");
 }
 
+// Toggle borderless windowed mode
+void ToggleBorderlessWindowed(void)
+{
+    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
+}
+
 // Set window state: maximized, if resizable
 void MaximizeWindow(void)
 {
@@ -466,12 +472,6 @@ void RestoreWindow(void)
     TRACELOG(LOG_WARNING, "RestoreWindow() not available on target platform");
 }
 
-// Toggle borderless windowed mode
-void ToggleBorderlessWindowed(void)
-{
-    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
-}
-
 // Set window configuration state using flags
 void SetWindowState(unsigned int flags)
 {
diff --git a/src/rcore_template.c b/src/rcore_template.c
index b6f0ff97e..5b6507eb8 100644
--- a/src/rcore_template.c
+++ b/src/rcore_template.c
@@ -275,6 +275,12 @@ void ToggleFullscreen(void)
     TRACELOG(LOG_WARNING, "ToggleFullscreen() not available on target platform");
 }
 
+// Toggle borderless windowed mode
+void ToggleBorderlessWindowed(void)
+{
+    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
+}
+
 // Set window state: maximized, if resizable
 void MaximizeWindow(void)
 {
@@ -293,12 +299,6 @@ void RestoreWindow(void)
     TRACELOG(LOG_WARNING, "RestoreWindow() not available on target platform");
 }
 
-// Toggle borderless windowed mode
-void ToggleBorderlessWindowed(void)
-{
-    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
-}
-
 // Set window configuration state using flags
 void SetWindowState(unsigned int flags)
 {
diff --git a/src/rcore_web.c b/src/rcore_web.c
index d6af5a6de..d24ef1214 100644
--- a/src/rcore_web.c
+++ b/src/rcore_web.c
@@ -410,6 +410,12 @@ void ToggleFullscreen(void)
     CORE.Window.fullscreen = !CORE.Window.fullscreen; // Toggle fullscreen flag
 }
 
+// Toggle borderless windowed mode
+void ToggleBorderlessWindowed(void)
+{
+    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
+}
+
 // Set window state: maximized, if resizable
 void MaximizeWindow(void)
 {
@@ -428,12 +434,6 @@ void RestoreWindow(void)
     TRACELOG(LOG_WARNING, "RestoreWindow() not available on target platform");
 }
 
-// Toggle borderless windowed mode
-void ToggleBorderlessWindowed(void)
-{
-    TRACELOG(LOG_WARNING, "ToggleBorderlessWindowed() not available on target platform");
-}
-
 // Set window configuration state using flags
 void SetWindowState(unsigned int flags)
 {