12 files changed, 42 insertions, 6 deletions

diff --git a/src/archive.cpp b/src/archive.cpp
index 78fa362..d11f853 100644
--- a/src/archive.cpp
+++ b/src/archive.cpp
@@ -6,6 +6,8 @@
  */
 
 #include "bu/archive.h"
+#include "bu/stream.h"
+#include "bu/archival.h"
 
 Bu::Archive::Archive( Stream &rStream, bool bLoading ) :
         bLoading( bLoading ),
diff --git a/src/archive.h b/src/archive.h
index 2d95285..fbd971e 100644
--- a/src/archive.h
+++ b/src/archive.h
@@ -10,8 +10,6 @@
 
 #include <stdint.h>
 #include <string>
-#include "bu/archival.h"
-#include "bu/stream.h"
 #include <list>
 #include "bu/hash.h"
 #include "bu/list.h"
@@ -19,6 +17,9 @@
 
 namespace Bu
 {
+        class Archival;
+        class Stream;
+
         /**
          * Provides a framework for serialization of objects and primitives.  The
          * archive will handle any basic primitive, a few special types, like char *
diff --git a/src/fstring.h b/src/fstring.h
index fd75892..49ec77e 100644
--- a/src/fstring.h
+++ b/src/fstring.h
@@ -16,7 +16,9 @@
 #include "bu/archive.h"
 #include "bu/hash.h"
 
+#ifndef min
 #define min( a, b )  ((a<b)?(a):(b))
+#endif
 
 /* I borrowed this from someone who borrowed it from glib who borrowed it
  * from...
diff --git a/src/membuf.h b/src/membuf.h
index 1a2abe4..a8caa16 100644
--- a/src/membuf.h
+++ b/src/membuf.h
@@ -34,6 +34,7 @@ namespace Bu
                  * of our bases for now.
                  */
                 virtual size_t write( const void *pBuf, size_t nBytes );
+                using Stream::write;
                 virtual long tell();
                 virtual void seek( long offset );
                 virtual void setPos( long pos );
diff --git a/src/minimacro.cpp b/src/minimacro.cpp
index 374b7de..2bd156c 100644
--- a/src/minimacro.cpp
+++ b/src/minimacro.cpp
@@ -132,3 +132,13 @@ void Bu::MiniMacro::addVar(
         hVars.insert( sName, sValue );
 }
 
+bool Bu::MiniMacro::hasVar( const Bu::FString &sName )
+{
+        return hVars.has( sName );
+}
+
+const Bu::FString &Bu::MiniMacro::getvar( const Bu::FString &sName )
+{
+        return hVars.get( sName );
+}
+
diff --git a/src/minimacro.h b/src/minimacro.h
index 105a117..4349b19 100644
--- a/src/minimacro.h
+++ b/src/minimacro.h
@@ -68,6 +68,8 @@ namespace Bu
 
                 Bu::FString parse( const Bu::FString &sIn );
                 void addVar( const Bu::FString &sName, const Bu::FString &sValue );
+                bool hasVar( const Bu::FString &sName );
+                const Bu::FString &getvar( const Bu::FString &sName );
 
         private:
                 const char *sCur;
diff --git a/src/socket.h b/src/socket.h
index 1f1e929..b09f911 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -34,6 +34,7 @@ namespace Bu
                 virtual size_t write( const void *pBuf, size_t nBytes );
                 virtual size_t write( const void *pBuf, size_t nBytes,
                                 uint32_t nSec, uint32_t nUSec=0 );
+                using Stream::write;
 
                 virtual long tell();
                 virtual void seek( long offset );
diff --git a/src/stdstream.h b/src/stdstream.h
index ccfb28a..15ac875 100644
--- a/src/stdstream.h
+++ b/src/stdstream.h
@@ -23,6 +23,7 @@ namespace Bu
                 virtual void close();
                 virtual size_t read( void *pBuf, size_t nBytes );
                 virtual size_t write( const void *pBuf, size_t nBytes );
+                using Stream::write;
                 virtual long tell();
                 virtual void seek( long offset );
                 virtual void setPos( long pos );
diff --git a/src/stream.cpp b/src/stream.cpp
index 8d976e5..82fe73b 100644
--- a/src/stream.cpp
+++ b/src/stream.cpp
@@ -5,7 +5,7 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#include "stream.h"
+#include "bu/stream.h"
 
 Bu::Stream::Stream()
 {
@@ -15,3 +15,8 @@ Bu::Stream::~Stream()
 {
 }
 
+size_t Bu::Stream::write( const Bu::FString &sBuf )
+{
+        return write( sBuf.getStr(), sBuf.getSize() );
+}
+
diff --git a/src/stream.h b/src/stream.h
index 078c045..f3cd882 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -11,6 +11,8 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include "bu/fstring.h"
+
 namespace Bu
 {
         /**
@@ -50,6 +52,8 @@ namespace Bu
                  */
                 virtual size_t write( const void *pBuf, size_t nBytes ) = 0;
 
+                virtual size_t write( const Bu::FString &sBuf );
+
                 /**
                  * Get the current position in the stream.
                  *@returns (long) The current position in the stream.
diff --git a/src/tafwriter.cpp b/src/tafwriter.cpp
index 3a33b11..9abaea4 100644
--- a/src/tafwriter.cpp
+++ b/src/tafwriter.cpp
@@ -5,7 +5,9 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#include "tafwriter.h"
+#include "bu/tafwriter.h"
+#include "bu/tafnode.h"
+#include "bu/stream.h"
 
 Bu::TafWriter::TafWriter( Bu::Stream &sOut ) :
         sOut( sOut ),
diff --git a/src/tafwriter.h b/src/tafwriter.h
index 08c1832..ca0de37 100644
--- a/src/tafwriter.h
+++ b/src/tafwriter.h
@@ -9,12 +9,17 @@
 #define BU_TAF_WRITER_H
 
 #include <stdint.h>
-#include "bu/tafnode.h"
-#include "bu/stream.h"
+
 #include "bu/fstring.h"
 
 namespace Bu
 {
+        class Stream;
+        class TafNode;
+        class TafGroup;
+        class TafProperty;
+        class TafComment;
+
         /**
          *
          *@ingroup Taf