cstyle, header reorganization