diff -Naur libbt-1.03.vanilla/src/btget.c libbt-1.03/src/btget.c
--- libbt-1.03.vanilla/src/btget.c	2004-04-19 17:11:28.000000000 -0500
+++ libbt-1.03/src/btget.c	2004-07-15 03:11:51.926606992 -0500
@@ -1,6 +1,7 @@
 /* btget.c */
 #include "config.h"
 
+#include "util.h"
 #include <curl/curl.h>
 #include <curl/easy.h>
 #include <openssl/sha.h>
@@ -39,15 +40,14 @@
 
 /* libbt */
 #include "bts.h"
-#include "types.h"
 #include "benc.h"
 #include "random.h"
 #include "peer.h"
 #include "stream.h"
-#include "util.h"
 #include "segmenter.h"
 #include "context.h"
 #include "bterror.h"
+#include "types.h"
 
 #if WIN32
 	#define close(cs) closesocket(cs)
diff -Naur libbt-1.03.vanilla/src/segmenter.c libbt-1.03/src/segmenter.c
--- libbt-1.03.vanilla/src/segmenter.c	2004-04-16 00:28:42.000000000 -0500
+++ libbt-1.03/src/segmenter.c	2004-07-15 03:11:51.946603952 -0500
@@ -1,5 +1,6 @@
 #include "config.h"
 
+#include "util.h"
 #include <stdlib.h>
 #include <openssl/sha.h>
 #include <string.h>
@@ -18,8 +19,8 @@
 #   include <fcntl.h>
 #endif
 #include <stdio.h>
+#include "types.h"
 
-#include "util.h"
 #include "segmenter.h"
 #include "bitset.h"
 #undef min
diff -Naur libbt-1.03.vanilla/src/types.c libbt-1.03/src/types.c
--- libbt-1.03.vanilla/src/types.c	2004-04-16 01:19:41.000000000 -0500
+++ libbt-1.03/src/types.c	2004-07-15 03:11:51.947603800 -0500
@@ -1,5 +1,6 @@
 #include "config.h"
 
+#include "util.h"
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_STRINGS_H