I just applied all the changes. Please report any breakage. These changes have been working fine for me using VS2010 and GCC the past week. I didn't test SDL yet though...