diff --git a/cheevos/cheevos_locals.h b/cheevos/cheevos_locals.h
index 9f3bd08577..9431d73913 100644
--- a/cheevos/cheevos_locals.h
+++ b/cheevos/cheevos_locals.h
@@ -21,10 +21,10 @@
 
 #include "cheevos_memory.h"
 
+#include <../command.h>
+#include <../verbosity.h>
 #include <boolean.h>
-#include <command.h>
 #include <queues/task_queue.h>
-#include <verbosity.h>
 
 #ifdef HAVE_THREADS
 #include <rthreads/rthreads.h>
diff --git a/cheevos/cheevos_menu.c b/cheevos/cheevos_menu.c
index 3a6a1ce3e3..afac7afdd1 100644
--- a/cheevos/cheevos_menu.c
+++ b/cheevos/cheevos_menu.c
@@ -194,9 +194,9 @@ static rcheevos_menuitem_t* rcheevos_menu_allocate(
    {
       if (rcheevos_locals->menuitems)
       {
+         rcheevos_menuitem_t* new_menuitems;
          rcheevos_locals->menuitem_capacity += 32;
-         rcheevos_menuitem_t* new_menuitems = (rcheevos_menuitem_t*)
-               realloc(rcheevos_locals->menuitems,
+         new_menuitems = (rcheevos_menuitem_t*)realloc(rcheevos_locals->menuitems,
                        rcheevos_locals->menuitem_capacity * sizeof(rcheevos_menuitem_t));
 
          if (new_menuitems)
@@ -231,7 +231,7 @@ static rcheevos_menuitem_t* rcheevos_menu_allocate(
 
    menuitem = &rcheevos_locals->menuitems[rcheevos_locals->menuitem_count++];
    menuitem->cheevo = cheevo;
-   menuitem->state_label_idx = 0;
+   menuitem->state_label_idx = MSG_UNKNOWN;
    return menuitem;
 }