diff --git a/makefile b/makefile
index dff412e0dd2..ecb7995e7fa 100644
--- a/makefile
+++ b/makefile
@@ -1414,7 +1414,7 @@ endif
 .PHONY: cmake
 cmake: generate
 	$(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) cmake
-ifeq ($(OS),windows)
+ifneq (posix,$(SHELLTYPE))
 	$(SILENT)echo cmake_minimum_required(VERSION 2.8.4) > CMakeLists.txt
 	$(SILENT)echo add_subdirectory($(PROJECTDIR)/cmake) >> CMakeLists.txt
 else
diff --git a/src/mame/machine/atarixga.cpp b/src/mame/machine/atarixga.cpp
index ac423c9c641..f2a03af5073 100644
--- a/src/mame/machine/atarixga.cpp
+++ b/src/mame/machine/atarixga.cpp
@@ -18,6 +18,7 @@
  
 *************************************************************************/
 
+#include "emu.h"
 #include "atarixga.h"