Removed Constants.h from headers to be copied