Fixing j7 includes now that real type has been changed