diff -ur a/cygnal/libnet/cque.h b/cygnal/libnet/cque.h
--- a/cygnal/libnet/cque.h	2012-01-19 20:17:47.000000000 +0100
+++ b/cygnal/libnet/cque.h	2012-02-23 20:13:39.000000000 +0100
@@ -25,8 +25,9 @@
 #include <boost/thread/condition.hpp>
 #include <deque>
 
+#include "../libamf/amf.h"
 #include "getclocktime.hpp"
-#include "buffer.h"
+#include "../libamf/buffer.h"
 #include "network.h"
 #include "dsodefs.h" //For DSOEXPORT.
 
diff -ur a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
--- a/cygnal/libnet/sshclient.h	2012-01-19 20:17:47.000000000 +0100
+++ b/cygnal/libnet/sshclient.h	2012-02-23 20:13:09.000000000 +0100
@@ -32,9 +32,10 @@
 #include <libssh/sftp.h>
 }
 
+#include "../libamf/amf.h"
 #include "cque.h"
 #include "network.h"
-#include "buffer.h"
+#include "../libamf/buffer.h"
 
 namespace gnash
 {
diff -ur a/cygnal/libnet/sslclient.h b/cygnal/libnet/sslclient.h
--- a/cygnal/libnet/sslclient.h	2012-01-19 20:17:47.000000000 +0100
+++ b/cygnal/libnet/sslclient.h	2012-02-23 20:13:21.000000000 +0100
@@ -36,10 +36,11 @@
 #include <openssl/err.h>
 #endif
 
+#include "../libamf/amf.h"
 #include "dsodefs.h"
 #include "cque.h"
 #include "network.h"
-#include "buffer.h"
+#include "../libamf/buffer.h"
 
 
 namespace gnash