Fix line suggestions.  resolve some indirect dependencies as direct ones, remove extern declarations from .cpp files.