Merge from master for formatting. Remove some include_file.c comments, but keep others for reference. Keep changes from master otherwise