Final merge fixups.
Move dummy configure.h into include.