clean up autoconf of unordered_xx, prepare change to shared_ptr

src/utils/refcntr.h

@@ -2,6 +2,7 @@
 #define _REFCNTR_H_
 
 // See Stroustrup C++ 3rd ed, p. 783
+// This is only used if std::shared_ptr is not available
 template <class X> class RefCntr {
     X   *rep;
     int *pcount;

src/utils/smallut.cpp

@@ -16,9 +16,8 @@
  */
 
 #ifndef TEST_SMALLUT
-#ifdef HAVE_CONFIG_H
 #include "autoconfig.h"
-#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -34,14 +33,16 @@
 #include <string>
 #include <iostream>
 #include <list>
-#include "unordered_defs.h"
-using namespace std;
+#include UNORDERED_MAP_INCLUDE
+#include UNORDERED_SET_INCLUDE
 
 #include "smallut.h"
 #include "utf8iter.h"
 #include "hldata.h"
 #include "cstr.h"
 
+using namespace std;
+
 void map_ss_cp_noshr(const map<string,string> s, map<string,string> *d)
 {
     for (map<string,string>::const_iterator it= s.begin();