Corrected errors when including libraries on desktop(23/07/14 - 2)