diff --git a/redalert/defines.h b/redalert/defines.h
index 22b218bf..b39a83b1 100644
--- a/redalert/defines.h
+++ b/redalert/defines.h
@@ -130,8 +130,13 @@
 #endif
 
 // Test to see if partial object drawing is any faster.
+#ifdef REMASTER_BUILD
 //#define	PARTIAL
 #define SORTDRAW
+#else
+#define PARTIAL
+//#define SORTDRAW
+#endif
 
 /**********************************************************************
 **	If the scenario editor to to be active in this build then uncomment
diff --git a/redalert/function.h b/redalert/function.h
index 3fcc5803..21ff2e94 100644
--- a/redalert/function.h
+++ b/redalert/function.h
@@ -133,6 +133,7 @@ bool PlayMpegMovie(const char* name);
 #endif
 
 #include "externs.h"
+#include "keyframe.h"
 
 extern int Get_CD_Drive(void);
 extern void Fatal(char const* message, ...);