Removed even more dependencies between headers