Wrapper headers and added headers for legacy-support-devel
