fix compilation with the new folder structure

[Dirk Hohndel]

On Tue, Apr 05, 2016 at 02:22:00PM -0300, Tomaz Canabrava wrote:
> I was having a few issues with building,
> it seems that the new folder architecture was not applied correctly on the
> include headers sometimes. :)

Yes, there are a number of issues, as I exected. Linus had fixed some of
these already, so I'll pick the missing ones from your patch and drop the
completely unrelated noise where width and height in ui files got
modified...

/D