diff --git a/indra/libhacd/hacdHACD.h b/indra/libhacd/hacdHACD.h
index f3e0855b8..2ca9a4ae7 100644
--- a/indra/libhacd/hacdHACD.h
+++ b/indra/libhacd/hacdHACD.h
@@ -22,7 +22,7 @@
 #include <set>
 #include <vector>
 #include <queue>
-#if defined(_WIN32) && _MSC_VER >= 1700
+#if defined(_MSC_VER) && _MSC_VER >= 1700
 #include <functional>
 #endif
 namespace HACD
diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp
index b872b83a4..7fe3311cb 100644
--- a/indra/newview/llfloaterpathfindingobjects.cpp
+++ b/indra/newview/llfloaterpathfindingobjects.cpp
@@ -397,14 +397,11 @@ void LLFloaterPathfindingObjects::addObjectToScrollList(const LLPathfindingObjec
 	}
 
 	LLScrollListItem *scrollListItem = mObjectsScrollList->addElement(rowParams);
-// Singu TODO::WIN64 
-#if !defined(_WIN64)
 	if (pObjectPtr->hasOwner() && !pObjectPtr->hasOwnerName())
 	{
-		mMissingNameObjectsScrollListItems.insert(std::make_pair<std::string, LLScrollListItem *>(pObjectPtr->getUUID().asString(), scrollListItem));
+		mMissingNameObjectsScrollListItems.insert(std::make_pair(pObjectPtr->getUUID().asString(), scrollListItem));
 		pObjectPtr->registerOwnerNameListener(boost::bind(&LLFloaterPathfindingObjects::handleObjectNameResponse, this, _1));
 	}
-#endif
 }
 
 void LLFloaterPathfindingObjects::updateControlsOnScrollListChange()