diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/include/iochannel.h
similarity index 100%
rename from drivers/staging/unisys/common-spar/include/channels/iochannel.h
rename to drivers/staging/unisys/include/iochannel.h
diff --git a/drivers/staging/unisys/common-spar/include/version.h b/drivers/staging/unisys/include/version.h
similarity index 100%
rename from drivers/staging/unisys/common-spar/include/version.h
rename to drivers/staging/unisys/include/version.h
diff --git a/drivers/staging/unisys/common-spar/include/controlvmcompletionstatus.h b/drivers/staging/unisys/visorbus/controlvmcompletionstatus.h
similarity index 100%
rename from drivers/staging/unisys/common-spar/include/controlvmcompletionstatus.h
rename to drivers/staging/unisys/visorbus/controlvmcompletionstatus.h