- Change header inclusion order
- Change breakpoint id to int