Added missing header file items and reordered for commonality