clean up autoconf of unordered_xx, prepare change to shared_ptr

src/rcldb/rclabstract.cpp

@@ -19,9 +19,6 @@
 #include <math.h>
 
 #include <map>
-#include "unordered_defs.h"
-
-using namespace std;
 
 #include "debuglog.h"
 #include "rcldb.h"
@@ -33,6 +30,8 @@ using namespace std;
 #include "utf8iter.h"
 #include "hldata.h"
 
+using namespace std;
+
 namespace Rcl {
 // This is used as a marker inside the abstract frag lists, but
 // normally doesn't remain in final output (which is built with a

src/rcldb/rclquery.cpp

@@ -14,6 +14,7 @@
  *   Free Software Foundation, Inc.,
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
+#include "autoconfig.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -21,7 +22,6 @@
 
 #include <vector>
 #include <sstream>
-using namespace std;
 
 #include "xapian.h"
 
@@ -37,6 +37,8 @@ using namespace std;
 #include "searchdata.h"
 #include "unacpp.h"
 
+using namespace std;
+
 namespace Rcl {
 // This is used as a marker inside the abstract frag lists, but
 // normally doesn't remain in final output (which is built with a