diff --git a/Qt/Debugger/ctrldisasmview.cpp b/Qt/Debugger/ctrldisasmview.cpp
index 7fbe3c4bea..931fc84ed6 100644
--- a/Qt/Debugger/ctrldisasmview.cpp
+++ b/Qt/Debugger/ctrldisasmview.cpp
@@ -200,17 +200,17 @@ void CtrlDisAsmView::RunToHere()
 
 void CtrlDisAsmView::RenameFunction()
 {
-    u32 funcBegin = symbolMap.GetFunctionStart(curAddress);
+    u32 funcBegin = g_symbolMap->GetFunctionStart(curAddress);
     if (funcBegin != (u32)-1)
     {
-        QString name = QString::fromStdString(symbolMap.GetLabelString(funcBegin));
+        QString name = QString::fromStdString(g_symbolMap->GetLabelString(funcBegin));
         bool ok;
         QString newname = QInputDialog::getText(this, tr("New function name"),
                                     tr("New function name:"), QLineEdit::Normal,
                                     name, &ok);
         if (ok && !newname.isEmpty())
         {
-            symbolMap.SetLabelName(newname.toStdString().c_str(),funcBegin);
+            g_symbolMap->SetLabelName(newname.toStdString().c_str(),funcBegin);
             redraw();
             parentWindow->NotifyMapLoaded();
         }
diff --git a/Qt/Debugger/ctrlmemview.cpp b/Qt/Debugger/ctrlmemview.cpp
index 3316169667..65079a0a04 100644
--- a/Qt/Debugger/ctrlmemview.cpp
+++ b/Qt/Debugger/ctrlmemview.cpp
@@ -147,13 +147,13 @@ void CtrlMemView::paintEvent(QPaintEvent *)
 				{
 /*					textPen.setColor(0x0000FF);
 					painter.setPen(textPen);
-					int fn = symbolMap.GetSymbolNum(address);
+					int fn = g_symbolMap->GetSymbolNum(address);
 					if (fn==-1)
 					{
 						sprintf(temp, "%s (ns)", Memory::GetAddressName(address));
 					}
 					else
-						sprintf(temp, "%s (0x%x b)", symbolMap.GetSymbolName(fn),symbolMap.GetSymbolSize(fn));
+						sprintf(temp, "%s (0x%x b)", g_symbolMap->GetSymbolName(fn),g_symbolMap->GetSymbolSize(fn));
 					painter.drawText(205,rowY1 - 2 + rowHeight, temp);
 
 					textPen.setColor(0xFF000000);
@@ -162,16 +162,16 @@ void CtrlMemView::paintEvent(QPaintEvent *)
 					if (align==4)
 					{
 						u32 value = Memory::ReadUnchecked_U32(address);
-						int symbolnum = symbolMap.GetSymbolNum(value);
+						int symbolnum = g_symbolMap->GetSymbolNum(value);
 						if(symbolnum>=0)
-							sprintf(temp, "%08x [%s]", value, symbolMap.GetSymbolName(symbolnum));
+							sprintf(temp, "%08x [%s]", value, g_symbolMap->GetSymbolName(symbolnum));
 					}
 					else if (align==2)
 					{
 						u16 value = Memory::ReadUnchecked_U16(address);
-						int symbolnum = symbolMap.GetSymbolNum(value);
+						int symbolnum = g_symbolMap->GetSymbolNum(value);
 						if(symbolnum>=0)
-							sprintf(temp, "%04x [%s]", value, symbolMap.GetSymbolName(symbolnum));
+							sprintf(temp, "%04x [%s]", value, g_symbolMap->GetSymbolName(symbolnum));
 					}
 
                     painter.drawText(85,rowY1 - 2 + rowHeight, temp);*/
diff --git a/Qt/Debugger/debugger_disasm.cpp b/Qt/Debugger/debugger_disasm.cpp
index 59276c0080..f8e585e23d 100644
--- a/Qt/Debugger/debugger_disasm.cpp
+++ b/Qt/Debugger/debugger_disasm.cpp
@@ -286,7 +286,7 @@ void Debugger_Disasm::FillFunctions()
 	item->setData(Qt::UserRole, 0x02000000);
 	ui->FuncList->addItem(item);
 
-    std::vector<SymbolEntry> symbols = symbolMap.GetAllSymbols(ST_FUNCTION);
+    std::vector<SymbolEntry> symbols = g_symbolMap->GetAllSymbols(ST_FUNCTION);
     for(int i = 0; i < (int)symbols.size(); i++)
     {
         QListWidgetItem* item = new QListWidgetItem();
diff --git a/Qt/Debugger/debugger_memory.cpp b/Qt/Debugger/debugger_memory.cpp
index d6eeb36b60..706fd8dcfd 100644
--- a/Qt/Debugger/debugger_memory.cpp
+++ b/Qt/Debugger/debugger_memory.cpp
@@ -59,7 +59,7 @@ void Debugger_Memory::NotifyMapLoaded()
 	item->setData(Qt::UserRole, 0x80000000);
 	ui->symbols->addItem(item);
 
-    std::vector<SymbolEntry> symbols = symbolMap.GetAllSymbols(ST_DATA);
+    std::vector<SymbolEntry> symbols = g_symbolMap->GetAllSymbols(ST_DATA);
     for(int i = 0; i < (int)symbols.size(); i++)
     {
         QListWidgetItem* item = new QListWidgetItem();