Add header/footer includes again