Use generic topology.h where appropriate

Release: 2.5.50

Developer: Matthew Dobson

Patched against: linux-2.5.50