Small fixups to build use empty decleration and include extra header