fix some problems with includes and complex constants