Remove unused MANUAL_INCLUDES array from UcdLookups
Merged changes from master