cocos2d-x 3.0alpha1 UILayer missing headers

I got problem when importing UILayer to my project using
#include “UILayer.h”

I got missing headers of “gui/xxx.h”

I solved it by removing “gui/” from the include path. Is it the best way to solve this? Or am I missing something?

This solution creating another problem when compiling for android. I ran build_native.py, I got error can’t find “UILayer.h”. So I have to change the path to “gui/UILayer.h” again, which then breaks when compiling in win32.

Is there any better solution for this?