Reorganize lib dependency
Added missing include