[Resolved] Issues compiling latest build

Code:
1>------ Build started: Project: Core, Configuration: Release x64 ------

1>  sceCcc.cpp

1>HLE\sceCcc.cpp(110): error C2039: 'encodeUnits' : is not a member of 'UTF16_Type<true>'

1>HLE\sceCcc.cpp(110): error C3861: 'encodeUnits': identifier not found

1>HLE\sceCcc.cpp(146): error C2039: 'encodeUnits' : is not a member of 'ShiftJIS'

1>          C:\Users\Michael\ppsspp-git\native\util/text/shiftjis.h(7) : see declaration of 'ShiftJIS'

1>HLE\sceCcc.cpp(146): error C3861: 'encodeUnits': identifier not found

1>HLE\sceCcc.cpp(177): error C2039: 'encodeUnits' : is not a member of 'UTF8'

1>          C:\Users\Michael\ppsspp-git\native\util/text/utf8.h(26) : see declaration of 'UTF8'

1>HLE\sceCcc.cpp(177): error C3861: 'encodeUnits': identifier not found

1>HLE\sceCcc.cpp(186): error C2039: 'shortIndex' : is not a member of 'UTF16_Type<true>'

1>HLE\sceCcc.cpp(186): error C2660: 'CBreakPoints::ExecMemCheck' : function does not take 3 arguments

1>HLE\sceCcc.cpp(213): error C2039: 'encodeUnits' : is not a member of 'ShiftJIS'

1>          C:\Users\Michael\ppsspp-git\native\util/text/shiftjis.h(7) : see declaration of 'ShiftJIS'

1>HLE\sceCcc.cpp(213): error C3861: 'encodeUnits': identifier not found

1>HLE\sceCcc.cpp(222): error C2039: 'shortIndex' : is not a member of 'UTF16_Type<true>'

1>HLE\sceCcc.cpp(222): error C2660: 'CBreakPoints::ExecMemCheck' : function does not take 3 arguments

1>HLE\sceCcc.cpp(249): error C2039: 'encodeUnits' : is not a member of 'UTF8'

1>          C:\Users\Michael\ppsspp-git\native\util/text/utf8.h(26) : see declaration of 'UTF8'

1>HLE\sceCcc.cpp(249): error C3861: 'encodeUnits': identifier not found

1>HLE\sceCcc.cpp(285): error C2039: 'encodeUnits' : is not a member of 'UTF16_Type<true>'

1>HLE\sceCcc.cpp(285): error C3861: 'encodeUnits': identifier not found

1>HLE\sceCcc.cpp(413): error C2039: 'shortIndex' : is not a member of 'UTF16_Type<true>'

2>------ Build started: Project: UI, Configuration: Release x64 ------

2>  GameSettingsScreen.cpp

2>GameSettingsScreen.cpp(111): error C2664: 'UI::PopupSliderChoice::PopupSliderChoice(const UI::PopupSliderChoice &)' : cannot convert argument 5 from 'int' to 'ScreenManager *'

2>          Conversion from integral type to pointer type requires reinterpret_cast, C-style cast or function-style cast

========== Build: 0 succeeded, 2 failed, 8 up-to-date, 0 skipped ==========