diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile
index 8afd8b50bb..bbfa62a25a 100644
--- a/atmel-samd/Makefile
+++ b/atmel-samd/Makefile
@@ -227,7 +227,6 @@ SRC_C = \
 
 STM_SRC_C = $(addprefix stmhal/,\
 	pybstdio.c \
-	input.c \
 	)
 
 SRC_BINDINGS = \
diff --git a/atmel-samd/mpconfigport.h b/atmel-samd/mpconfigport.h
index 4256e4daa9..926bff72b6 100644
--- a/atmel-samd/mpconfigport.h
+++ b/atmel-samd/mpconfigport.h
@@ -115,6 +115,7 @@ typedef long mp_off_t;
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
 
 // board specific definitions
diff --git a/esp8266/Makefile b/esp8266/Makefile
index 8b8e130deb..2e92e1c0a7 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -141,7 +141,6 @@ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE))
 
 STM_SRC_C = $(addprefix stmhal/,\
 	pybstdio.c \
-	input.c \
 	)
 
 EXTMOD_SRC_C = $(addprefix extmod/,\
diff --git a/stmhal/input.c b/py/builtininput.c
similarity index 100%
rename from stmhal/input.c
rename to py/builtininput.c
diff --git a/py/py.mk b/py/py.mk
index ec22fbe63a..0e2c6c1f3f 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -188,6 +188,7 @@ PY_O_BASENAME = \
 	stream.o \
 	binary.o \
 	builtinimport.o \
+	builtininput.o \
 	builtinevex.o \
 	modarray.o \
 	modbuiltins.o \
diff --git a/stmhal/Makefile b/stmhal/Makefile
index 03b00fbd37..6073a76909 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -144,7 +144,6 @@ SRC_C = \
 	gccollect.c \
 	pybstdio.c \
 	help.c \
-	input.c \
 	machine_i2c.c \
 	modmachine.c \
 	modpyb.c \
diff --git a/teensy/Makefile b/teensy/Makefile
index 5eb8716611..a38916ff86 100644
--- a/teensy/Makefile
+++ b/teensy/Makefile
@@ -94,7 +94,6 @@ SRC_C = \
 
 STM_SRC_C = $(addprefix stmhal/,\
 	gccollect.c \
-	input.c \
 	irq.c \
 	pin.c \
 	pin_named_pins.c \