regexp improvements for include handling