diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 53ce50c7ff..0f39a63931 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -25,9 +25,9 @@ UNAME_S := $(shell uname -s)
 # include py core make definitions
 include $(TOP)/py/py.mk
 
-INC +=  -I.
-INC +=  -I$(TOP)
+INC += -I.
 INC += -I$(BUILD)
+INC += -I$(TOP)
 
 # compiler settings
 CWARN = -Wall -Werror
@@ -68,7 +68,7 @@ ifneq (,$(findstring mingw,$(COMPILER_TARGET)))
 	SRC_C += ports/windows/fmode.c
 endif
 
-OBJ = $(PY_O)
+OBJ = $(PY_CORE_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 include $(TOP)/py/mkrules.mk
diff --git a/mpy-cross/mphalport.h b/mpy-cross/mphalport.h
index 4bd8276f34..3835928315 100644
--- a/mpy-cross/mphalport.h
+++ b/mpy-cross/mphalport.h
@@ -1 +1,2 @@
-// empty file
+// prevent including extmod/virtpin.h
+#define mp_hal_pin_obj_t