222 files changed, 100 insertions, 202 deletions

diff --git a/Makefile b/Makefile
index 0b7716f..42218f0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,85 @@
 # terms of the license contained in the file LICENSE.
 #
 
-.PHONY: build
+OBJECTS := $(patsubst %.cpp,%.o,$(wildcard src/stable/*.cpp src/unstable/*.cpp src/experimental/*.cpp))
+HEADERS := bu/signals.h bu/autoconfig.h bu/version.h bu/config.h $(foreach fn,$(wildcard src/stable/*.h src/unstable/*.h src/experimental/*.h),bu/$(notdir ${fn})) $(patsubst src/%,bu/%,$(wildcard src/compat/*.h))
+TOOLS := $(patsubst src/tools/%.cpp,%,$(wildcard src/tools/*.cpp))
+UNITS := $(patsubst src/unit/%.unit,unit/%,$(wildcard src/unit/*.unit))
+TESTS := $(patsubst src/tests/%.cpp,tests/%,$(wildcard src/tests/*.cpp))
+
+.PHONY: default all headers clean tests
+
+default: libbu++.a tools
+
+all: default tests
+
+tests: ${UNITS} ${TESTS}
+
+clean:
+        -rm ${HEADERS} ${OBJECTS} libbu++.a ${TOOLS} ${UNITS} ${TESTS}
+
+bu/signals.h bu/config.h bu/autoconfig.h bu/version.h: bu/%: src/%
+        ln -s ../$< $@
+
+$(foreach fn,$(wildcard src/stable/*.h),bu/$(notdir ${fn})): bu/%: src/stable/%
+        ln -s ../$< $@
+
+$(foreach fn,$(wildcard src/unstable/*.h),bu/$(notdir ${fn})): bu/%: src/unstable/%
+        ln -s ../$< $@
+
+$(foreach fn,$(wildcard src/experimental/*.h),bu/$(notdir ${fn})): bu/%: src/experimental/%
+        ln -s ../$< $@
+
+$(patsubst src/%,bu/%,$(wildcard src/compat/*.h)): bu/%: src/%
+        ln -s ../../$< $@
+
+autoconfig: autoconfig.cpp
+        ${CXX} -o autoconfig autoconfig.cpp
+
+src/autoconfig.h src/version.h: autoconfig
+        ./autoconfig $@
+
+src/signals.h: signals-pregen.h
+        cp $< $@
+
+headers: ${HEADERS}
+
+tools: ${TOOLS}
+
+${TOOLS}: %: src/tools/%.cpp libbu++.a
+
+$(filter-out viewcsv bin2cpp,${TOOLS}):
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++
+
+viewcsv:
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lncurses
+
+bin2cpp:
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2 -lz -llzma
+
+${OBJECTS}: %.o: %.cpp
+        g++ -ggdb -W -Wall -I. $< -c -o $@
+
+$(patsubst %,src/%.cpp,${UNITS}): %.cpp: %.unit mkunit
+        ./mkunit $< $@
+
+${UNITS}: %: src/%.cpp
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++
+
+${TESTS}: %: src/%.cpp
+
+$(filter-out tests/bzip2 tests/deflate tests/lzma,${TESTS}):
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++
+
+tests/bzip2:
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lbz2
+
+tests/deflate:
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -lz
+
+tests/lzma:
+        g++ -ggdb -W -Wall -I. -L. $< -o $@ -lbu++ -llzma
+
+libbu++.a: ${HEADERS} ${OBJECTS}
+        ar -r libbu++.a ${OBJECTS}
 
-build:
-        build
diff --git a/default.bld b/default.bld
index ce0ea80..831959e 100644
--- a/default.bld
+++ b/default.bld
@@ -73,8 +73,22 @@ target "autoconfig"
         input "autoconfig.cpp";
 }
 
-target [files("src/*.h").replace("src/", "bu/"), "bu/autoconfig.h",
-        "bu/version.h", "bu/signals.h"]
+for base in ["stable", "unstable", "experimental"] do
+{
+        target files("src/${base}/*.h").replace("src/${base}/", "bu/")
+        {
+                tag "header-links";
+                display "symlink";
+                input OUTPUT.replace("bu/","src/${base}/");
+                profile "build"
+                {
+                        DIR = OUTPUT.dirName();
+                        execute("mkdir -p ${DIR}; ln -s ../${INPUT} ${OUTPUT}");
+                }
+        }
+}
+
+target ["bu/config.h", "bu/autoconfig.h", "bu/version.h", "bu/signals.h"]
 {
         tag "header-links";
         display "symlink";
@@ -110,7 +124,8 @@ target "header-links"
 
 target "libbu++.a"
 {
-        input files("src/*.cpp", "src/compat/*.cpp");
+        input files("src/stable/*.cpp", "src/unstable/*.cpp",
+                "src/experimental/*.cpp", "src/compat/*.cpp");
         rule "lib";
         CXXFLAGS += "-I. -fPIC";
 }
diff --git a/src/cache.cpp b/src/experimental/cache.cpp
index 52bd9fc..52bd9fc 100644
--- a/src/cache.cpp
+++ b/src/experimental/cache.cpp
diff --git a/src/cache.h b/src/experimental/cache.h
index 455cf1b..455cf1b 100644
--- a/src/cache.h
+++ b/src/experimental/cache.h
diff --git a/src/cachecalc.cpp b/src/experimental/cachecalc.cpp
index 7b8a10a..7b8a10a 100644
--- a/src/cachecalc.cpp
+++ b/src/experimental/cachecalc.cpp
diff --git a/src/cachecalc.h b/src/experimental/cachecalc.h
index 89cfadc..89cfadc 100644
--- a/src/cachecalc.h
+++ b/src/experimental/cachecalc.h
diff --git a/src/cachestore.cpp b/src/experimental/cachestore.cpp
index af49548..af49548 100644
--- a/src/cachestore.cpp
+++ b/src/experimental/cachestore.cpp
diff --git a/src/cachestore.h b/src/experimental/cachestore.h
index d0d91a2..d0d91a2 100644
--- a/src/cachestore.h
+++ b/src/experimental/cachestore.h
diff --git a/src/cachestorefiles.cpp b/src/experimental/cachestorefiles.cpp
index 66ce672..66ce672 100644
--- a/src/cachestorefiles.cpp
+++ b/src/experimental/cachestorefiles.cpp
diff --git a/src/cachestorefiles.h b/src/experimental/cachestorefiles.h
index 10b2c1b..10b2c1b 100644
--- a/src/cachestorefiles.h
+++ b/src/experimental/cachestorefiles.h
diff --git a/src/cachestoremyriad.cpp b/src/experimental/cachestoremyriad.cpp
index 9d00dce..9d00dce 100644
--- a/src/cachestoremyriad.cpp
+++ b/src/experimental/cachestoremyriad.cpp
diff --git a/src/cachestoremyriad.h b/src/experimental/cachestoremyriad.h
index e632a82..e632a82 100644
--- a/src/cachestoremyriad.h
+++ b/src/experimental/cachestoremyriad.h
diff --git a/src/fastcgi.cpp b/src/experimental/fastcgi.cpp
index 2f9161e..2f9161e 100644
--- a/src/fastcgi.cpp
+++ b/src/experimental/fastcgi.cpp
diff --git a/src/fastcgi.h b/src/experimental/fastcgi.h
index d290c40..d290c40 100644
--- a/src/fastcgi.h
+++ b/src/experimental/fastcgi.h
diff --git a/src/httpget.cpp b/src/experimental/httpget.cpp
index 99492a2..99492a2 100644
--- a/src/httpget.cpp
+++ b/src/experimental/httpget.cpp
diff --git a/src/httpget.h b/src/experimental/httpget.h
index a58e8ac..a58e8ac 100644
--- a/src/httpget.h
+++ b/src/experimental/httpget.h
diff --git a/src/lexer.cpp b/src/experimental/lexer.cpp
index 185456a..185456a 100644
--- a/src/lexer.cpp
+++ b/src/experimental/lexer.cpp
diff --git a/src/lexer.h b/src/experimental/lexer.h
index b057692..b057692 100644
--- a/src/lexer.h
+++ b/src/experimental/lexer.h
diff --git a/src/parser.cpp b/src/experimental/parser.cpp
index 4d9f793..4d9f793 100644
--- a/src/parser.cpp
+++ b/src/experimental/parser.cpp
diff --git a/src/parser.h b/src/experimental/parser.h
index a168c7b..a168c7b 100644
--- a/src/parser.h
+++ b/src/experimental/parser.h
diff --git a/src/random.cpp b/src/experimental/random.cpp
index e69de29..e69de29 100644
--- a/src/random.cpp
+++ b/src/experimental/random.cpp
diff --git a/src/random.h b/src/experimental/random.h
index e69de29..e69de29 100644
--- a/src/random.h
+++ b/src/experimental/random.h
diff --git a/src/randombase.cpp b/src/experimental/randombase.cpp
index e69de29..e69de29 100644
--- a/src/randombase.cpp
+++ b/src/experimental/randombase.cpp
diff --git a/src/randombase.h b/src/experimental/randombase.h
index e69de29..e69de29 100644
--- a/src/randombase.h
+++ b/src/experimental/randombase.h
diff --git a/src/randombasic.cpp b/src/experimental/randombasic.cpp
index e69de29..e69de29 100644
--- a/src/randombasic.cpp
+++ b/src/experimental/randombasic.cpp
diff --git a/src/randombasic.h b/src/experimental/randombasic.h
index e69de29..e69de29 100644
--- a/src/randombasic.h
+++ b/src/experimental/randombasic.h
diff --git a/src/regex.cpp b/src/experimental/regex.cpp
index af0d364..af0d364 100644
--- a/src/regex.cpp
+++ b/src/experimental/regex.cpp
diff --git a/src/regex.h b/src/experimental/regex.h
index f0aa5d5..f0aa5d5 100644
--- a/src/regex.h
+++ b/src/experimental/regex.h
diff --git a/src/regexengine.cpp b/src/experimental/regexengine.cpp
index 72bc381..72bc381 100644
--- a/src/regexengine.cpp
+++ b/src/experimental/regexengine.cpp
diff --git a/src/regexengine.h b/src/experimental/regexengine.h
index ec181c1..ec181c1 100644
--- a/src/regexengine.h
+++ b/src/experimental/regexengine.h
diff --git a/src/xmlreader.cpp b/src/experimental/xmlreader.cpp
index ba7fb3d..ba7fb3d 100644
--- a/src/xmlreader.cpp
+++ b/src/experimental/xmlreader.cpp
diff --git a/src/xmlreader.h b/src/experimental/xmlreader.h
index 7cb44c9..7cb44c9 100644
--- a/src/xmlreader.h
+++ b/src/experimental/xmlreader.h
diff --git a/src/linkmessage.cpp b/src/linkmessage.cpp
deleted file mode 100644
index cd024c0..0000000
--- a/src/linkmessage.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-
-#include "bu/linkmessage.h"
-
-Bu::LinkMessage::LinkMessage( int nNewMsg )
-{
-        nMsg = nNewMsg;
-}
-
-Bu::LinkMessage::~LinkMessage()
-{
-}
-
-/*
-void LinkMessage::setBroadcast( bool bOn )
-{
-        bBroadcast = bOn;
-}
-
-bool LinkMessage::isBroadcast()
-{
-        return bBroadcast;
-}
-
-
-void LinkMessage::setFromID( int id )
-{
-        nFromLinkID = id;
-}
-
-int LinkMessage::getFromID()
-{
-        return nFromLinkID;
-}
-
-void LinkMessage::setToID( int id )
-{
-        nTargetLinkID = id;
-}
-
-int LinkMessage::getToID()
-{
-        return nTargetLinkID;
-}
-*/
diff --git a/src/linkmessage.h b/src/linkmessage.h
deleted file mode 100644
index 69423b3..0000000
--- a/src/linkmessage.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-
-/**\file linkmessage.h
- */
-
-#ifndef BU_LINKMESSAGE_H
-#define BU_LINKMESSAGE_H
-
-namespace Bu
-{
-        /**
-         * A message to be broadcast accross ProgramLinks in a ProgramChain.  Generally
-         * one would make a subclass of this in order to transmit more useful
-         * information, but sometimes it isn't necesarry.
-         */
-        class LinkMessage
-        {
-        public:
-                /**
-                 * Construct a blank LinkMessage.
-                 */
-                LinkMessage() {};
-
-                /**
-                 * Deconstruct a LinkMessage.
-                 */
-                virtual ~LinkMessage();
-                
-                /**
-                 * Create a LinkMessage object with a specific message assosiated with it
-                 * to start with.
-                 *@param nNewMsg The message to use in the Message object.
-                 */
-                LinkMessage( int nNewMsg );
-
-                /**
-                 * The message contained in the Message object.
-                 */
-                int nMsg;
-        };
-}
-
-#endif
diff --git a/src/set.cpp b/src/set.cpp
deleted file mode 100644
index e4e2849..0000000
--- a/src/set.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-
-#include "bu/set.h"
-
-namespace Bu { subExceptionDef( SetException ) }
-
diff --git a/src/set.h b/src/set.h
deleted file mode 100644
index ac8dbd5..0000000
--- a/src/set.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2007-2011 Xagasoft, All rights reserved.
- *
- * This file is part of the libbu++ library and is released under the
- * terms of the license contained in the file LICENSE.
- */
-
-#ifndef BU_SET_H
-#define BU_SET_H
-
-#include <stddef.h>
-#include <string.h>
-#include <memory>
-#include <iostream>
-#include <list>
-#include <utility>
-#include "bu/exceptionbase.h"
-#include "bu/list.h"
-#include "bu/archive.h"
-
-#define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0))
-
-namespace Bu
-{
-        subExceptionDecl( SetException )
-
-        /**
-         *@todo Set should be rewritten, possibly using a b-tree as ordered storage
-         * in the backend.  It should use either a b-tree or array for storage and
-         * allow set intersections, unions, etc.
-         *@param key (typename) The datatype of the hashtable keys
-         *@param sizecalc (typename) Functor to compute new table size on rehash
-         *@param keyalloc (typename) Memory allocator for hashtable keys
-         *@param challoc (typename) Byte allocator for bitflags
-         *@ingroup Containers
-         */
-        template<typename key, typename sizecalc, typename keyalloc, typename challoc >
-        class Set
-        {
-        public:
-        };
-}
-
-#endif
diff --git a/src/archival.cpp b/src/stable/archival.cpp
index 687e8a3..687e8a3 100644
--- a/src/archival.cpp
+++ b/src/stable/archival.cpp
diff --git a/src/archival.h b/src/stable/archival.h
index 946167a..946167a 100644
--- a/src/archival.h
+++ b/src/stable/archival.h
diff --git a/src/archive.cpp b/src/stable/archive.cpp
index d300a87..d300a87 100644
--- a/src/archive.cpp
+++ b/src/stable/archive.cpp
diff --git a/src/archive.h b/src/stable/archive.h
index 61474a4..61474a4 100644
--- a/src/archive.h
+++ b/src/stable/archive.h
diff --git a/src/archivebase.cpp b/src/stable/archivebase.cpp
index d00b1a5..d00b1a5 100644
--- a/src/archivebase.cpp
+++ b/src/stable/archivebase.cpp
diff --git a/src/archivebase.h b/src/stable/archivebase.h
index 4745d91..4745d91 100644
--- a/src/archivebase.h
+++ b/src/stable/archivebase.h
diff --git a/src/array.cpp b/src/stable/array.cpp
index b776fed..b776fed 100644
--- a/src/array.cpp
+++ b/src/stable/array.cpp
diff --git a/src/array.h b/src/stable/array.h
index fcd800e..fcd800e 100644
--- a/src/array.h
+++ b/src/stable/array.h
diff --git a/src/atom.cpp b/src/stable/atom.cpp
index 3c77b90..3c77b90 100644
--- a/src/atom.cpp
+++ b/src/stable/atom.cpp
diff --git a/src/atom.h b/src/stable/atom.h
index fd88f2d..fd88f2d 100644
--- a/src/atom.h
+++ b/src/stable/atom.h
diff --git a/src/base64.cpp b/src/stable/base64.cpp
index 4d659f0..4d659f0 100644
--- a/src/base64.cpp
+++ b/src/stable/base64.cpp
diff --git a/src/base64.h b/src/stable/base64.h
index c081ac1..c081ac1 100644
--- a/src/base64.h
+++ b/src/stable/base64.h
diff --git a/src/buffer.cpp b/src/stable/buffer.cpp
index 47fab70..47fab70 100644
--- a/src/buffer.cpp
+++ b/src/stable/buffer.cpp
diff --git a/src/buffer.h b/src/stable/buffer.h
index 91ec9c2..91ec9c2 100644
--- a/src/buffer.h
+++ b/src/stable/buffer.h
diff --git a/src/bzip2.cpp b/src/stable/bzip2.cpp
index ca007b0..ca007b0 100644
--- a/src/bzip2.cpp
+++ b/src/stable/bzip2.cpp
diff --git a/src/bzip2.h b/src/stable/bzip2.h
index 9a8d172..9a8d172 100644
--- a/src/bzip2.h
+++ b/src/stable/bzip2.h
diff --git a/src/client.cpp b/src/stable/client.cpp
index 75f6158..75f6158 100644
--- a/src/client.cpp
+++ b/src/stable/client.cpp
diff --git a/src/client.h b/src/stable/client.h
index 119c2c1..119c2c1 100644
--- a/src/client.h
+++ b/src/stable/client.h
diff --git a/src/clientlink.cpp b/src/stable/clientlink.cpp
index ce8b2cb..ce8b2cb 100644
--- a/src/clientlink.cpp
+++ b/src/stable/clientlink.cpp
diff --git a/src/clientlink.h b/src/stable/clientlink.h
index e4618e7..e4618e7 100644
--- a/src/clientlink.h
+++ b/src/stable/clientlink.h
diff --git a/src/clientlinkfactory.cpp b/src/stable/clientlinkfactory.cpp
index f48e11e..f48e11e 100644
--- a/src/clientlinkfactory.cpp
+++ b/src/stable/clientlinkfactory.cpp
diff --git a/src/clientlinkfactory.h b/src/stable/clientlinkfactory.h
index 21d3363..21d3363 100644
--- a/src/clientlinkfactory.h
+++ b/src/stable/clientlinkfactory.h
diff --git a/src/condition.cpp b/src/stable/condition.cpp
index 2f55ce2..2f55ce2 100644
--- a/src/condition.cpp
+++ b/src/stable/condition.cpp
diff --git a/src/condition.h b/src/stable/condition.h
index 71634f5..71634f5 100644
--- a/src/condition.h
+++ b/src/stable/condition.h
diff --git a/src/conduit.cpp b/src/stable/conduit.cpp
index c9ccdc4..c9ccdc4 100644
--- a/src/conduit.cpp
+++ b/src/stable/conduit.cpp
diff --git a/src/conduit.h b/src/stable/conduit.h
index 9babaaf..9babaaf 100644
--- a/src/conduit.h
+++ b/src/stable/conduit.h
diff --git a/src/crypt.cpp b/src/stable/crypt.cpp
index eb87479..eb87479 100644
--- a/src/crypt.cpp
+++ b/src/stable/crypt.cpp
diff --git a/src/crypt.h b/src/stable/crypt.h
index a94402a..a94402a 100644
--- a/src/crypt.h
+++ b/src/stable/crypt.h
diff --git a/src/cryptohash.cpp b/src/stable/cryptohash.cpp
index ddd293c..ddd293c 100644
--- a/src/cryptohash.cpp
+++ b/src/stable/cryptohash.cpp
diff --git a/src/cryptohash.h b/src/stable/cryptohash.h
index bc5435f..bc5435f 100644
--- a/src/cryptohash.h
+++ b/src/stable/cryptohash.h
diff --git a/src/csvreader.cpp b/src/stable/csvreader.cpp
index 4da7883..4da7883 100644
--- a/src/csvreader.cpp
+++ b/src/stable/csvreader.cpp
diff --git a/src/csvreader.h b/src/stable/csvreader.h
index 2e9e7b0..2e9e7b0 100644
--- a/src/csvreader.h
+++ b/src/stable/csvreader.h
diff --git a/src/csvwriter.cpp b/src/stable/csvwriter.cpp
index d8910aa..d8910aa 100644
--- a/src/csvwriter.cpp
+++ b/src/stable/csvwriter.cpp
diff --git a/src/csvwriter.h b/src/stable/csvwriter.h
index 4291ed5..4291ed5 100644
--- a/src/csvwriter.h
+++ b/src/stable/csvwriter.h
diff --git a/src/deflate.cpp b/src/stable/deflate.cpp
index 704d172..704d172 100644
--- a/src/deflate.cpp
+++ b/src/stable/deflate.cpp
diff --git a/src/deflate.h b/src/stable/deflate.h
index f835cfc..f835cfc 100644
--- a/src/deflate.h
+++ b/src/stable/deflate.h
diff --git a/src/exceptionbase.cpp b/src/stable/exceptionbase.cpp
index 13a98db..13a98db 100644
--- a/src/exceptionbase.cpp
+++ b/src/stable/exceptionbase.cpp
diff --git a/src/exceptionbase.h b/src/stable/exceptionbase.h
index b6ad9ca..b6ad9ca 100644
--- a/src/exceptionbase.h
+++ b/src/stable/exceptionbase.h
diff --git a/src/extratypes.h b/src/stable/extratypes.h
index 656cd6d..656cd6d 100644
--- a/src/extratypes.h
+++ b/src/stable/extratypes.h
diff --git a/src/file.cpp b/src/stable/file.cpp
index 8c8f540..8c8f540 100644
--- a/src/file.cpp
+++ b/src/stable/file.cpp
diff --git a/src/file.h b/src/stable/file.h
index e3225fa..e3225fa 100644
--- a/src/file.h
+++ b/src/stable/file.h
diff --git a/src/filter.cpp b/src/stable/filter.cpp
index 3fe8f0e..3fe8f0e 100644
--- a/src/filter.cpp
+++ b/src/stable/filter.cpp
diff --git a/src/filter.h b/src/stable/filter.h
index 2c57805..2c57805 100644
--- a/src/filter.h
+++ b/src/stable/filter.h
diff --git a/src/fmt.h b/src/stable/fmt.h
index 15d8efc..15d8efc 100644
--- a/src/fmt.h
+++ b/src/stable/fmt.h
diff --git a/src/formatter.cpp b/src/stable/formatter.cpp
index f275d71..f275d71 100644
--- a/src/formatter.cpp
+++ b/src/stable/formatter.cpp
diff --git a/src/formatter.h b/src/stable/formatter.h
index a440ec3..a440ec3 100644
--- a/src/formatter.h
+++ b/src/stable/formatter.h
diff --git a/src/formula.cpp b/src/stable/formula.cpp
index ac435ed..ac435ed 100644
--- a/src/formula.cpp
+++ b/src/stable/formula.cpp
diff --git a/src/formula.h b/src/stable/formula.h
index 687e6c3..687e6c3 100644
--- a/src/formula.h
+++ b/src/stable/formula.h
diff --git a/src/hash.cpp b/src/stable/hash.cpp
index 59572ec..59572ec 100644
--- a/src/hash.cpp
+++ b/src/stable/hash.cpp
diff --git a/src/hash.h b/src/stable/hash.h
index 71aec73..71aec73 100644
--- a/src/hash.h
+++ b/src/stable/hash.h
diff --git a/src/heap.cpp b/src/stable/heap.cpp
index a2ffac2..a2ffac2 100644
--- a/src/heap.cpp
+++ b/src/stable/heap.cpp
diff --git a/src/heap.h b/src/stable/heap.h
index afe8be6..afe8be6 100644
--- a/src/heap.h
+++ b/src/stable/heap.h
diff --git a/src/hex.cpp b/src/stable/hex.cpp
index 2a04c6f..2a04c6f 100644
--- a/src/hex.cpp
+++ b/src/stable/hex.cpp
diff --git a/src/hex.h b/src/stable/hex.h
index 3595fae..3595fae 100644
--- a/src/hex.h
+++ b/src/stable/hex.h
diff --git a/src/list.cpp b/src/stable/list.cpp
index e05765e..e05765e 100644
--- a/src/list.cpp
+++ b/src/stable/list.cpp
diff --git a/src/list.h b/src/stable/list.h
index 21ba0b5..21ba0b5 100644
--- a/src/list.h
+++ b/src/stable/list.h
diff --git a/src/logger.cpp b/src/stable/logger.cpp
index 8e46390..8e46390 100644
--- a/src/logger.cpp
+++ b/src/stable/logger.cpp
diff --git a/src/logger.h b/src/stable/logger.h
index 5c1352b..5c1352b 100644
--- a/src/logger.h
+++ b/src/stable/logger.h
diff --git a/src/lzma.cpp b/src/stable/lzma.cpp
index 6ed0806..6ed0806 100644
--- a/src/lzma.cpp
+++ b/src/stable/lzma.cpp
diff --git a/src/lzma.h b/src/stable/lzma.h
index 090da8d..090da8d 100644
--- a/src/lzma.h
+++ b/src/stable/lzma.h
diff --git a/src/md5.cpp b/src/stable/md5.cpp
index 15cba17..15cba17 100644
--- a/src/md5.cpp
+++ b/src/stable/md5.cpp
diff --git a/src/md5.h b/src/stable/md5.h
index b7597fd..b7597fd 100644
--- a/src/md5.h
+++ b/src/stable/md5.h
diff --git a/src/membuf.cpp b/src/stable/membuf.cpp
index 14d0d58..14d0d58 100644
--- a/src/membuf.cpp
+++ b/src/stable/membuf.cpp
diff --git a/src/membuf.h b/src/stable/membuf.h
index 544dc83..544dc83 100644
--- a/src/membuf.h
+++ b/src/stable/membuf.h
diff --git a/src/minicron.cpp b/src/stable/minicron.cpp
index 95cf66b..95cf66b 100644
--- a/src/minicron.cpp
+++ b/src/stable/minicron.cpp
diff --git a/src/minicron.h b/src/stable/minicron.h
index 0d1cb62..0d1cb62 100644
--- a/src/minicron.h
+++ b/src/stable/minicron.h
diff --git a/src/multiserver.cpp b/src/stable/multiserver.cpp
index bd598ed..bd598ed 100644
--- a/src/multiserver.cpp
+++ b/src/stable/multiserver.cpp
diff --git a/src/multiserver.h b/src/stable/multiserver.h
index e3b3ec3..e3b3ec3 100644
--- a/src/multiserver.h
+++ b/src/stable/multiserver.h
diff --git a/src/mutex.cpp b/src/stable/mutex.cpp
index dbaaece..dbaaece 100644
--- a/src/mutex.cpp
+++ b/src/stable/mutex.cpp
diff --git a/src/mutex.h b/src/stable/mutex.h
index b5c8b7a..b5c8b7a 100644
--- a/src/mutex.h
+++ b/src/stable/mutex.h
diff --git a/src/mutexlocker.cpp b/src/stable/mutexlocker.cpp
index 90b730e..90b730e 100644
--- a/src/mutexlocker.cpp
+++ b/src/stable/mutexlocker.cpp
diff --git a/src/mutexlocker.h b/src/stable/mutexlocker.h
index 7c3c97e..7c3c97e 100644
--- a/src/mutexlocker.h
+++ b/src/stable/mutexlocker.h
diff --git a/src/nullstream.cpp b/src/stable/nullstream.cpp
index 9552cc5..9552cc5 100644
--- a/src/nullstream.cpp
+++ b/src/stable/nullstream.cpp
diff --git a/src/nullstream.h b/src/stable/nullstream.h
index 9b75332..9b75332 100644
--- a/src/nullstream.h
+++ b/src/stable/nullstream.h
diff --git a/src/optparser.cpp b/src/stable/optparser.cpp
index 050232c..050232c 100644
--- a/src/optparser.cpp
+++ b/src/stable/optparser.cpp
diff --git a/src/optparser.h b/src/stable/optparser.h
index f2fe531..f2fe531 100644
--- a/src/optparser.h
+++ b/src/stable/optparser.h
diff --git a/src/pearsonhash.cpp b/src/stable/pearsonhash.cpp
index d753d20..d753d20 100644
--- a/src/pearsonhash.cpp
+++ b/src/stable/pearsonhash.cpp
diff --git a/src/pearsonhash.h b/src/stable/pearsonhash.h
index 2a9cfa7..2a9cfa7 100644
--- a/src/pearsonhash.h
+++ b/src/stable/pearsonhash.h
diff --git a/src/plugger.cpp b/src/stable/plugger.cpp
index fb6850a..fb6850a 100644
--- a/src/plugger.cpp
+++ b/src/stable/plugger.cpp
diff --git a/src/plugger.h b/src/stable/plugger.h
index c22f964..c22f964 100644
--- a/src/plugger.h
+++ b/src/stable/plugger.h
diff --git a/src/process.cpp b/src/stable/process.cpp
index a98936e..a98936e 100644
--- a/src/process.cpp
+++ b/src/stable/process.cpp
diff --git a/src/process.h b/src/stable/process.h
index d6282e0..d6282e0 100644
--- a/src/process.h
+++ b/src/stable/process.h
diff --git a/src/protocol.cpp b/src/stable/protocol.cpp
index 2489d05..2489d05 100644
--- a/src/protocol.cpp
+++ b/src/stable/protocol.cpp
diff --git a/src/protocol.h b/src/stable/protocol.h
index 0058723..0058723 100644
--- a/src/protocol.h
+++ b/src/stable/protocol.h
diff --git a/src/protocolhttp.cpp b/src/stable/protocolhttp.cpp
index eaee9d0..eaee9d0 100644
--- a/src/protocolhttp.cpp
+++ b/src/stable/protocolhttp.cpp
diff --git a/src/protocolhttp.h b/src/stable/protocolhttp.h
index 153a00d..153a00d 100644
--- a/src/protocolhttp.h
+++ b/src/stable/protocolhttp.h
diff --git a/src/protocoltelnet.cpp b/src/stable/protocoltelnet.cpp
index 7e37cca..7e37cca 100644
--- a/src/protocoltelnet.cpp
+++ b/src/stable/protocoltelnet.cpp
diff --git a/src/protocoltelnet.h b/src/stable/protocoltelnet.h
index 74d6478..74d6478 100644
--- a/src/protocoltelnet.h
+++ b/src/stable/protocoltelnet.h
diff --git a/src/queue.cpp b/src/stable/queue.cpp
index 9d6edac..9d6edac 100644
--- a/src/queue.cpp
+++ b/src/stable/queue.cpp
diff --git a/src/queue.h b/src/stable/queue.h
index e5d9b5f..e5d9b5f 100644
--- a/src/queue.h
+++ b/src/stable/queue.h
diff --git a/src/queuebuf.cpp b/src/stable/queuebuf.cpp
index 98d8ee0..98d8ee0 100644
--- a/src/queuebuf.cpp
+++ b/src/stable/queuebuf.cpp
diff --git a/src/queuebuf.h b/src/stable/queuebuf.h
index 929ca35..929ca35 100644
--- a/src/queuebuf.h
+++ b/src/stable/queuebuf.h
diff --git a/src/ringbuffer.cpp b/src/stable/ringbuffer.cpp
index 99b1b1c..99b1b1c 100644
--- a/src/ringbuffer.cpp
+++ b/src/stable/ringbuffer.cpp
diff --git a/src/ringbuffer.h b/src/stable/ringbuffer.h
index f43773d..f43773d 100644
--- a/src/ringbuffer.h
+++ b/src/stable/ringbuffer.h
diff --git a/src/server.cpp b/src/stable/server.cpp
index 1972a3f..1972a3f 100644
--- a/src/server.cpp
+++ b/src/stable/server.cpp
diff --git a/src/server.h b/src/stable/server.h
index c59543a..c59543a 100644
--- a/src/server.h
+++ b/src/stable/server.h
diff --git a/src/sha1.cpp b/src/stable/sha1.cpp
index bfe4c5a..bfe4c5a 100644
--- a/src/sha1.cpp
+++ b/src/stable/sha1.cpp
diff --git a/src/sha1.h b/src/stable/sha1.h
index 1b7f6df..1b7f6df 100644
--- a/src/sha1.h
+++ b/src/stable/sha1.h
diff --git a/src/sharedcore.cpp b/src/stable/sharedcore.cpp
index 75f92eb..75f92eb 100644
--- a/src/sharedcore.cpp
+++ b/src/stable/sharedcore.cpp
diff --git a/src/sharedcore.h b/src/stable/sharedcore.h
index bf9395c..bf9395c 100644
--- a/src/sharedcore.h
+++ b/src/stable/sharedcore.h
diff --git a/src/signals.cpp b/src/stable/signals.cpp
index ffbc7ba..ffbc7ba 100644
--- a/src/signals.cpp
+++ b/src/stable/signals.cpp
diff --git a/src/singleton.h b/src/stable/singleton.h
index 13db01b..13db01b 100644
--- a/src/singleton.h
+++ b/src/stable/singleton.h
diff --git a/src/sio.cpp b/src/stable/sio.cpp
index 5f8e234..5f8e234 100644
--- a/src/sio.cpp
+++ b/src/stable/sio.cpp
diff --git a/src/sio.h b/src/stable/sio.h
index 9f2cd05..9f2cd05 100644
--- a/src/sio.h
+++ b/src/stable/sio.h
diff --git a/src/sptr.cpp b/src/stable/sptr.cpp
index ea21e3b..ea21e3b 100644
--- a/src/sptr.cpp
+++ b/src/stable/sptr.cpp
diff --git a/src/sptr.h b/src/stable/sptr.h
index 4eb5a52..4eb5a52 100644
--- a/src/sptr.h
+++ b/src/stable/sptr.h
diff --git a/src/stack.cpp b/src/stable/stack.cpp
index 73352d3..73352d3 100644
--- a/src/stack.cpp
+++ b/src/stable/stack.cpp
diff --git a/src/stack.h b/src/stable/stack.h
index 0d1ed3c..0d1ed3c 100644
--- a/src/stack.h
+++ b/src/stable/stack.h
diff --git a/src/staticmembuf.cpp b/src/stable/staticmembuf.cpp
index 74fae31..74fae31 100644
--- a/src/staticmembuf.cpp
+++ b/src/stable/staticmembuf.cpp
diff --git a/src/staticmembuf.h b/src/stable/staticmembuf.h
index f168de3..f168de3 100644
--- a/src/staticmembuf.h
+++ b/src/stable/staticmembuf.h
diff --git a/src/stdstream.cpp b/src/stable/stdstream.cpp
index b1d5d61..b1d5d61 100644
--- a/src/stdstream.cpp
+++ b/src/stable/stdstream.cpp
diff --git a/src/stdstream.h b/src/stable/stdstream.h
index ff6c774..ff6c774 100644
--- a/src/stdstream.h
+++ b/src/stable/stdstream.h
diff --git a/src/stream.cpp b/src/stable/stream.cpp
index 58641cc..58641cc 100644
--- a/src/stream.cpp
+++ b/src/stable/stream.cpp
diff --git a/src/stream.h b/src/stable/stream.h
index b35f6ee..b35f6ee 100644
--- a/src/stream.h
+++ b/src/stable/stream.h
diff --git a/src/streamstack.cpp b/src/stable/streamstack.cpp
index d45306d..d45306d 100644
--- a/src/streamstack.cpp
+++ b/src/stable/streamstack.cpp
diff --git a/src/streamstack.h b/src/stable/streamstack.h
index 846935b..846935b 100644
--- a/src/streamstack.h
+++ b/src/stable/streamstack.h
diff --git a/src/strfilter.h b/src/stable/strfilter.h
index 8da0a3f..8da0a3f 100644
--- a/src/strfilter.h
+++ b/src/stable/strfilter.h
diff --git a/src/string.cpp b/src/stable/string.cpp
index 1a9018b..1a9018b 100644
--- a/src/string.cpp
+++ b/src/stable/string.cpp
diff --git a/src/string.h b/src/stable/string.h
index a9006d1..a9006d1 100644
--- a/src/string.h
+++ b/src/stable/string.h
diff --git a/src/substream.cpp b/src/stable/substream.cpp
index c201752..c201752 100644
--- a/src/substream.cpp
+++ b/src/stable/substream.cpp
diff --git a/src/substream.h b/src/stable/substream.h
index 1db4d6c..1db4d6c 100644
--- a/src/substream.h
+++ b/src/stable/substream.h
diff --git a/src/synchroatom.h b/src/stable/synchroatom.h
index fb02054..fb02054 100644
--- a/src/synchroatom.h
+++ b/src/stable/synchroatom.h
diff --git a/src/synchrocounter.cpp b/src/stable/synchrocounter.cpp
index 48bbe21..48bbe21 100644
--- a/src/synchrocounter.cpp
+++ b/src/stable/synchrocounter.cpp
diff --git a/src/synchrocounter.h b/src/stable/synchrocounter.h
index d201bee..d201bee 100644
--- a/src/synchrocounter.h
+++ b/src/stable/synchrocounter.h
diff --git a/src/synchroheap.cpp b/src/stable/synchroheap.cpp
index 5dcce33..5dcce33 100644
--- a/src/synchroheap.cpp
+++ b/src/stable/synchroheap.cpp
diff --git a/src/synchroheap.h b/src/stable/synchroheap.h
index 4dd898d..4dd898d 100644
--- a/src/synchroheap.h
+++ b/src/stable/synchroheap.h
diff --git a/src/synchroqueue.h b/src/stable/synchroqueue.h
index 79d5e49..79d5e49 100644
--- a/src/synchroqueue.h
+++ b/src/stable/synchroqueue.h
diff --git a/src/taf.h b/src/stable/taf.h
index 951f80f..951f80f 100644
--- a/src/taf.h
+++ b/src/stable/taf.h
diff --git a/src/tafcomment.cpp b/src/stable/tafcomment.cpp
index c7096ca..c7096ca 100644
--- a/src/tafcomment.cpp
+++ b/src/stable/tafcomment.cpp
diff --git a/src/tafcomment.h b/src/stable/tafcomment.h
index 4efd548..4efd548 100644
--- a/src/tafcomment.h
+++ b/src/stable/tafcomment.h
diff --git a/src/tafgroup.cpp b/src/stable/tafgroup.cpp
index ee180c3..ee180c3 100644
--- a/src/tafgroup.cpp
+++ b/src/stable/tafgroup.cpp
diff --git a/src/tafgroup.h b/src/stable/tafgroup.h
index 119e827..119e827 100644
--- a/src/tafgroup.h
+++ b/src/stable/tafgroup.h
diff --git a/src/tafnode.cpp b/src/stable/tafnode.cpp
index 0757a46..0757a46 100644
--- a/src/tafnode.cpp
+++ b/src/stable/tafnode.cpp
diff --git a/src/tafnode.h b/src/stable/tafnode.h
index d7a9159..d7a9159 100644
--- a/src/tafnode.h
+++ b/src/stable/tafnode.h
diff --git a/src/tafproperty.cpp b/src/stable/tafproperty.cpp
index 4ef5c24..4ef5c24 100644
--- a/src/tafproperty.cpp
+++ b/src/stable/tafproperty.cpp
diff --git a/src/tafproperty.h b/src/stable/tafproperty.h
index 7091de5..7091de5 100644
--- a/src/tafproperty.h
+++ b/src/stable/tafproperty.h
diff --git a/src/tafreader.cpp b/src/stable/tafreader.cpp
index 6708c8c..6708c8c 100644
--- a/src/tafreader.cpp
+++ b/src/stable/tafreader.cpp
diff --git a/src/tafreader.h b/src/stable/tafreader.h
index 10ebfc0..10ebfc0 100644
--- a/src/tafreader.h
+++ b/src/stable/tafreader.h
diff --git a/src/tafwriter.cpp b/src/stable/tafwriter.cpp
index b24bd1e..b24bd1e 100644
--- a/src/tafwriter.cpp
+++ b/src/stable/tafwriter.cpp
diff --git a/src/tafwriter.h b/src/stable/tafwriter.h
index 3fd71de..3fd71de 100644
--- a/src/tafwriter.h
+++ b/src/stable/tafwriter.h
diff --git a/src/tcpserversocket.cpp b/src/stable/tcpserversocket.cpp
index a2fe6b4..a2fe6b4 100644
--- a/src/tcpserversocket.cpp
+++ b/src/stable/tcpserversocket.cpp
diff --git a/src/tcpserversocket.h b/src/stable/tcpserversocket.h
index efb7287..efb7287 100644
--- a/src/tcpserversocket.h
+++ b/src/stable/tcpserversocket.h
diff --git a/src/tcpsocket.cpp b/src/stable/tcpsocket.cpp
index b9b215c..b9b215c 100644
--- a/src/tcpsocket.cpp
+++ b/src/stable/tcpsocket.cpp
diff --git a/src/tcpsocket.h b/src/stable/tcpsocket.h
index 52218bd..52218bd 100644
--- a/src/tcpsocket.h
+++ b/src/stable/tcpsocket.h
diff --git a/src/thread.cpp b/src/stable/thread.cpp
index e4563a2..e4563a2 100644
--- a/src/thread.cpp
+++ b/src/stable/thread.cpp
diff --git a/src/thread.h b/src/stable/thread.h
index 70e6f5f..70e6f5f 100644
--- a/src/thread.h
+++ b/src/stable/thread.h
diff --git a/src/trace.cpp b/src/stable/trace.cpp
index 03181e9..03181e9 100644
--- a/src/trace.cpp
+++ b/src/stable/trace.cpp
diff --git a/src/trace.h b/src/stable/trace.h
index 51dfb8e..51dfb8e 100644
--- a/src/trace.h
+++ b/src/stable/trace.h
diff --git a/src/unitsuite.cpp b/src/stable/unitsuite.cpp
index db930a4..db930a4 100644
--- a/src/unitsuite.cpp
+++ b/src/stable/unitsuite.cpp
diff --git a/src/unitsuite.h b/src/stable/unitsuite.h
index 2250a4d..2250a4d 100644
--- a/src/unitsuite.h
+++ b/src/stable/unitsuite.h
diff --git a/src/util.cpp b/src/stable/util.cpp
index 6983dfd..6983dfd 100644
--- a/src/util.cpp
+++ b/src/stable/util.cpp
diff --git a/src/util.h b/src/stable/util.h
index 691184d..691184d 100644
--- a/src/util.h
+++ b/src/stable/util.h
diff --git a/src/variant.cpp b/src/stable/variant.cpp
index 5cdaa5b..5cdaa5b 100644
--- a/src/variant.cpp
+++ b/src/stable/variant.cpp
diff --git a/src/variant.h b/src/stable/variant.h
index 45e3339..45e3339 100644
--- a/src/variant.h
+++ b/src/stable/variant.h
diff --git a/src/bitstring.cpp b/src/unstable/bitstring.cpp
index bdd1bc2..bdd1bc2 100644
--- a/src/bitstring.cpp
+++ b/src/unstable/bitstring.cpp
diff --git a/src/bitstring.h b/src/unstable/bitstring.h
index 7a8fc48..7a8fc48 100644
--- a/src/bitstring.h
+++ b/src/unstable/bitstring.h
diff --git a/src/fifo.cpp b/src/unstable/fifo.cpp
index b0cf1c7..b0cf1c7 100644
--- a/src/fifo.cpp
+++ b/src/unstable/fifo.cpp
diff --git a/src/fifo.h b/src/unstable/fifo.h
index 18a70ba..18a70ba 100644
--- a/src/fifo.h
+++ b/src/unstable/fifo.h
diff --git a/src/itoserver.cpp b/src/unstable/itoserver.cpp
index c7165e2..c7165e2 100644
--- a/src/itoserver.cpp
+++ b/src/unstable/itoserver.cpp
diff --git a/src/itoserver.h b/src/unstable/itoserver.h
index b1f5479..81db4e2 100644
--- a/src/itoserver.h
+++ b/src/unstable/itoserver.h
@@ -19,7 +19,7 @@
 #include "bu/thread.h"
 #include "bu/mutex.h"
 #include "bu/synchroqueue.h"
-#include "bu/set.h"
+#include "bu/hash.h"
 
 #include "bu/clientlink.h"
 #include "bu/clientlinkfactory.h"
diff --git a/src/minimacro.cpp b/src/unstable/minimacro.cpp
index b6fd6a8..b6fd6a8 100644
--- a/src/minimacro.cpp
+++ b/src/unstable/minimacro.cpp
diff --git a/src/minimacro.h b/src/unstable/minimacro.h
index b6c7c13..b6c7c13 100644
--- a/src/minimacro.h
+++ b/src/unstable/minimacro.h
diff --git a/src/myriad.cpp b/src/unstable/myriad.cpp
index de44930..de44930 100644
--- a/src/myriad.cpp
+++ b/src/unstable/myriad.cpp
diff --git a/src/myriad.h b/src/unstable/myriad.h
index 3382ab5..3382ab5 100644
--- a/src/myriad.h
+++ b/src/unstable/myriad.h
diff --git a/src/myriadfs.cpp b/src/unstable/myriadfs.cpp
index 6884a31..6884a31 100644
--- a/src/myriadfs.cpp
+++ b/src/unstable/myriadfs.cpp
diff --git a/src/myriadfs.h b/src/unstable/myriadfs.h
index cc9961a..cc9961a 100644
--- a/src/myriadfs.h
+++ b/src/unstable/myriadfs.h
diff --git a/src/myriadstream.cpp b/src/unstable/myriadstream.cpp
index e6e94bc..e6e94bc 100644
--- a/src/myriadstream.cpp
+++ b/src/unstable/myriadstream.cpp
diff --git a/src/myriadstream.h b/src/unstable/myriadstream.h
index fdad669..fdad669 100644
--- a/src/myriadstream.h
+++ b/src/unstable/myriadstream.h
diff --git a/src/newline.cpp b/src/unstable/newline.cpp
index ffc9eb0..ffc9eb0 100644
--- a/src/newline.cpp
+++ b/src/unstable/newline.cpp
diff --git a/src/newline.h b/src/unstable/newline.h
index afe0a84..afe0a84 100644
--- a/src/newline.h
+++ b/src/unstable/newline.h
diff --git a/src/udpsocket.cpp b/src/unstable/udpsocket.cpp
index 702840a..702840a 100644
--- a/src/udpsocket.cpp
+++ b/src/unstable/udpsocket.cpp
diff --git a/src/udpsocket.h b/src/unstable/udpsocket.h
index f228f08..f228f08 100644
--- a/src/udpsocket.h
+++ b/src/unstable/udpsocket.h
diff --git a/src/url.cpp b/src/unstable/url.cpp
index 7b4a48e..7b4a48e 100644
--- a/src/url.cpp
+++ b/src/unstable/url.cpp
diff --git a/src/url.h b/src/unstable/url.h
index d751578..d751578 100644
--- a/src/url.h
+++ b/src/unstable/url.h
diff --git a/src/urn.cpp b/src/unstable/urn.cpp
index 106fb64..106fb64 100644
--- a/src/urn.cpp
+++ b/src/unstable/urn.cpp
diff --git a/src/urn.h b/src/unstable/urn.h
index 106fb64..106fb64 100644
--- a/src/urn.h
+++ b/src/unstable/urn.h
diff --git a/src/utfstring.cpp b/src/unstable/utfstring.cpp
index 19d3ddc..19d3ddc 100644
--- a/src/utfstring.cpp
+++ b/src/unstable/utfstring.cpp
diff --git a/src/utfstring.h b/src/unstable/utfstring.h
index 477e272..477e272 100644
--- a/src/utfstring.h
+++ b/src/unstable/utfstring.h
diff --git a/src/uuid.cpp b/src/unstable/uuid.cpp
index 088450b..088450b 100644
--- a/src/uuid.cpp
+++ b/src/unstable/uuid.cpp
diff --git a/src/uuid.h b/src/unstable/uuid.h
index 261f653..261f653 100644
--- a/src/uuid.h
+++ b/src/unstable/uuid.h
diff --git a/bnftest b/tests/bnftest
index 7e61b1a..7e61b1a 100644
--- a/bnftest
+++ b/tests/bnftest
diff --git a/bnftest.2 b/tests/bnftest.2
index 229943b..229943b 100644
--- a/bnftest.2
+++ b/tests/bnftest.2
diff --git a/test.utf16 b/tests/test.utf16
index 86a63c3..86a63c3 100644
--- a/test.utf16
+++ b/tests/test.utf16
diff --git a/test.utf16be b/tests/test.utf16be
index 136ad1a..136ad1a 100644
--- a/test.utf16be
+++ b/tests/test.utf16be
diff --git a/test.utf16le b/tests/test.utf16le
index 9f610d6..9f610d6 100644
--- a/test.utf16le
+++ b/tests/test.utf16le
diff --git a/utf16.cpp b/utf16.cpp
deleted file mode 100644
index eedb521..0000000
--- a/utf16.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-
-void bitprint( uint16_t u )
-{
-        for( int i = 15; i >= 0; i-- )
-                printf("%c", (u&(1<<i))?'1':'0');
-        printf("\n");
-}
-
-void bitprint( uint32_t u )
-{
-        for( int i = 31; i >= 0; i-- )
-                printf("%c", (u&(1<<i))?'1':'0');
-        printf("\n");
-}
-
-void utoutf16( uint32_t in, uint16_t &outHi, uint16_t &outLo )
-{
-        outHi = (((in-0x10000)>>10)&0x3FF)| 0xD800u;
-        outLo = ((in-0x10000)&0x3FF)| 0xDC00u;
-        printf("0x%X == 0x%X, 0x%X\n", in, outHi, outLo );
-}
-
-int32_t utf16tou( uint16_t hi, uint16_t lo )
-{
-        return (((uint32_t)hi&0x3FF)<<10 | lo&0x3FF)+0x10000;
-}
-
-int main()
-{
-        bitprint( 0xD800u );
-        bitprint( 0xDC00u );
-        uint16_t hi, lo;
-        utoutf16( 0x1D11E, hi, lo ); // Cat face with wry smile
-        utoutf16( 0x10FFFD, hi, lo ); // Cat face with wry smile
-        utoutf16( 0x1F63C, hi, lo ); // Cat face with wry smile
-        bitprint( hi );
-        bitprint( lo );
-        printf("0x%X\n", utf16tou( hi, lo ) );
-        return 0;
-}