cleanup: const definition, unused includes,...