In favor of forward delaration and/or inclusion of more specialized
headers.

Change-Id: I75f727cc50228b8958b60173ce14e5ce1fb7e6f7