Clean up some boolean definitions/includes