Move these headers from include to svx; they are not used outside svx.

Change-Id: I8685b451a39e890250a3309ddb70346bac4084b2