Remove extern references to constants that no longer exist. Remove reference to header that no longer exists. Re-order headers for clarity. Add comments to identify why headers are grouped together.