u/danielw/dm-1395

Creating PR for reviewing DM-1395
I'm not sure I understand this. WE updated swig scanner recently to better handle mixed-style includes in swig files. Could you verify that there is still problem with our current setup?