Rather than include twice, which is tricky but may confuse

This is the easiest way to make button pin testing consistent without
renaming all the button pins. Just make a macro especially for testing
if button pins are set, since they are named consistently in the pins
files.

Following up on #3231