This patch mostly reorganizes include files and eliminates some useless trailing whitespace. It also adopts the standard procps-ng unconditional approach to nls initialization.