Should these only be added when building with AquaTerm?