dependency organization fixes + missing include

... fix missing include in ScreenManager