Minor cleanups after rebase onto master

Fix merge edit mistake in CMakeLists.txt
Add missing includes in draw.c, keyevent.c

src/draw.c

@@ -20,6 +20,7 @@
 #include <stddef.h>       // for ptrdiff_t
 #include <stdlib.h>       // for abs
 #include "adr68k.h"       // for NativeAligned2FromLAddr
+#include "bitblt.h"       // for MOUSEXR, MOUSEYH
 #include "display.h"      // for DISPLAYBUFFER, DisplayRegion68k, in_display...
 #include "drawdefs.h"     // for N_OP_drawline
 #include "emlglob.h"

src/keyevent.c

@@ -45,6 +45,7 @@ void Mouse_hndlr(void); /* Fields mouse events from driver        */
 #include "adr68k.h"
 #include "address.h"
 #include "stack.h"
+#include "initdspdefs.h"
 #include "keyboard.h"
 #include "display.h"
 #include "lsptypes.h"