diff --git a/makefile b/makefile
index f4b45b1b0e..5f8923b19e 100755
--- a/makefile
+++ b/makefile
@@ -640,9 +640,7 @@ endif
 openjdk-extra-cflags += $(classpath-extra-cflags)
 
 ifeq ($(platform),windows)
-	ifeq ($(target-format),)
-		target-format = pe
-	endif
+	target-format = pe
 
 	inc = "$(win32)/include"
 	lib = "$(win32)/lib"
@@ -1006,8 +1004,6 @@ endif
 endif
 endif
 
-build-cflags += -DAVIAN_HOST_TARGET
-
 c-objects = $(foreach x,$(1),$(patsubst $(2)/%.c,$(3)/%.o,$(x)))
 cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
 asm-objects = $(foreach x,$(1),$(patsubst $(2)/%.$(asm-format),$(3)/%-asm.o,$(x)))