diff --git a/disk_control_interface.c b/disk_control_interface.c
index b5864f5ace..c03773b192 100644
--- a/disk_control_interface.c
+++ b/disk_control_interface.c
@@ -42,7 +42,8 @@ static void disk_control_reset_callback(
    if (!disk_control)
       return;
 
-   memset(&disk_control->cb, 0, sizeof(struct retro_disk_control_ext_callback));
+   memset(&disk_control->cb, 0,
+         sizeof(struct retro_disk_control_ext_callback));
 }
 
 /* Set v0 disk interface callback functions */
diff --git a/manual_content_scan.c b/manual_content_scan.c
index f721732148..728bb6a438 100644
--- a/manual_content_scan.c
+++ b/manual_content_scan.c
@@ -57,6 +57,7 @@ typedef struct
    char dat_file_path[PATH_MAX_LENGTH];
 } scan_settings_t;
 
+/* TODO/FIXME - static public global variables */
 /* Static settings object
  * > Provides easy access to settings parameters
  *   when creating associated menu entries
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 754db86139..61b596513b 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -111,6 +111,9 @@
 #define PL_LABEL_SPACER_RGUI    " | "
 #define PL_LABEL_SPACER_MAXLEN  8
 
+#define BYTES_TO_MB(bytes) ((bytes) / 1024 / 1024)
+#define BYTES_TO_GB(bytes) (((bytes) / 1024) / 1024 / 1024)
+
 #ifdef HAVE_NETWORKING
 #if !defined(HAVE_SOCKET_LEGACY) && (!defined(SWITCH) || defined(SWITCH) && defined(HAVE_LIBNX))
 #include <net/net_ifinfo.h>
@@ -381,9 +384,6 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
    return count;
 }
 
-#define BYTES_TO_MB(bytes) ((bytes) / 1024 / 1024)
-#define BYTES_TO_GB(bytes) (((bytes) / 1024) / 1024 / 1024)
-
 static unsigned menu_displaylist_parse_system_info(file_list_t *list)
 {
    int controller;