Modified headers to limit dependencies