hide constant definitions, reorg headers, less copying