Working include_folder, updates to rpminfo