patch applied (hugs98): Further changes to complete the transition to a multi-line list for include directories, fixes bug #66