The only include path now needed is for drivers (in particular GDISP drivers)
Naming is more consistent with the new scheme. May affect some third party drivers (header file renames).