Modified how constants are included, see #96.