From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Mon, 5 Oct 2020 15:01:10 +0000 (+0000)
Subject: Merge branch '1785-5' into 'master'
X-Git-Tag: 2.46.0~20^2^2~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3edc779afd05fe0cccea8d430786372a05eff521;p=graphviz

Merge branch '1785-5' into 'master'

disambiguate #includes (5/5)

Closes #1785 and #1242

See merge request graphviz/graphviz!1594
---

3edc779afd05fe0cccea8d430786372a05eff521