More input.h integration