diff --git a/panda/src/nativenet/buffered_datagramreader.h b/panda/src/nativenet/buffered_datagramreader.h
index 52db9602a2..baa99bd1e6 100755
--- a/panda/src/nativenet/buffered_datagramreader.h
+++ b/panda/src/nativenet/buffered_datagramreader.h
@@ -12,7 +12,7 @@ inline unsigned short GetUnsignedShort(char * in)
 
 class Buffered_DatagramReader : protected RingBuffer
 {
-	xinline bool GetMessageFromBuffer(Datagram &inmsg);
+	inline bool GetMessageFromBuffer(Datagram &inmsg);
 public:
 	inline Buffered_DatagramReader(int in_size = 8192) ;
 	inline void ReSet(void); 
diff --git a/panda/src/nativenet/nativenet_composite1.cxx b/panda/src/nativenet/nativenet_composite1.cxx
new file mode 100755
index 0000000000..511acbd454
--- /dev/null
+++ b/panda/src/nativenet/nativenet_composite1.cxx
@@ -0,0 +1,3 @@
+#include "socket_base.h"
+
+