Solvent structure effects in the macroscopic theory of van der Waals forces