--- a/src/common/textsplit.cpp
+++ b/src/common/textsplit.cpp
@@ -23,17 +23,15 @@
#include <iostream>
#include <string>
#include <algorithm>
-#include <tr1/unordered_set>
#include <cstring>
+#include "unordered_defs.h"
+using namespace std;
#include "textsplit.h"
#include "debuglog.h"
//#define UTF8ITER_CHECK
#include "utf8iter.h"
#include "uproplist.h"
-
-using std::tr1::unordered_set;
-using namespace std;
/**
@@ -60,9 +58,9 @@
// of Unicode properties, but seems to do the job well enough in most
// common cases
static vector<unsigned int> vpuncblocks;
-static unordered_set<unsigned int> spunc;
-static unordered_set<unsigned int> visiblewhite;
-static unordered_set<unsigned int> sskip;
+static STD_UNORDERED_SET<unsigned int> spunc;
+static STD_UNORDERED_SET<unsigned int> visiblewhite;
+static STD_UNORDERED_SET<unsigned int> sskip;
class CharClassInit {
public: