Index: /libmpc/branches/r2d/libmpcenc/bitstream.c
===================================================================
--- /libmpc/branches/r2d/libmpcenc/bitstream.c	(revision 193)
+++ /libmpc/branches/r2d/libmpcenc/bitstream.c	(revision 194)
@@ -18,5 +18,10 @@
  */
 
+#ifdef _WIN32
+#include <windows.h>
+#define sleep(t) Sleep((t) * 1000)
+#else
 #include <unistd.h>
+#endif
 
 #include "libmpcenc.h"
@@ -125,8 +130,8 @@
 
 	if (addCodeSize) {
-		while ((1 << (7 * i)) - i <= size) i++;
+		while ((1ull << (7 * i)) - i <= size) i++;
 		size += i;
 	} else
-		while ((1 << (7 * i)) <= size) i++;
+		while ((1ull << (7 * i)) <= size) i++;
 
 	for( j = i - 1; j >= 0; j--){
Index: /libmpc/branches/r2d/libmpcpsy/ans.c
===================================================================
--- /libmpc/branches/r2d/libmpcpsy/ans.c	(revision 193)
+++ /libmpc/branches/r2d/libmpcpsy/ans.c	(revision 194)
@@ -29,4 +29,5 @@
 
 #include "libmpcpsy.h"
+#include <mpc/mpcmath.h>
 
 #include <math.h>
Index: /libmpc/branches/r2d/mpcenc/mpcenc.c
===================================================================
--- /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 193)
+++ /libmpc/branches/r2d/mpcenc/mpcenc.c	(revision 194)
@@ -1611,5 +1611,5 @@
     ShowParameters (&m, InputName, OutputName );
     if ( WIN32_MESSAGES  &&  FrontendPresent )
-        SendModeMessage (MainQual);
+        SendModeMessage (m.MainQual);
 
     if ( SkipTime > 0. ) {
Index: /libmpc/branches/r2d/mpcenc/tags.c
===================================================================
--- /libmpc/branches/r2d/mpcenc/tags.c	(revision 193)
+++ /libmpc/branches/r2d/mpcenc/tags.c	(revision 194)
@@ -608,5 +608,5 @@
         return 0;
 
-	if ( src [0] != 0xFFi  ||  src [1] != 0xFEi )                 // Microsoft Unicode preample (also useful to detect endianess, but currently only little endian is supported)
+	if ( src [0] != 0xFF  ||  src [1] != 0xFE )                 // Microsoft Unicode preample (also useful to detect endianess, but currently only little endian is supported)
         return 0;
 
@@ -614,5 +614,5 @@
         if ( ( src [1] & 0xFC ) == 0xDC )
             return 0;
-        if ( src [1] == 0xFFi  &&  ( src [0] & 0xFE ) == 0xFE )
+        if ( src [1] == 0xFF  &&  ( src [0] & 0xFE ) == 0xFE )
             return 0;
         if ( ( src [1] & 0xFC ) == 0xD8 ) {
Index: /libmpc/branches/r2d/win32/mpcenc.vcproj
===================================================================
--- /libmpc/branches/r2d/win32/mpcenc.vcproj	(revision 193)
+++ /libmpc/branches/r2d/win32/mpcenc.vcproj	(revision 194)
@@ -2,5 +2,5 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="mpcenc"
 	ProjectGUID="{15082E34-9324-469F-8423-F995B4814A37}"
@@ -63,5 +63,5 @@
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
+				AdditionalDependencies="winmm.lib User32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_d.exe"
 				GenerateManifest="false"
@@ -146,5 +146,5 @@
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="winmm.lib"
+				AdditionalDependencies="winmm.lib User32.lib"
 				GenerateManifest="false"
 				SubSystem="1"