Forward declaration cleanup

— plus some spacing between master header and other included headers