Some changes at includes after experiencing building problems on Ubuntu14.04. Now fixed.