Remove duplicate #defines
Fix vm86