diff --git a/makefile b/makefile
index 560364a5a4..167bfd79b9 100755
--- a/makefile
+++ b/makefile
@@ -50,6 +50,22 @@ ifeq ($(codegen-targets),all)
 	options := $(options)-all
 endif
 
+ifeq ($(filter debug debug-fast fast small,$(mode)),)
+	x := $(error "'$(mode)' is not a valid mode (choose one of: debug debug-fast fast small)")
+endif
+
+ifeq ($(filter compile interpret,$(process)),)
+	x := $(error "'$(process)' is not a valid process (choose one of: compile interpret)")
+endif
+
+ifeq ($(filter x86_64 i386 arm,$(arch)),)
+	x := $(error "'$(arch)' is not a supported architecture (choose one of: x86_64 i386 arm)")
+endif
+
+ifeq ($(filter linux windows darwin freebsd,$(platform)),)
+	x := $(error "'$(platform)' is not a supported platform (choose one of: linux windows darwin freebsd)")
+endif
+
 aot-only = false
 root := $(shell (cd .. && pwd))
 build = build/$(platform)-$(arch)$(options)
@@ -107,6 +123,10 @@ ifneq ($(openjdk),)
 		openjdk-arch = amd64
 	endif
 
+	ifneq ($(android),)
+		x := $(error "android and openjdk are incompatible")
+	endif
+
 	ifneq ($(openjdk-src),)
 		include openjdk-src.mk
 		options := $(options)-openjdk-src
@@ -1436,7 +1456,7 @@ run: build
 
 .PHONY: debug
 debug: build
-	$(library-path) gdb --args $(test-executable) $(test-args)
+	$(library-path) $(db) $(test-executable) $(test-args)
 
 .PHONY: vg
 vg: build
diff --git a/openjdk-src.mk b/openjdk-src.mk
index ea4acd9c03..feeb3b3674 100644
--- a/openjdk-src.mk
+++ b/openjdk-src.mk
@@ -305,7 +305,12 @@ else
 		"-I$(openjdk-src)/solaris/native/sun/nio/ch" \
 		"-I$(openjdk-src)/solaris/javavm/include" \
 		"-I$(openjdk-src)/solaris/hpi/include" \
-		"-I$(openjdk-src)/solaris/native/common/deps"
+		"-I$(openjdk-src)/solaris/native/common/deps" \
+		"-I$(openjdk-src)/solaris/native/common/deps/fontconfig2" \
+		"-I$(openjdk-src)/solaris/native/common/deps/gconf2" \
+		"-I$(openjdk-src)/solaris/native/common/deps/glib2" \
+		"-I$(openjdk-src)/solaris/native/common/deps/gtk2" \
+		"-DX11_PATH=\"/usr/X11R6\""
 
 	ifeq ($(platform),linux)
 		openjdk-sources += \