diff -p -up mp3packer-2.04/c_part.c.0000 mp3packer-2.04/c_part.c
--- mp3packer-2.04/c_part.c.0000	2012-07-28 18:45:49.000000000 +0200
+++ mp3packer-2.04/c_part.c	2012-12-11 14:53:42.518170652 +0100
@@ -1,3 +1,5 @@
+#include <sys/stat.h>
+#include <unistd.h>
 #include <caml/alloc.h>
 #include <caml/callback.h>
 #include <caml/fail.h>
@@ -186,7 +188,7 @@ CAMLprim value get_os_thread_self_id() {
 		out_val = win_alloc_handle(dup_handle);
 	}
 #else
-	out_val = Val_int(gettid());
+	//	out_val = Val_int(gettid());
 #endif
 	CAMLreturn(out_val);
 }
diff -p -up mp3packer-2.04/mp3framehuffman-c.c.0000 mp3packer-2.04/mp3framehuffman-c.c
--- mp3packer-2.04/mp3framehuffman-c.c.0000	2012-07-28 08:32:44.000000000 +0200
+++ mp3packer-2.04/mp3framehuffman-c.c	2012-12-11 14:53:42.518170652 +0100
@@ -334,7 +334,7 @@ static unsigned int get_bits_wordwise(se
 	uint32 raw;
 	int_ptr = (uint32 *)s->byte_ptr;
 
-#if 1
+#if HAS_BYTESWAP
 	raw = _byteswap_ulong(*int_ptr) << s->bit_index;
 #else
 	raw = (
diff -p -up mp3packer-2.04/mp3frameutils-c.c.0000 mp3packer-2.04/mp3frameutils-c.c
--- mp3packer-2.04/mp3frameutils-c.c.0000	2012-12-11 14:54:45.407998846 +0100
+++ mp3packer-2.04/mp3frameutils-c.c	2012-12-11 14:55:16.483913942 +0100
@@ -1257,7 +1257,7 @@ CAMLprim value mfu_find_best_config_sse4
 	value quant_raw_ptr,
 	value debug_val
 ) {
-	return mfu_find_best_config(quant_bits_ptr, quant_bits_count1_char_ptr, scf_bands_ptr, quant_raw_ptr, debug_val);
+	return mfu_find_best_config_base(quant_bits_ptr, quant_bits_count1_char_ptr, scf_bands_ptr, quant_raw_ptr, debug_val);
 }
 
 #endif // WIN32