Cleanup, migrate the remaining interface_* stuff out of generic-definitions

Change-Id: I6f0eabc40f2ea6c003e2047f086fc8210a7f987d