Move headers included only in svtools to svtools

Change-Id: I66e443b5b641aaf16e1918f139a6b6a173ef7d4c