Modified cpp imports