Prepare for move to hardware/google/gfxstream

Move codegen into what will become
hardware/google/gfxstream/codegen/vulkan
and move generated vulkan headers into what will become
hardware/google/gfxstream/common/vulkan.

Bug: 271464937
Test: presubmit
Test: python android/build/python/cmake.py --gfxstream
Change-Id: Ie0465ac72b4a2f7444b595cd1421e2e3cb1d0997
diff --git a/Android.bp b/Android.bp
index 5ef59a0..dac09de 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,13 +15,3 @@
         "LICENSE",
     ],
 }
-
-cc_library_headers {
-    name: "gfxstream_vulkan_headers",
-    export_include_dirs: ["include/vulkan/include"],
-    host_supported: true,
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.virt",
-    ],
-}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f40bec..79f15d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,4 @@
 project(gfxstream-protocols)
 cmake_minimum_required(VERSION 3.11)
 
-add_library(gfxstream_vulkan_headers INTERFACE)
-target_include_directories(
-    gfxstream_vulkan_headers
-    INTERFACE include/vulkan/include)
+add_subdirectory(common)
\ No newline at end of file
diff --git a/scripts/generate-vulkan-sources.sh b/codegen/scripts/generate-vulkan-sources.sh
similarity index 96%
rename from scripts/generate-vulkan-sources.sh
rename to codegen/scripts/generate-vulkan-sources.sh
index edb476d..3f3da70 100755
--- a/scripts/generate-vulkan-sources.sh
+++ b/codegen/scripts/generate-vulkan-sources.sh
@@ -26,11 +26,11 @@
     AOSP_DIR=$(pwd)/../..
     export GOLDFISH_OPENGL_DIR=$AOSP_DIR/device/generic/goldfish-opengl
     export VULKAN_CEREAL_DIR=$AOSP_DIR/device/generic/vulkan-cereal
-    export VULKAN_REGISTRY_DIR=$AOSP_DIR/external/gfxstream-protocols/registry/vulkan
+    export VULKAN_REGISTRY_DIR=$AOSP_DIR/external/gfxstream-protocols/codegen/vulkan
 else
     export GOLDFISH_OPENGL_DIR=$1
     export VULKAN_CEREAL_DIR=$2
-    export VULKAN_REGISTRY_DIR=registry/vulkan
+    export VULKAN_REGISTRY_DIR=codegen/vulkan
 fi
 
 # Detect clang-format
@@ -40,7 +40,7 @@
 fi
 
 # Generate Vulkan headers
-VULKAN_HEADERS_ROOT=$PROJECT_ROOT/include/vulkan
+VULKAN_HEADERS_ROOT=$PROJECT_ROOT/common/vulkan
 rm -rf $VULKAN_HEADERS_ROOT && mkdir -p $VULKAN_HEADERS_ROOT
 if [ $? -ne 0 ]; then
     echo "Failed to clear the old Vulkan headers." 1>&2
diff --git a/registry/vulkan/BUILD.adoc b/codegen/vulkan/BUILD.adoc
similarity index 100%
rename from registry/vulkan/BUILD.adoc
rename to codegen/vulkan/BUILD.adoc
diff --git a/registry/vulkan/CODE_OF_CONDUCT.adoc b/codegen/vulkan/CODE_OF_CONDUCT.adoc
similarity index 100%
rename from registry/vulkan/CODE_OF_CONDUCT.adoc
rename to codegen/vulkan/CODE_OF_CONDUCT.adoc
diff --git a/registry/vulkan/CONTRIBUTING.adoc b/codegen/vulkan/CONTRIBUTING.adoc
similarity index 100%
rename from registry/vulkan/CONTRIBUTING.adoc
rename to codegen/vulkan/CONTRIBUTING.adoc
diff --git a/registry/vulkan/COPYING.adoc b/codegen/vulkan/COPYING.adoc
similarity index 100%
rename from registry/vulkan/COPYING.adoc
rename to codegen/vulkan/COPYING.adoc
diff --git a/registry/vulkan/ChangeLog.txt b/codegen/vulkan/ChangeLog.txt
similarity index 100%
rename from registry/vulkan/ChangeLog.txt
rename to codegen/vulkan/ChangeLog.txt
diff --git a/registry/vulkan/LICENSE.adoc b/codegen/vulkan/LICENSE.adoc
similarity index 100%
rename from registry/vulkan/LICENSE.adoc
rename to codegen/vulkan/LICENSE.adoc
diff --git a/registry/vulkan/LICENSES/Apache-2.0.txt b/codegen/vulkan/LICENSES/Apache-2.0.txt
similarity index 100%
rename from registry/vulkan/LICENSES/Apache-2.0.txt
rename to codegen/vulkan/LICENSES/Apache-2.0.txt
diff --git a/registry/vulkan/LICENSES/CC-BY-4.0.txt b/codegen/vulkan/LICENSES/CC-BY-4.0.txt
similarity index 100%
rename from registry/vulkan/LICENSES/CC-BY-4.0.txt
rename to codegen/vulkan/LICENSES/CC-BY-4.0.txt
diff --git a/registry/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt b/codegen/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt
similarity index 100%
rename from registry/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt
rename to codegen/vulkan/LICENSES/LicenseRef-KhronosSpecCopyright.txt
diff --git a/registry/vulkan/LICENSES/LicenseRef-MPLUS.txt b/codegen/vulkan/LICENSES/LicenseRef-MPLUS.txt
similarity index 100%
rename from registry/vulkan/LICENSES/LicenseRef-MPLUS.txt
rename to codegen/vulkan/LICENSES/LicenseRef-MPLUS.txt
diff --git a/registry/vulkan/LICENSES/MIT.txt b/codegen/vulkan/LICENSES/MIT.txt
similarity index 100%
rename from registry/vulkan/LICENSES/MIT.txt
rename to codegen/vulkan/LICENSES/MIT.txt
diff --git a/registry/vulkan/Makefile b/codegen/vulkan/Makefile
similarity index 100%
rename from registry/vulkan/Makefile
rename to codegen/vulkan/Makefile
diff --git a/registry/vulkan/README.adoc b/codegen/vulkan/README.adoc
similarity index 100%
rename from registry/vulkan/README.adoc
rename to codegen/vulkan/README.adoc
diff --git a/registry/vulkan/copyright-spec.txt b/codegen/vulkan/copyright-spec.txt
similarity index 100%
rename from registry/vulkan/copyright-spec.txt
rename to codegen/vulkan/copyright-spec.txt
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std.h
similarity index 100%
rename from include/vulkan/include/vk_video/vulkan_video_codec_h264std.h
rename to codegen/vulkan/include/vk_video/vulkan_video_codec_h264std.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
similarity index 100%
rename from include/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
rename to codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
similarity index 100%
rename from include/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
rename to codegen/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std.h
similarity index 100%
rename from include/vulkan/include/vk_video/vulkan_video_codec_h265std.h
rename to codegen/vulkan/include/vk_video/vulkan_video_codec_h265std.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
similarity index 100%
rename from include/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
rename to codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h b/codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
similarity index 100%
rename from include/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
rename to codegen/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codecs_common.h b/codegen/vulkan/include/vk_video/vulkan_video_codecs_common.h
similarity index 100%
rename from include/vulkan/include/vk_video/vulkan_video_codecs_common.h
rename to codegen/vulkan/include/vk_video/vulkan_video_codecs_common.h
diff --git a/include/vulkan/include/vulkan/vk_platform.h b/codegen/vulkan/include/vulkan/vk_platform.h
similarity index 100%
rename from include/vulkan/include/vulkan/vk_platform.h
rename to codegen/vulkan/include/vulkan/vk_platform.h
diff --git a/include/vulkan/include/vulkan/vulkan.h b/codegen/vulkan/include/vulkan/vulkan.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan.h
rename to codegen/vulkan/include/vulkan/vulkan.h
diff --git a/registry/vulkan/package-lock.json b/codegen/vulkan/package-lock.json
similarity index 100%
rename from registry/vulkan/package-lock.json
rename to codegen/vulkan/package-lock.json
diff --git a/registry/vulkan/package.json b/codegen/vulkan/package.json
similarity index 100%
rename from registry/vulkan/package.json
rename to codegen/vulkan/package.json
diff --git a/registry/vulkan/registry.txt b/codegen/vulkan/registry.txt
similarity index 100%
rename from registry/vulkan/registry.txt
rename to codegen/vulkan/registry.txt
diff --git a/registry/vulkan/scripts/README.adoc b/codegen/vulkan/scripts/README.adoc
similarity index 100%
rename from registry/vulkan/scripts/README.adoc
rename to codegen/vulkan/scripts/README.adoc
diff --git a/registry/vulkan/scripts/Retired/checkLinks.py b/codegen/vulkan/scripts/Retired/checkLinks.py
similarity index 100%
rename from registry/vulkan/scripts/Retired/checkLinks.py
rename to codegen/vulkan/scripts/Retired/checkLinks.py
diff --git a/registry/vulkan/scripts/Retired/extensionStubSource.py b/codegen/vulkan/scripts/Retired/extensionStubSource.py
similarity index 100%
rename from registry/vulkan/scripts/Retired/extensionStubSource.py
rename to codegen/vulkan/scripts/Retired/extensionStubSource.py
diff --git a/registry/vulkan/scripts/Retired/findBalance.py b/codegen/vulkan/scripts/Retired/findBalance.py
similarity index 100%
rename from registry/vulkan/scripts/Retired/findBalance.py
rename to codegen/vulkan/scripts/Retired/findBalance.py
diff --git a/registry/vulkan/scripts/Retired/fixupRef.py b/codegen/vulkan/scripts/Retired/fixupRef.py
similarity index 100%
rename from registry/vulkan/scripts/Retired/fixupRef.py
rename to codegen/vulkan/scripts/Retired/fixupRef.py
diff --git a/registry/vulkan/scripts/Retired/insertTags.py b/codegen/vulkan/scripts/Retired/insertTags.py
similarity index 100%
rename from registry/vulkan/scripts/Retired/insertTags.py
rename to codegen/vulkan/scripts/Retired/insertTags.py
diff --git a/registry/vulkan/scripts/Retired/realign.py b/codegen/vulkan/scripts/Retired/realign.py
similarity index 100%
rename from registry/vulkan/scripts/Retired/realign.py
rename to codegen/vulkan/scripts/Retired/realign.py
diff --git a/registry/vulkan/scripts/Retired/refDesc.py b/codegen/vulkan/scripts/Retired/refDesc.py
similarity index 100%
rename from registry/vulkan/scripts/Retired/refDesc.py
rename to codegen/vulkan/scripts/Retired/refDesc.py
diff --git a/registry/vulkan/scripts/__init__.py.docs b/codegen/vulkan/scripts/__init__.py.docs
similarity index 100%
rename from registry/vulkan/scripts/__init__.py.docs
rename to codegen/vulkan/scripts/__init__.py.docs
diff --git a/registry/vulkan/scripts/asciidoctor-chunker/LICENSE b/codegen/vulkan/scripts/asciidoctor-chunker/LICENSE
similarity index 100%
rename from registry/vulkan/scripts/asciidoctor-chunker/LICENSE
rename to codegen/vulkan/scripts/asciidoctor-chunker/LICENSE
diff --git a/registry/vulkan/scripts/asciidoctor-chunker/README.md b/codegen/vulkan/scripts/asciidoctor-chunker/README.md
similarity index 100%
rename from registry/vulkan/scripts/asciidoctor-chunker/README.md
rename to codegen/vulkan/scripts/asciidoctor-chunker/README.md
diff --git a/registry/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js b/codegen/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js
similarity index 100%
rename from registry/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js
rename to codegen/vulkan/scripts/asciidoctor-chunker/asciidoctor-chunker.js
diff --git a/registry/vulkan/scripts/cereal/__init__.py b/codegen/vulkan/scripts/cereal/__init__.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/__init__.py
rename to codegen/vulkan/scripts/cereal/__init__.py
diff --git a/registry/vulkan/scripts/cereal/api_log_decoder.py b/codegen/vulkan/scripts/cereal/api_log_decoder.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/api_log_decoder.py
rename to codegen/vulkan/scripts/cereal/api_log_decoder.py
diff --git a/registry/vulkan/scripts/cereal/common/__init__.py b/codegen/vulkan/scripts/cereal/common/__init__.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/common/__init__.py
rename to codegen/vulkan/scripts/cereal/common/__init__.py
diff --git a/registry/vulkan/scripts/cereal/common/codegen.py b/codegen/vulkan/scripts/cereal/common/codegen.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/common/codegen.py
rename to codegen/vulkan/scripts/cereal/common/codegen.py
diff --git a/registry/vulkan/scripts/cereal/common/vulkantypes.py b/codegen/vulkan/scripts/cereal/common/vulkantypes.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/common/vulkantypes.py
rename to codegen/vulkan/scripts/cereal/common/vulkantypes.py
diff --git a/registry/vulkan/scripts/cereal/counting.py b/codegen/vulkan/scripts/cereal/counting.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/counting.py
rename to codegen/vulkan/scripts/cereal/counting.py
diff --git a/registry/vulkan/scripts/cereal/decoder.py b/codegen/vulkan/scripts/cereal/decoder.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/decoder.py
rename to codegen/vulkan/scripts/cereal/decoder.py
diff --git a/registry/vulkan/scripts/cereal/decodersnapshot.py b/codegen/vulkan/scripts/cereal/decodersnapshot.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/decodersnapshot.py
rename to codegen/vulkan/scripts/cereal/decodersnapshot.py
diff --git a/registry/vulkan/scripts/cereal/deepcopy.py b/codegen/vulkan/scripts/cereal/deepcopy.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/deepcopy.py
rename to codegen/vulkan/scripts/cereal/deepcopy.py
diff --git a/registry/vulkan/scripts/cereal/dispatch.py b/codegen/vulkan/scripts/cereal/dispatch.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/dispatch.py
rename to codegen/vulkan/scripts/cereal/dispatch.py
diff --git a/registry/vulkan/scripts/cereal/encoder.py b/codegen/vulkan/scripts/cereal/encoder.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/encoder.py
rename to codegen/vulkan/scripts/cereal/encoder.py
diff --git a/registry/vulkan/scripts/cereal/extensionstructs.py b/codegen/vulkan/scripts/cereal/extensionstructs.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/extensionstructs.py
rename to codegen/vulkan/scripts/cereal/extensionstructs.py
diff --git a/registry/vulkan/scripts/cereal/frontend.py b/codegen/vulkan/scripts/cereal/frontend.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/frontend.py
rename to codegen/vulkan/scripts/cereal/frontend.py
diff --git a/registry/vulkan/scripts/cereal/functable.py b/codegen/vulkan/scripts/cereal/functable.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/functable.py
rename to codegen/vulkan/scripts/cereal/functable.py
diff --git a/registry/vulkan/scripts/cereal/handlemap.py b/codegen/vulkan/scripts/cereal/handlemap.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/handlemap.py
rename to codegen/vulkan/scripts/cereal/handlemap.py
diff --git a/registry/vulkan/scripts/cereal/marshaling.py b/codegen/vulkan/scripts/cereal/marshaling.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/marshaling.py
rename to codegen/vulkan/scripts/cereal/marshaling.py
diff --git a/registry/vulkan/scripts/cereal/marshalingdefs.py b/codegen/vulkan/scripts/cereal/marshalingdefs.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/marshalingdefs.py
rename to codegen/vulkan/scripts/cereal/marshalingdefs.py
diff --git a/registry/vulkan/scripts/cereal/reservedmarshaling.py b/codegen/vulkan/scripts/cereal/reservedmarshaling.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/reservedmarshaling.py
rename to codegen/vulkan/scripts/cereal/reservedmarshaling.py
diff --git a/registry/vulkan/scripts/cereal/subdecode.py b/codegen/vulkan/scripts/cereal/subdecode.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/subdecode.py
rename to codegen/vulkan/scripts/cereal/subdecode.py
diff --git a/registry/vulkan/scripts/cereal/testing.py b/codegen/vulkan/scripts/cereal/testing.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/testing.py
rename to codegen/vulkan/scripts/cereal/testing.py
diff --git a/registry/vulkan/scripts/cereal/transform.py b/codegen/vulkan/scripts/cereal/transform.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/transform.py
rename to codegen/vulkan/scripts/cereal/transform.py
diff --git a/registry/vulkan/scripts/cereal/unbox.py b/codegen/vulkan/scripts/cereal/unbox.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/unbox.py
rename to codegen/vulkan/scripts/cereal/unbox.py
diff --git a/registry/vulkan/scripts/cereal/vkextensionstructuretype.py b/codegen/vulkan/scripts/cereal/vkextensionstructuretype.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/vkextensionstructuretype.py
rename to codegen/vulkan/scripts/cereal/vkextensionstructuretype.py
diff --git a/registry/vulkan/scripts/cereal/wrapperdefs.py b/codegen/vulkan/scripts/cereal/wrapperdefs.py
similarity index 100%
rename from registry/vulkan/scripts/cereal/wrapperdefs.py
rename to codegen/vulkan/scripts/cereal/wrapperdefs.py
diff --git a/registry/vulkan/scripts/cerealgenerator.py b/codegen/vulkan/scripts/cerealgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/cerealgenerator.py
rename to codegen/vulkan/scripts/cerealgenerator.py
diff --git a/registry/vulkan/scripts/cgenerator.py b/codegen/vulkan/scripts/cgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/cgenerator.py
rename to codegen/vulkan/scripts/cgenerator.py
diff --git a/registry/vulkan/scripts/checkXrefs b/codegen/vulkan/scripts/checkXrefs
similarity index 100%
rename from registry/vulkan/scripts/checkXrefs
rename to codegen/vulkan/scripts/checkXrefs
diff --git a/registry/vulkan/scripts/check_html_xrefs.py b/codegen/vulkan/scripts/check_html_xrefs.py
similarity index 100%
rename from registry/vulkan/scripts/check_html_xrefs.py
rename to codegen/vulkan/scripts/check_html_xrefs.py
diff --git a/registry/vulkan/scripts/check_spec_links.py b/codegen/vulkan/scripts/check_spec_links.py
similarity index 100%
rename from registry/vulkan/scripts/check_spec_links.py
rename to codegen/vulkan/scripts/check_spec_links.py
diff --git a/registry/vulkan/scripts/ci/check_undefined b/codegen/vulkan/scripts/ci/check_undefined
similarity index 100%
rename from registry/vulkan/scripts/ci/check_undefined
rename to codegen/vulkan/scripts/ci/check_undefined
diff --git a/registry/vulkan/scripts/comment_convert.py b/codegen/vulkan/scripts/comment_convert.py
similarity index 100%
rename from registry/vulkan/scripts/comment_convert.py
rename to codegen/vulkan/scripts/comment_convert.py
diff --git a/registry/vulkan/scripts/compImages.sh b/codegen/vulkan/scripts/compImages.sh
similarity index 100%
rename from registry/vulkan/scripts/compImages.sh
rename to codegen/vulkan/scripts/compImages.sh
diff --git a/registry/vulkan/scripts/conventions.py b/codegen/vulkan/scripts/conventions.py
similarity index 100%
rename from registry/vulkan/scripts/conventions.py
rename to codegen/vulkan/scripts/conventions.py
diff --git a/registry/vulkan/scripts/deperiodize_vuids.py b/codegen/vulkan/scripts/deperiodize_vuids.py
similarity index 100%
rename from registry/vulkan/scripts/deperiodize_vuids.py
rename to codegen/vulkan/scripts/deperiodize_vuids.py
diff --git a/registry/vulkan/scripts/docgenerator.py b/codegen/vulkan/scripts/docgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/docgenerator.py
rename to codegen/vulkan/scripts/docgenerator.py
diff --git a/registry/vulkan/scripts/extensionmetadocgenerator.py b/codegen/vulkan/scripts/extensionmetadocgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/extensionmetadocgenerator.py
rename to codegen/vulkan/scripts/extensionmetadocgenerator.py
diff --git a/registry/vulkan/scripts/genRef.py b/codegen/vulkan/scripts/genRef.py
similarity index 100%
rename from registry/vulkan/scripts/genRef.py
rename to codegen/vulkan/scripts/genRef.py
diff --git a/registry/vulkan/scripts/genRelease b/codegen/vulkan/scripts/genRelease
similarity index 100%
rename from registry/vulkan/scripts/genRelease
rename to codegen/vulkan/scripts/genRelease
diff --git a/registry/vulkan/scripts/genanchorlinks.py b/codegen/vulkan/scripts/genanchorlinks.py
similarity index 100%
rename from registry/vulkan/scripts/genanchorlinks.py
rename to codegen/vulkan/scripts/genanchorlinks.py
diff --git a/registry/vulkan/scripts/generator.py b/codegen/vulkan/scripts/generator.py
similarity index 100%
rename from registry/vulkan/scripts/generator.py
rename to codegen/vulkan/scripts/generator.py
diff --git a/registry/vulkan/scripts/genspec.py b/codegen/vulkan/scripts/genspec.py
similarity index 100%
rename from registry/vulkan/scripts/genspec.py
rename to codegen/vulkan/scripts/genspec.py
diff --git a/registry/vulkan/scripts/genvk.py b/codegen/vulkan/scripts/genvk.py
similarity index 100%
rename from registry/vulkan/scripts/genvk.py
rename to codegen/vulkan/scripts/genvk.py
diff --git a/registry/vulkan/scripts/globalizeIncludes b/codegen/vulkan/scripts/globalizeIncludes
similarity index 100%
rename from registry/vulkan/scripts/globalizeIncludes
rename to codegen/vulkan/scripts/globalizeIncludes
diff --git a/registry/vulkan/scripts/hostsyncgenerator.py b/codegen/vulkan/scripts/hostsyncgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/hostsyncgenerator.py
rename to codegen/vulkan/scripts/hostsyncgenerator.py
diff --git a/registry/vulkan/scripts/htmldiff/htmldiff b/codegen/vulkan/scripts/htmldiff/htmldiff
similarity index 100%
rename from registry/vulkan/scripts/htmldiff/htmldiff
rename to codegen/vulkan/scripts/htmldiff/htmldiff
diff --git a/registry/vulkan/scripts/htmldiff/htmldiff.pl b/codegen/vulkan/scripts/htmldiff/htmldiff.pl
similarity index 100%
rename from registry/vulkan/scripts/htmldiff/htmldiff.pl
rename to codegen/vulkan/scripts/htmldiff/htmldiff.pl
diff --git a/registry/vulkan/scripts/indexExt.py b/codegen/vulkan/scripts/indexExt.py
similarity index 100%
rename from registry/vulkan/scripts/indexExt.py
rename to codegen/vulkan/scripts/indexExt.py
diff --git a/registry/vulkan/scripts/interfacedocgenerator.py b/codegen/vulkan/scripts/interfacedocgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/interfacedocgenerator.py
rename to codegen/vulkan/scripts/interfacedocgenerator.py
diff --git a/registry/vulkan/scripts/linkcheck.py b/codegen/vulkan/scripts/linkcheck.py
similarity index 100%
rename from registry/vulkan/scripts/linkcheck.py
rename to codegen/vulkan/scripts/linkcheck.py
diff --git a/registry/vulkan/scripts/make_ext_dependency.py b/codegen/vulkan/scripts/make_ext_dependency.py
similarity index 100%
rename from registry/vulkan/scripts/make_ext_dependency.py
rename to codegen/vulkan/scripts/make_ext_dependency.py
diff --git a/registry/vulkan/scripts/makemanaliases.py b/codegen/vulkan/scripts/makemanaliases.py
similarity index 100%
rename from registry/vulkan/scripts/makemanaliases.py
rename to codegen/vulkan/scripts/makemanaliases.py
diff --git a/registry/vulkan/scripts/promote.py b/codegen/vulkan/scripts/promote.py
similarity index 100%
rename from registry/vulkan/scripts/promote.py
rename to codegen/vulkan/scripts/promote.py
diff --git a/registry/vulkan/scripts/pygenerator.py b/codegen/vulkan/scripts/pygenerator.py
similarity index 100%
rename from registry/vulkan/scripts/pygenerator.py
rename to codegen/vulkan/scripts/pygenerator.py
diff --git a/registry/vulkan/scripts/reflib.py b/codegen/vulkan/scripts/reflib.py
similarity index 100%
rename from registry/vulkan/scripts/reflib.py
rename to codegen/vulkan/scripts/reflib.py
diff --git a/registry/vulkan/scripts/reflow.py b/codegen/vulkan/scripts/reflow.py
similarity index 100%
rename from registry/vulkan/scripts/reflow.py
rename to codegen/vulkan/scripts/reflow.py
diff --git a/registry/vulkan/scripts/reg.py b/codegen/vulkan/scripts/reg.py
similarity index 100%
rename from registry/vulkan/scripts/reg.py
rename to codegen/vulkan/scripts/reg.py
diff --git a/registry/vulkan/scripts/rubygenerator.py b/codegen/vulkan/scripts/rubygenerator.py
similarity index 100%
rename from registry/vulkan/scripts/rubygenerator.py
rename to codegen/vulkan/scripts/rubygenerator.py
diff --git a/registry/vulkan/scripts/scriptgenerator.py b/codegen/vulkan/scripts/scriptgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/scriptgenerator.py
rename to codegen/vulkan/scripts/scriptgenerator.py
diff --git a/registry/vulkan/scripts/spec_tools/__init__.py b/codegen/vulkan/scripts/spec_tools/__init__.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/__init__.py
rename to codegen/vulkan/scripts/spec_tools/__init__.py
diff --git a/registry/vulkan/scripts/spec_tools/algo.py b/codegen/vulkan/scripts/spec_tools/algo.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/algo.py
rename to codegen/vulkan/scripts/spec_tools/algo.py
diff --git a/registry/vulkan/scripts/spec_tools/attributes.py b/codegen/vulkan/scripts/spec_tools/attributes.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/attributes.py
rename to codegen/vulkan/scripts/spec_tools/attributes.py
diff --git a/registry/vulkan/scripts/spec_tools/base_printer.py b/codegen/vulkan/scripts/spec_tools/base_printer.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/base_printer.py
rename to codegen/vulkan/scripts/spec_tools/base_printer.py
diff --git a/registry/vulkan/scripts/spec_tools/consistency_tools.py b/codegen/vulkan/scripts/spec_tools/consistency_tools.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/consistency_tools.py
rename to codegen/vulkan/scripts/spec_tools/consistency_tools.py
diff --git a/registry/vulkan/scripts/spec_tools/console_printer.py b/codegen/vulkan/scripts/spec_tools/console_printer.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/console_printer.py
rename to codegen/vulkan/scripts/spec_tools/console_printer.py
diff --git a/registry/vulkan/scripts/spec_tools/data_structures.py b/codegen/vulkan/scripts/spec_tools/data_structures.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/data_structures.py
rename to codegen/vulkan/scripts/spec_tools/data_structures.py
diff --git a/registry/vulkan/scripts/spec_tools/entity_db.py b/codegen/vulkan/scripts/spec_tools/entity_db.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/entity_db.py
rename to codegen/vulkan/scripts/spec_tools/entity_db.py
diff --git a/registry/vulkan/scripts/spec_tools/file_process.py b/codegen/vulkan/scripts/spec_tools/file_process.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/file_process.py
rename to codegen/vulkan/scripts/spec_tools/file_process.py
diff --git a/registry/vulkan/scripts/spec_tools/html_printer.py b/codegen/vulkan/scripts/spec_tools/html_printer.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/html_printer.py
rename to codegen/vulkan/scripts/spec_tools/html_printer.py
diff --git a/registry/vulkan/scripts/spec_tools/macro_checker.py b/codegen/vulkan/scripts/spec_tools/macro_checker.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/macro_checker.py
rename to codegen/vulkan/scripts/spec_tools/macro_checker.py
diff --git a/registry/vulkan/scripts/spec_tools/macro_checker_file.py b/codegen/vulkan/scripts/spec_tools/macro_checker_file.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/macro_checker_file.py
rename to codegen/vulkan/scripts/spec_tools/macro_checker_file.py
diff --git a/registry/vulkan/scripts/spec_tools/main.py b/codegen/vulkan/scripts/spec_tools/main.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/main.py
rename to codegen/vulkan/scripts/spec_tools/main.py
diff --git a/registry/vulkan/scripts/spec_tools/shared.py b/codegen/vulkan/scripts/spec_tools/shared.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/shared.py
rename to codegen/vulkan/scripts/spec_tools/shared.py
diff --git a/registry/vulkan/scripts/spec_tools/util.py b/codegen/vulkan/scripts/spec_tools/util.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/util.py
rename to codegen/vulkan/scripts/spec_tools/util.py
diff --git a/registry/vulkan/scripts/spec_tools/validity.py b/codegen/vulkan/scripts/spec_tools/validity.py
similarity index 100%
rename from registry/vulkan/scripts/spec_tools/validity.py
rename to codegen/vulkan/scripts/spec_tools/validity.py
diff --git a/registry/vulkan/scripts/spirvcapgenerator.py b/codegen/vulkan/scripts/spirvcapgenerator.py
similarity index 100%
rename from registry/vulkan/scripts/spirvcapgenerator.py
rename to codegen/vulkan/scripts/spirvcapgenerator.py
diff --git a/registry/vulkan/scripts/testSpecVersion.py b/codegen/vulkan/scripts/testSpecVersion.py
similarity index 100%
rename from registry/vulkan/scripts/testSpecVersion.py
rename to codegen/vulkan/scripts/testSpecVersion.py
diff --git a/registry/vulkan/scripts/test_check_spec_links.py b/codegen/vulkan/scripts/test_check_spec_links.py
similarity index 100%
rename from registry/vulkan/scripts/test_check_spec_links.py
rename to codegen/vulkan/scripts/test_check_spec_links.py
diff --git a/registry/vulkan/scripts/test_check_spec_links_api_specific.py b/codegen/vulkan/scripts/test_check_spec_links_api_specific.py
similarity index 100%
rename from registry/vulkan/scripts/test_check_spec_links_api_specific.py
rename to codegen/vulkan/scripts/test_check_spec_links_api_specific.py
diff --git a/registry/vulkan/scripts/test_entity_db.py b/codegen/vulkan/scripts/test_entity_db.py
similarity index 100%
rename from registry/vulkan/scripts/test_entity_db.py
rename to codegen/vulkan/scripts/test_entity_db.py
diff --git a/registry/vulkan/scripts/translate_math.js b/codegen/vulkan/scripts/translate_math.js
similarity index 100%
rename from registry/vulkan/scripts/translate_math.js
rename to codegen/vulkan/scripts/translate_math.js
diff --git a/registry/vulkan/scripts/validitygenerator.py b/codegen/vulkan/scripts/validitygenerator.py
similarity index 100%
rename from registry/vulkan/scripts/validitygenerator.py
rename to codegen/vulkan/scripts/validitygenerator.py
diff --git a/registry/vulkan/scripts/vkconventions.py b/codegen/vulkan/scripts/vkconventions.py
similarity index 100%
rename from registry/vulkan/scripts/vkconventions.py
rename to codegen/vulkan/scripts/vkconventions.py
diff --git a/registry/vulkan/scripts/xml_consistency.py b/codegen/vulkan/scripts/xml_consistency.py
similarity index 100%
rename from registry/vulkan/scripts/xml_consistency.py
rename to codegen/vulkan/scripts/xml_consistency.py
diff --git a/registry/vulkan/src/ext_loader/README.md b/codegen/vulkan/src/ext_loader/README.md
similarity index 100%
rename from registry/vulkan/src/ext_loader/README.md
rename to codegen/vulkan/src/ext_loader/README.md
diff --git a/registry/vulkan/styleguide.txt b/codegen/vulkan/styleguide.txt
similarity index 100%
rename from registry/vulkan/styleguide.txt
rename to codegen/vulkan/styleguide.txt
diff --git a/registry/vulkan/tests/README.adoc b/codegen/vulkan/tests/README.adoc
similarity index 100%
rename from registry/vulkan/tests/README.adoc
rename to codegen/vulkan/tests/README.adoc
diff --git a/registry/vulkan/tests/X11/Xlib.h b/codegen/vulkan/tests/X11/Xlib.h
similarity index 100%
rename from registry/vulkan/tests/X11/Xlib.h
rename to codegen/vulkan/tests/X11/Xlib.h
diff --git a/registry/vulkan/tests/X11/extensions/Xrandr.h b/codegen/vulkan/tests/X11/extensions/Xrandr.h
similarity index 100%
rename from registry/vulkan/tests/X11/extensions/Xrandr.h
rename to codegen/vulkan/tests/X11/extensions/Xrandr.h
diff --git a/registry/vulkan/tests/ggp_c/vulkan_types.h b/codegen/vulkan/tests/ggp_c/vulkan_types.h
similarity index 100%
rename from registry/vulkan/tests/ggp_c/vulkan_types.h
rename to codegen/vulkan/tests/ggp_c/vulkan_types.h
diff --git a/registry/vulkan/tests/hpptest.cpp b/codegen/vulkan/tests/hpptest.cpp
similarity index 100%
rename from registry/vulkan/tests/hpptest.cpp
rename to codegen/vulkan/tests/hpptest.cpp
diff --git a/registry/vulkan/tests/htest.c b/codegen/vulkan/tests/htest.c
similarity index 100%
rename from registry/vulkan/tests/htest.c
rename to codegen/vulkan/tests/htest.c
diff --git a/registry/vulkan/tests/screen/screen.h b/codegen/vulkan/tests/screen/screen.h
similarity index 100%
rename from registry/vulkan/tests/screen/screen.h
rename to codegen/vulkan/tests/screen/screen.h
diff --git a/registry/vulkan/tests/wayland-client.h b/codegen/vulkan/tests/wayland-client.h
similarity index 100%
rename from registry/vulkan/tests/wayland-client.h
rename to codegen/vulkan/tests/wayland-client.h
diff --git a/registry/vulkan/tests/windows.h b/codegen/vulkan/tests/windows.h
similarity index 100%
rename from registry/vulkan/tests/windows.h
rename to codegen/vulkan/tests/windows.h
diff --git a/registry/vulkan/tests/xcb/xcb.h b/codegen/vulkan/tests/xcb/xcb.h
similarity index 100%
rename from registry/vulkan/tests/xcb/xcb.h
rename to codegen/vulkan/tests/xcb/xcb.h
diff --git a/registry/vulkan/tests/zircon/types.h b/codegen/vulkan/tests/zircon/types.h
similarity index 100%
rename from registry/vulkan/tests/zircon/types.h
rename to codegen/vulkan/tests/zircon/types.h
diff --git a/registry/vulkan/update_valid_usage_ids.sh b/codegen/vulkan/update_valid_usage_ids.sh
similarity index 100%
rename from registry/vulkan/update_valid_usage_ids.sh
rename to codegen/vulkan/update_valid_usage_ids.sh
diff --git a/registry/vulkan/xml/Makefile b/codegen/vulkan/xml/Makefile
similarity index 100%
rename from registry/vulkan/xml/Makefile
rename to codegen/vulkan/xml/Makefile
diff --git a/registry/vulkan/xml/README.adoc b/codegen/vulkan/xml/README.adoc
similarity index 100%
rename from registry/vulkan/xml/README.adoc
rename to codegen/vulkan/xml/README.adoc
diff --git a/registry/vulkan/xml/generate-core-block.rb b/codegen/vulkan/xml/generate-core-block.rb
similarity index 100%
rename from registry/vulkan/xml/generate-core-block.rb
rename to codegen/vulkan/xml/generate-core-block.rb
diff --git a/registry/vulkan/xml/registry.rnc b/codegen/vulkan/xml/registry.rnc
similarity index 100%
rename from registry/vulkan/xml/registry.rnc
rename to codegen/vulkan/xml/registry.rnc
diff --git a/registry/vulkan/xml/vk.xml b/codegen/vulkan/xml/vk.xml
similarity index 100%
rename from registry/vulkan/xml/vk.xml
rename to codegen/vulkan/xml/vk.xml
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
new file mode 100644
index 0000000..09684e6
--- /dev/null
+++ b/common/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(vulkan)
\ No newline at end of file
diff --git a/common/vulkan/Android.bp b/common/vulkan/Android.bp
new file mode 100644
index 0000000..6267636
--- /dev/null
+++ b/common/vulkan/Android.bp
@@ -0,0 +1,9 @@
+cc_library_headers {
+    name: "gfxstream_vulkan_headers",
+    export_include_dirs: ["include"],
+    host_supported: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
+}
diff --git a/common/vulkan/CMakeLists.txt b/common/vulkan/CMakeLists.txt
new file mode 100644
index 0000000..d1a78ed
--- /dev/null
+++ b/common/vulkan/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_library(gfxstream_vulkan_headers INTERFACE)
+target_include_directories(
+    gfxstream_vulkan_headers
+    INTERFACE include)
+android_license(TARGET gfxstream_vulkan_headers LICENSE Apache-2.0)
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/common/vulkan/include/vk_video/vulkan_video_codec_h264std.h
similarity index 100%
copy from include/vulkan/include/vk_video/vulkan_video_codec_h264std.h
copy to common/vulkan/include/vk_video/vulkan_video_codec_h264std.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
similarity index 100%
copy from include/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
copy to common/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
similarity index 100%
copy from include/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
copy to common/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std.h b/common/vulkan/include/vk_video/vulkan_video_codec_h265std.h
similarity index 100%
copy from include/vulkan/include/vk_video/vulkan_video_codec_h265std.h
copy to common/vulkan/include/vk_video/vulkan_video_codec_h265std.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
similarity index 100%
copy from include/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
copy to common/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h b/common/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
similarity index 100%
copy from include/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
copy to common/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
diff --git a/include/vulkan/include/vk_video/vulkan_video_codecs_common.h b/common/vulkan/include/vk_video/vulkan_video_codecs_common.h
similarity index 100%
copy from include/vulkan/include/vk_video/vulkan_video_codecs_common.h
copy to common/vulkan/include/vk_video/vulkan_video_codecs_common.h
diff --git a/include/vulkan/include/vulkan/vk_platform.h b/common/vulkan/include/vulkan/vk_platform.h
similarity index 100%
copy from include/vulkan/include/vulkan/vk_platform.h
copy to common/vulkan/include/vulkan/vk_platform.h
diff --git a/include/vulkan/include/vulkan/vulkan.h b/common/vulkan/include/vulkan/vulkan.h
similarity index 100%
copy from include/vulkan/include/vulkan/vulkan.h
copy to common/vulkan/include/vulkan/vulkan.h
diff --git a/include/vulkan/include/vulkan/vulkan_android.h b/common/vulkan/include/vulkan/vulkan_android.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_android.h
rename to common/vulkan/include/vulkan/vulkan_android.h
diff --git a/include/vulkan/include/vulkan/vulkan_beta.h b/common/vulkan/include/vulkan/vulkan_beta.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_beta.h
rename to common/vulkan/include/vulkan/vulkan_beta.h
diff --git a/include/vulkan/include/vulkan/vulkan_core.h b/common/vulkan/include/vulkan/vulkan_core.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_core.h
rename to common/vulkan/include/vulkan/vulkan_core.h
diff --git a/include/vulkan/include/vulkan/vulkan_directfb.h b/common/vulkan/include/vulkan/vulkan_directfb.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_directfb.h
rename to common/vulkan/include/vulkan/vulkan_directfb.h
diff --git a/include/vulkan/include/vulkan/vulkan_fuchsia.h b/common/vulkan/include/vulkan/vulkan_fuchsia.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_fuchsia.h
rename to common/vulkan/include/vulkan/vulkan_fuchsia.h
diff --git a/include/vulkan/include/vulkan/vulkan_ggp.h b/common/vulkan/include/vulkan/vulkan_ggp.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_ggp.h
rename to common/vulkan/include/vulkan/vulkan_ggp.h
diff --git a/include/vulkan/include/vulkan/vulkan_ios.h b/common/vulkan/include/vulkan/vulkan_ios.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_ios.h
rename to common/vulkan/include/vulkan/vulkan_ios.h
diff --git a/include/vulkan/include/vulkan/vulkan_macos.h b/common/vulkan/include/vulkan/vulkan_macos.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_macos.h
rename to common/vulkan/include/vulkan/vulkan_macos.h
diff --git a/include/vulkan/include/vulkan/vulkan_metal.h b/common/vulkan/include/vulkan/vulkan_metal.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_metal.h
rename to common/vulkan/include/vulkan/vulkan_metal.h
diff --git a/include/vulkan/include/vulkan/vulkan_screen.h b/common/vulkan/include/vulkan/vulkan_screen.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_screen.h
rename to common/vulkan/include/vulkan/vulkan_screen.h
diff --git a/include/vulkan/include/vulkan/vulkan_vi.h b/common/vulkan/include/vulkan/vulkan_vi.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_vi.h
rename to common/vulkan/include/vulkan/vulkan_vi.h
diff --git a/include/vulkan/include/vulkan/vulkan_wayland.h b/common/vulkan/include/vulkan/vulkan_wayland.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_wayland.h
rename to common/vulkan/include/vulkan/vulkan_wayland.h
diff --git a/include/vulkan/include/vulkan/vulkan_win32.h b/common/vulkan/include/vulkan/vulkan_win32.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_win32.h
rename to common/vulkan/include/vulkan/vulkan_win32.h
diff --git a/include/vulkan/include/vulkan/vulkan_xcb.h b/common/vulkan/include/vulkan/vulkan_xcb.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_xcb.h
rename to common/vulkan/include/vulkan/vulkan_xcb.h
diff --git a/include/vulkan/include/vulkan/vulkan_xlib.h b/common/vulkan/include/vulkan/vulkan_xlib.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_xlib.h
rename to common/vulkan/include/vulkan/vulkan_xlib.h
diff --git a/include/vulkan/include/vulkan/vulkan_xlib_xrandr.h b/common/vulkan/include/vulkan/vulkan_xlib_xrandr.h
similarity index 100%
rename from include/vulkan/include/vulkan/vulkan_xlib_xrandr.h
rename to common/vulkan/include/vulkan/vulkan_xlib_xrandr.h
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/registry/vulkan/include/vk_video/vulkan_video_codec_h264std.h
deleted file mode 100644
index 3338fe1..0000000
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-** Copyright (c) 2019-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#ifndef VULKAN_VIDEO_CODEC_H264STD_H_
-#define VULKAN_VIDEO_CODEC_H264STD_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vk_video/vulkan_video_codecs_common.h"
-
-// Vulkan 0.9 provisional Vulkan video H.264 encode and decode std specification version number
-#define VK_STD_VULKAN_VIDEO_CODEC_H264_API_VERSION_0_9_5 VK_MAKE_VIDEO_STD_VERSION(0, 9, 5) // Patch version should always be set to 0
-
-// Format must be in the form XX.XX where the first two digits are the major and the second two, the minor.
-#define VK_STD_VULKAN_VIDEO_CODEC_H264_SPEC_VERSION   VK_STD_VULKAN_VIDEO_CODEC_H264_API_VERSION_0_9_5
-#define VK_STD_VULKAN_VIDEO_CODEC_H264_EXTENSION_NAME "VK_STD_vulkan_video_codec_h264"
-
-// *************************************************
-// Video H.264 common definitions:
-// *************************************************
-
-#define STD_VIDEO_H264_CPB_CNT_LIST_SIZE 32
-#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS 6
-#define STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS 16
-#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS 2
-#define STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS 64
-
-typedef enum StdVideoH264ChromaFormatIdc {
-    STD_VIDEO_H264_CHROMA_FORMAT_IDC_MONOCHROME  = 0,
-    STD_VIDEO_H264_CHROMA_FORMAT_IDC_420         = 1,
-    STD_VIDEO_H264_CHROMA_FORMAT_IDC_422         = 2,
-    STD_VIDEO_H264_CHROMA_FORMAT_IDC_444         = 3,
-    STD_VIDEO_H264_CHROMA_FORMAT_IDC_INVALID     = 0x7FFFFFFF
-} StdVideoH264ChromaFormatIdc;
-
-typedef enum StdVideoH264ProfileIdc {
-    STD_VIDEO_H264_PROFILE_IDC_BASELINE             = 66, /* Only constrained baseline is supported */
-    STD_VIDEO_H264_PROFILE_IDC_MAIN                 = 77,
-    STD_VIDEO_H264_PROFILE_IDC_HIGH                 = 100,
-    STD_VIDEO_H264_PROFILE_IDC_HIGH_444_PREDICTIVE  = 244,
-    STD_VIDEO_H264_PROFILE_IDC_INVALID              = 0x7FFFFFFF
-} StdVideoH264ProfileIdc;
-
-typedef enum StdVideoH264Level {
-    STD_VIDEO_H264_LEVEL_1_0 = 0,
-    STD_VIDEO_H264_LEVEL_1_1 = 1,
-    STD_VIDEO_H264_LEVEL_1_2 = 2,
-    STD_VIDEO_H264_LEVEL_1_3 = 3,
-    STD_VIDEO_H264_LEVEL_2_0 = 4,
-    STD_VIDEO_H264_LEVEL_2_1 = 5,
-    STD_VIDEO_H264_LEVEL_2_2 = 6,
-    STD_VIDEO_H264_LEVEL_3_0 = 7,
-    STD_VIDEO_H264_LEVEL_3_1 = 8,
-    STD_VIDEO_H264_LEVEL_3_2 = 9,
-    STD_VIDEO_H264_LEVEL_4_0 = 10,
-    STD_VIDEO_H264_LEVEL_4_1 = 11,
-    STD_VIDEO_H264_LEVEL_4_2 = 12,
-    STD_VIDEO_H264_LEVEL_5_0 = 13,
-    STD_VIDEO_H264_LEVEL_5_1 = 14,
-    STD_VIDEO_H264_LEVEL_5_2 = 15,
-    STD_VIDEO_H264_LEVEL_6_0 = 16,
-    STD_VIDEO_H264_LEVEL_6_1 = 17,
-    STD_VIDEO_H264_LEVEL_6_2 = 18,
-    STD_VIDEO_H264_LEVEL_INVALID = 0x7FFFFFFF
-} StdVideoH264Level;
-
-typedef enum StdVideoH264PocType {
-    STD_VIDEO_H264_POC_TYPE_0 = 0,
-    STD_VIDEO_H264_POC_TYPE_1 = 1,
-    STD_VIDEO_H264_POC_TYPE_2 = 2,
-    STD_VIDEO_H264_POC_TYPE_INVALID = 0x7FFFFFFF
-} StdVideoH264PocType;
-
-typedef enum StdVideoH264AspectRatioIdc {
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_UNSPECIFIED = 0,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_SQUARE = 1,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_12_11 = 2,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_10_11 = 3,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_16_11 = 4,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_40_33 = 5,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_24_11 = 6,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_20_11 = 7,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_32_11 = 8,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_80_33 = 9,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_18_11 = 10,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_15_11 = 11,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_64_33 = 12,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_160_99 = 13,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_4_3 = 14,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_3_2 = 15,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_2_1 = 16,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_EXTENDED_SAR = 255,
-    STD_VIDEO_H264_ASPECT_RATIO_IDC_INVALID = 0x7FFFFFFF
-} StdVideoH264AspectRatioIdc;
-
-typedef enum StdVideoH264WeightedBipredIdc {
-    STD_VIDEO_H264_WEIGHTED_BIPRED_IDC_DEFAULT  = 0,
-    STD_VIDEO_H264_WEIGHTED_BIPRED_IDC_EXPLICIT = 1,
-    STD_VIDEO_H264_WEIGHTED_BIPRED_IDC_IMPLICIT = 2,
-    STD_VIDEO_H264_WEIGHTED_BIPRED_IDC_INVALID = 0x7FFFFFFF
-} StdVideoH264WeightedBipredIdc;
-
-typedef enum StdVideoH264ModificationOfPicNumsIdc {
-    STD_VIDEO_H264_MODIFICATION_OF_PIC_NUMS_IDC_SHORT_TERM_SUBTRACT = 0,
-    STD_VIDEO_H264_MODIFICATION_OF_PIC_NUMS_IDC_SHORT_TERM_ADD = 1,
-    STD_VIDEO_H264_MODIFICATION_OF_PIC_NUMS_IDC_LONG_TERM = 2,
-    STD_VIDEO_H264_MODIFICATION_OF_PIC_NUMS_IDC_END = 3,
-    STD_VIDEO_H264_MODIFICATION_OF_PIC_NUMS_IDC_INVALID = 0x7FFFFFFF
-} StdVideoH264ModificationOfPicNumsIdc;
-
-typedef enum StdVideoH264MemMgmtControlOp {
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_END = 0,
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_UNMARK_SHORT_TERM = 1,
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_UNMARK_LONG_TERM = 2,
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_MARK_LONG_TERM = 3,
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_SET_MAX_LONG_TERM_INDEX = 4,
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_UNMARK_ALL = 5,
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_MARK_CURRENT_AS_LONG_TERM = 6,
-    STD_VIDEO_H264_MEM_MGMT_CONTROL_OP_INVALID = 0x7FFFFFFF
-} StdVideoH264MemMgmtControlOp;
-
-typedef enum StdVideoH264CabacInitIdc {
-    STD_VIDEO_H264_CABAC_INIT_IDC_0 = 0,
-    STD_VIDEO_H264_CABAC_INIT_IDC_1 = 1,
-    STD_VIDEO_H264_CABAC_INIT_IDC_2 = 2,
-    STD_VIDEO_H264_CABAC_INIT_IDC_INVALID = 0x7FFFFFFF
-} StdVideoH264CabacInitIdc;
-
-typedef enum StdVideoH264DisableDeblockingFilterIdc {
-    STD_VIDEO_H264_DISABLE_DEBLOCKING_FILTER_IDC_DISABLED = 0,
-    STD_VIDEO_H264_DISABLE_DEBLOCKING_FILTER_IDC_ENABLED = 1,
-    STD_VIDEO_H264_DISABLE_DEBLOCKING_FILTER_IDC_PARTIAL = 2,
-    STD_VIDEO_H264_DISABLE_DEBLOCKING_FILTER_IDC_INVALID = 0x7FFFFFFF
-} StdVideoH264DisableDeblockingFilterIdc;
-
-typedef enum StdVideoH264SliceType {
-    STD_VIDEO_H264_SLICE_TYPE_P  = 0,
-    STD_VIDEO_H264_SLICE_TYPE_B  = 1,
-    STD_VIDEO_H264_SLICE_TYPE_I  = 2,
-    // reserved STD_VIDEO_H264_SLICE_TYPE_SP = 3,
-    // reserved STD_VIDEO_H264_SLICE_TYPE_SI = 4,
-    STD_VIDEO_H264_SLICE_TYPE_INVALID = 0x7FFFFFFF
-} StdVideoH264SliceType;
-
-typedef enum StdVideoH264PictureType {
-    STD_VIDEO_H264_PICTURE_TYPE_P   = 0,
-    STD_VIDEO_H264_PICTURE_TYPE_B   = 1,
-    STD_VIDEO_H264_PICTURE_TYPE_I   = 2,
-    // reserved STD_VIDEO_H264_PICTURE_TYPE_SP  = 3,
-    // reserved STD_VIDEO_H264_PICTURE_TYPE_SI  = 4,
-    STD_VIDEO_H264_PICTURE_TYPE_IDR = 5,
-    STD_VIDEO_H264_PICTURE_TYPE_INVALID = 0x7FFFFFFF
-} StdVideoH264PictureType;
-
-typedef enum StdVideoH264NonVclNaluType {
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_SPS = 0,
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_PPS = 1,
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_AUD = 2,
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_PREFIX = 3,
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_END_OF_SEQUENCE = 4,
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_END_OF_STREAM = 5,
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_PRECODED = 6,
-    STD_VIDEO_H264_NON_VCL_NALU_TYPE_INVALID = 0x7FFFFFFF
-} StdVideoH264NonVclNaluType;
-
-typedef struct StdVideoH264SpsVuiFlags {
-    uint32_t aspect_ratio_info_present_flag : 1;
-    uint32_t overscan_info_present_flag : 1;
-    uint32_t overscan_appropriate_flag : 1;
-    uint32_t video_signal_type_present_flag : 1;
-    uint32_t video_full_range_flag : 1;
-    uint32_t color_description_present_flag : 1;
-    uint32_t chroma_loc_info_present_flag : 1;
-    uint32_t timing_info_present_flag : 1;
-    uint32_t fixed_frame_rate_flag : 1;
-    uint32_t bitstream_restriction_flag : 1;
-    uint32_t nal_hrd_parameters_present_flag : 1;
-    uint32_t vcl_hrd_parameters_present_flag : 1;
-} StdVideoH264SpsVuiFlags;
-
-typedef struct StdVideoH264HrdParameters { // hrd_parameters
-    uint8_t                    cpb_cnt_minus1;
-    uint8_t                    bit_rate_scale;
-    uint8_t                    cpb_size_scale;
-    uint32_t                   bit_rate_value_minus1[STD_VIDEO_H264_CPB_CNT_LIST_SIZE]; // cpb_cnt_minus1 number of valid elements
-    uint32_t                   cpb_size_value_minus1[STD_VIDEO_H264_CPB_CNT_LIST_SIZE]; // cpb_cnt_minus1 number of valid elements
-    uint8_t                    cbr_flag[STD_VIDEO_H264_CPB_CNT_LIST_SIZE];              // cpb_cnt_minus1 number of valid elements
-    uint32_t                   initial_cpb_removal_delay_length_minus1;
-    uint32_t                   cpb_removal_delay_length_minus1;
-    uint32_t                   dpb_output_delay_length_minus1;
-    uint32_t                   time_offset_length;
-} StdVideoH264HrdParameters;
-
-typedef struct StdVideoH264SequenceParameterSetVui {
-    StdVideoH264AspectRatioIdc  aspect_ratio_idc;
-    uint16_t                    sar_width;
-    uint16_t                    sar_height;
-    uint8_t                     video_format;
-    uint8_t                     color_primaries;
-    uint8_t                     transfer_characteristics;
-    uint8_t                     matrix_coefficients;
-    uint32_t                    num_units_in_tick;
-    uint32_t                    time_scale;
-    StdVideoH264HrdParameters*  pHrdParameters;    // must be a valid ptr to hrd_parameters, if nal_hrd_parameters_present_flag or vcl_hrd_parameters_present_flag are set
-    uint8_t                     max_num_reorder_frames;
-    uint8_t                     max_dec_frame_buffering;
-    StdVideoH264SpsVuiFlags     flags;
-} StdVideoH264SequenceParameterSetVui;
-
-typedef struct StdVideoH264SpsFlags {
-    uint32_t constraint_set0_flag : 1;
-    uint32_t constraint_set1_flag : 1;
-    uint32_t constraint_set2_flag : 1;
-    uint32_t constraint_set3_flag : 1;
-    uint32_t constraint_set4_flag : 1;
-    uint32_t constraint_set5_flag : 1;
-    uint32_t direct_8x8_inference_flag : 1;
-    uint32_t mb_adaptive_frame_field_flag : 1;
-    uint32_t frame_mbs_only_flag : 1;
-    uint32_t delta_pic_order_always_zero_flag : 1;
-    uint32_t separate_colour_plane_flag : 1;
-    uint32_t gaps_in_frame_num_value_allowed_flag : 1;
-    uint32_t qpprime_y_zero_transform_bypass_flag : 1;
-    uint32_t frame_cropping_flag : 1;
-    uint32_t seq_scaling_matrix_present_flag : 1;
-    uint32_t vui_parameters_present_flag : 1;
-} StdVideoH264SpsFlags;
-
-typedef struct StdVideoH264ScalingLists
-{
-    // scaling_list_present_mask has one bit for each
-    // seq_scaling_list_present_flag[i] for SPS OR
-    // pic_scaling_list_present_flag[i] for PPS,
-    // bit 0 - 5 are for each entry of ScalingList4x4
-    // bit 6 - 7 are for each entry plus 6 for ScalingList8x8
-    uint8_t scaling_list_present_mask;
-    // use_default_scaling_matrix_mask has one bit for each
-    // UseDefaultScalingMatrix4x4Flag[ i ] and
-    // UseDefaultScalingMatrix8x8Flag[ i - 6 ] for SPS OR PPS
-    // bit 0 - 5 are for each entry of ScalingList4x4
-    // bit 6 - 7 are for each entry plus 6 for ScalingList8x8
-    uint8_t use_default_scaling_matrix_mask;
-    uint8_t ScalingList4x4[STD_VIDEO_H264_SCALING_LIST_4X4_NUM_LISTS][STD_VIDEO_H264_SCALING_LIST_4X4_NUM_ELEMENTS];
-    uint8_t ScalingList8x8[STD_VIDEO_H264_SCALING_LIST_8X8_NUM_LISTS][STD_VIDEO_H264_SCALING_LIST_8X8_NUM_ELEMENTS];
-} StdVideoH264ScalingLists;
-
-typedef struct StdVideoH264SequenceParameterSet
-{
-    StdVideoH264ProfileIdc               profile_idc;
-    StdVideoH264Level                    level_idc;
-    uint8_t                              seq_parameter_set_id;
-    StdVideoH264ChromaFormatIdc          chroma_format_idc;
-    uint8_t                              bit_depth_luma_minus8;
-    uint8_t                              bit_depth_chroma_minus8;
-    uint8_t                              log2_max_frame_num_minus4;
-    StdVideoH264PocType                  pic_order_cnt_type;
-    uint8_t                              log2_max_pic_order_cnt_lsb_minus4;
-    int32_t                              offset_for_non_ref_pic;
-    int32_t                              offset_for_top_to_bottom_field;
-    uint8_t                              num_ref_frames_in_pic_order_cnt_cycle;
-    uint8_t                              max_num_ref_frames;
-    uint32_t                             pic_width_in_mbs_minus1;
-    uint32_t                             pic_height_in_map_units_minus1;
-    uint32_t                             frame_crop_left_offset;
-    uint32_t                             frame_crop_right_offset;
-    uint32_t                             frame_crop_top_offset;
-    uint32_t                             frame_crop_bottom_offset;
-    StdVideoH264SpsFlags                 flags;
-    // pOffsetForRefFrame is a pointer representing the offset_for_ref_frame array with num_ref_frames_in_pic_order_cnt_cycle number of elements
-    // If pOffsetForRefFrame has nullptr value, then num_ref_frames_in_pic_order_cnt_cycle must also be "0".
-    int32_t*                             pOffsetForRefFrame;
-    StdVideoH264ScalingLists*            pScalingLists;             // Must be a valid pointer if seq_scaling_matrix_present_flag is set
-    StdVideoH264SequenceParameterSetVui* pSequenceParameterSetVui;  // Must be a valid pointer if StdVideoH264SpsFlags:vui_parameters_present_flag is set
-} StdVideoH264SequenceParameterSet;
-
-typedef struct StdVideoH264PpsFlags {
-    uint32_t transform_8x8_mode_flag : 1;
-    uint32_t redundant_pic_cnt_present_flag : 1;
-    uint32_t constrained_intra_pred_flag : 1;
-    uint32_t deblocking_filter_control_present_flag : 1;
-    uint32_t weighted_bipred_idc_flag : 1;
-    uint32_t weighted_pred_flag : 1;
-    uint32_t pic_order_present_flag : 1;
-    uint32_t entropy_coding_mode_flag : 1;
-    uint32_t pic_scaling_matrix_present_flag : 1;
-} StdVideoH264PpsFlags;
-
-typedef struct StdVideoH264PictureParameterSet
-{
-    uint8_t                       seq_parameter_set_id;
-    uint8_t                       pic_parameter_set_id;
-    uint8_t                       num_ref_idx_l0_default_active_minus1;
-    uint8_t                       num_ref_idx_l1_default_active_minus1;
-    StdVideoH264WeightedBipredIdc weighted_bipred_idc;
-    int8_t                        pic_init_qp_minus26;
-    int8_t                        pic_init_qs_minus26;
-    int8_t                        chroma_qp_index_offset;
-    int8_t                        second_chroma_qp_index_offset;
-    StdVideoH264PpsFlags          flags;
-    StdVideoH264ScalingLists*     pScalingLists; // Must be a valid pointer if  StdVideoH264PpsFlags::pic_scaling_matrix_present_flag is set.
-} StdVideoH264PictureParameterSet;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // VULKAN_VIDEO_CODEC_H264STD_H_
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h b/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
deleted file mode 100644
index cb0d1df..0000000
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-** Copyright (c) 2019-2020 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#ifndef VULKAN_VIDEO_CODEC_H264STD_DECODE_H_
-#define VULKAN_VIDEO_CODEC_H264STD_DECODE_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vk_video/vulkan_video_codec_h264std.h"
-
-// *************************************************
-// Video H.264 Decode related parameters:
-// *************************************************
-
-#define STD_VIDEO_DECODE_H264_MVC_REF_LIST_SIZE 15
-
-typedef enum StdVideoDecodeH264FieldOrderCount {
-    STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_TOP       = 0,
-    STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_BOTTOM    = 1,
-    STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE = 2,
-    STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_INVALID   = 0x7FFFFFFF
-} StdVideoDecodeH264FieldOrderCnt;
-
-typedef struct StdVideoDecodeH264PictureInfoFlags {
-    uint32_t field_pic_flag : 1;             // Is field picture
-    uint32_t is_intra : 1;                   // Is intra picture
-    uint32_t IdrPicFlag : 1;                 // instantaneous decoding refresh (IDR) picture
-    uint32_t bottom_field_flag : 1;          // bottom (true) or top (false) field if field_pic_flag is set.
-    uint32_t is_reference : 1;               // This only applies to picture info, and not to the DPB lists.
-    uint32_t complementary_field_pair : 1;   // complementary field pair, complementary non-reference field pair, complementary reference field pair
-} StdVideoDecodeH264PictureInfoFlags;
-
-typedef struct StdVideoDecodeH264PictureInfo {
-    uint8_t  seq_parameter_set_id;          // Selecting SPS from the Picture Parameters
-    uint8_t  pic_parameter_set_id;          // Selecting PPS from the Picture Parameters and the SPS
-    uint16_t reserved;                      // for structure members 32-bit packing/alignment
-    uint16_t frame_num;                     // 7.4.3 Slice header semantics
-    uint16_t idr_pic_id;                    // 7.4.3 Slice header semantics
-    // PicOrderCnt is based on TopFieldOrderCnt and BottomFieldOrderCnt. See 8.2.1 Decoding process for picture order count type 0 - 2
-    int32_t  PicOrderCnt[STD_VIDEO_DECODE_H264_FIELD_ORDER_COUNT_LIST_SIZE];  // TopFieldOrderCnt and BottomFieldOrderCnt fields.
-    StdVideoDecodeH264PictureInfoFlags flags;
-} StdVideoDecodeH264PictureInfo;
-
-typedef struct StdVideoDecodeH264ReferenceInfoFlags {
-    uint32_t top_field_flag : 1;             // Reference is used for top field reference.
-    uint32_t bottom_field_flag : 1;          // Reference is used for bottom field reference.
-    uint32_t is_long_term : 1;               // this is a long term reference
-    uint32_t is_non_existing : 1;            // Must be handled in accordance with 8.2.5.2: Decoding process for gaps in frame_num
-} StdVideoDecodeH264ReferenceInfoFlags;
-
-typedef struct StdVideoDecodeH264ReferenceInfo {
-    // FrameNum = is_long_term ?  long_term_frame_idx : frame_num
-    uint16_t FrameNum;                     // 7.4.3.3 Decoded reference picture marking semantics
-    uint16_t reserved;                     // for structure members 32-bit packing/alignment
-    int32_t  PicOrderCnt[2];               // TopFieldOrderCnt and BottomFieldOrderCnt fields.
-    StdVideoDecodeH264ReferenceInfoFlags flags;
-} StdVideoDecodeH264ReferenceInfo;
-
-typedef struct StdVideoDecodeH264MvcElementFlags {
-    uint32_t non_idr : 1;
-    uint32_t anchor_pic : 1;
-    uint32_t inter_view : 1;
-} StdVideoDecodeH264MvcElementFlags;
-
-typedef struct StdVideoDecodeH264MvcElement {
-    StdVideoDecodeH264MvcElementFlags flags;
-    uint16_t viewOrderIndex;
-    uint16_t viewId;
-    uint16_t temporalId; // move out?
-    uint16_t priorityId; // move out?
-    uint16_t numOfAnchorRefsInL0;
-    uint16_t viewIdOfAnchorRefsInL0[STD_VIDEO_DECODE_H264_MVC_REF_LIST_SIZE];
-    uint16_t numOfAnchorRefsInL1;
-    uint16_t viewIdOfAnchorRefsInL1[STD_VIDEO_DECODE_H264_MVC_REF_LIST_SIZE];
-    uint16_t numOfNonAnchorRefsInL0;
-    uint16_t viewIdOfNonAnchorRefsInL0[STD_VIDEO_DECODE_H264_MVC_REF_LIST_SIZE];
-    uint16_t numOfNonAnchorRefsInL1;
-    uint16_t viewIdOfNonAnchorRefsInL1[STD_VIDEO_DECODE_H264_MVC_REF_LIST_SIZE];
-} StdVideoDecodeH264MvcElement;
-
-typedef struct StdVideoDecodeH264Mvc {
-    uint32_t viewId0;
-    uint32_t mvcElementCount;
-    StdVideoDecodeH264MvcElement* pMvcElements;
-} StdVideoDecodeH264Mvc;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // VULKAN_VIDEO_CODEC_H264STD_DECODE_H_
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h b/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
deleted file mode 100644
index f3a0d3a..0000000
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-** Copyright (c) 2019-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#ifndef VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_
-#define VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vk_video/vulkan_video_codec_h264std.h"
-
-// *************************************************
-// Video H.264 Encode related parameters:
-// *************************************************
-
-typedef struct StdVideoEncodeH264SliceHeaderFlags {
-    uint32_t idr_flag : 1;
-    uint32_t is_reference_flag : 1;
-    uint32_t num_ref_idx_active_override_flag : 1;
-    uint32_t no_output_of_prior_pics_flag : 1;
-    uint32_t long_term_reference_flag : 1;
-    uint32_t adaptive_ref_pic_marking_mode_flag : 1;
-    uint32_t no_prior_references_available_flag : 1;
-} StdVideoEncodeH264SliceHeaderFlags;
-
-typedef struct StdVideoEncodeH264PictureInfoFlags {
-    uint32_t idr_flag : 1;
-    uint32_t is_reference_flag : 1;
-    uint32_t long_term_reference_flag : 1;
-} StdVideoEncodeH264PictureInfoFlags;
-
-typedef struct StdVideoEncodeH264RefMgmtFlags {
-    uint32_t ref_pic_list_modification_l0_flag : 1;
-    uint32_t ref_pic_list_modification_l1_flag : 1;
-} StdVideoEncodeH264RefMgmtFlags;
-
-typedef struct StdVideoEncodeH264RefListModEntry {
-    StdVideoH264ModificationOfPicNumsIdc modification_of_pic_nums_idc;
-    uint16_t                             abs_diff_pic_num_minus1;
-    uint16_t                             long_term_pic_num;
-} StdVideoEncodeH264RefListModEntry;
-
-typedef struct StdVideoEncodeH264RefPicMarkingEntry {
-    StdVideoH264MemMgmtControlOp  operation;
-    uint16_t                      difference_of_pic_nums_minus1;
-    uint16_t                      long_term_pic_num;
-    uint16_t                      long_term_frame_idx;
-    uint16_t                      max_long_term_frame_idx_plus1;
-} StdVideoEncodeH264RefPicMarkingEntry;
-
-typedef struct StdVideoEncodeH264RefMemMgmtCtrlOperations {
-    StdVideoEncodeH264RefMgmtFlags        flags;
-    uint8_t                               refList0ModOpCount;
-    StdVideoEncodeH264RefListModEntry*    pRefList0ModOperations;
-    uint8_t                               refList1ModOpCount;
-    StdVideoEncodeH264RefListModEntry*    pRefList1ModOperations;
-    uint8_t                               refPicMarkingOpCount;
-    StdVideoEncodeH264RefPicMarkingEntry* pRefPicMarkingOperations;
-} StdVideoEncodeH264RefMemMgmtCtrlOperations;
-
-typedef struct StdVideoEncodeH264PictureInfo {
-    StdVideoEncodeH264PictureInfoFlags   flags;
-    StdVideoH264PictureType              pictureType;
-    uint32_t                             frameNum;
-    uint32_t                             pictureOrderCount;
-    uint16_t                             long_term_pic_num;
-    uint16_t                             long_term_frame_idx;
-} StdVideoEncodeH264PictureInfo;
-
-typedef struct StdVideoEncodeH264SliceHeader {
-    StdVideoEncodeH264SliceHeaderFlags          flags;
-    StdVideoH264SliceType                       slice_type;
-    uint8_t                                     seq_parameter_set_id;
-    uint8_t                                     pic_parameter_set_id;
-    uint16_t                                    idr_pic_id;
-    uint8_t                                     num_ref_idx_l0_active_minus1;
-    uint8_t                                     num_ref_idx_l1_active_minus1;
-    StdVideoH264CabacInitIdc                    cabac_init_idc;
-    StdVideoH264DisableDeblockingFilterIdc      disable_deblocking_filter_idc;
-    int8_t                                      slice_alpha_c0_offset_div2;
-    int8_t                                      slice_beta_offset_div2;
-    StdVideoEncodeH264RefMemMgmtCtrlOperations* pMemMgmtCtrlOperations;
-} StdVideoEncodeH264SliceHeader;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // VULKAN_VIDEO_CODEC_H264STD_ENCODE_H_
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std.h b/registry/vulkan/include/vk_video/vulkan_video_codec_h265std.h
deleted file mode 100644
index 179c6b7..0000000
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
-** Copyright (c) 2019-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#ifndef VULKAN_VIDEO_CODEC_H265STD_H_
-#define VULKAN_VIDEO_CODEC_H265STD_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vk_video/vulkan_video_codecs_common.h"
-
-// Vulkan 0.5 version number WIP
-#define VK_STD_VULKAN_VIDEO_CODEC_H265_API_VERSION_0_9_5 VK_MAKE_VIDEO_STD_VERSION(0, 9, 5) // Patch version should always be set to 0
-
-// Format must be in the form XX.XX where the first two digits are the major and the second two, the minor.
-#define VK_STD_VULKAN_VIDEO_CODEC_H265_SPEC_VERSION   VK_STD_VULKAN_VIDEO_CODEC_H265_API_VERSION_0_9_5
-#define VK_STD_VULKAN_VIDEO_CODEC_H265_EXTENSION_NAME "VK_STD_vulkan_video_codec_h265"
-
-#define STD_VIDEO_H265_CPB_CNT_LIST_SIZE 32
-#define STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE 7
-#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS 6
-#define STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS 16
-#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS 6
-#define STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS 64
-#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS 6
-#define STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS 64
-#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS 2
-#define STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS 64
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE 6
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE 19
-#define STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE 21
-#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE 3
-#define STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE 128
-
-typedef enum StdVideoH265ChromaFormatIdc {
-    STD_VIDEO_H265_CHROMA_FORMAT_IDC_MONOCHROME  = 0,
-    STD_VIDEO_H265_CHROMA_FORMAT_IDC_420         = 1,
-    STD_VIDEO_H265_CHROMA_FORMAT_IDC_422         = 2,
-    STD_VIDEO_H265_CHROMA_FORMAT_IDC_444         = 3,
-    STD_VIDEO_H265_CHROMA_FORMAT_IDC_INVALID     = 0x7FFFFFFF
-} StdVideoH265ChromaFormatIdc;
-
-typedef enum StdVideoH265ProfileIdc {
-    STD_VIDEO_H265_PROFILE_IDC_MAIN                     = 1,
-    STD_VIDEO_H265_PROFILE_IDC_MAIN_10                  = 2,
-    STD_VIDEO_H265_PROFILE_IDC_MAIN_STILL_PICTURE       = 3,
-    STD_VIDEO_H265_PROFILE_IDC_FORMAT_RANGE_EXTENSIONS  = 4,
-    STD_VIDEO_H265_PROFILE_IDC_SCC_EXTENSIONS           = 9,
-    STD_VIDEO_H265_PROFILE_IDC_INVALID                  = 0x7FFFFFFF
-} StdVideoH265ProfileIdc;
-
-typedef enum StdVideoH265Level {
-    STD_VIDEO_H265_LEVEL_1_0 = 0,
-    STD_VIDEO_H265_LEVEL_2_0 = 1,
-    STD_VIDEO_H265_LEVEL_2_1 = 2,
-    STD_VIDEO_H265_LEVEL_3_0 = 3,
-    STD_VIDEO_H265_LEVEL_3_1 = 4,
-    STD_VIDEO_H265_LEVEL_4_0 = 5,
-    STD_VIDEO_H265_LEVEL_4_1 = 6,
-    STD_VIDEO_H265_LEVEL_5_0 = 7,
-    STD_VIDEO_H265_LEVEL_5_1 = 8,
-    STD_VIDEO_H265_LEVEL_5_2 = 9,
-    STD_VIDEO_H265_LEVEL_6_0 = 10,
-    STD_VIDEO_H265_LEVEL_6_1 = 11,
-    STD_VIDEO_H265_LEVEL_6_2 = 12,
-    STD_VIDEO_H265_LEVEL_INVALID = 0x7FFFFFFF
-} StdVideoH265Level;
-
-typedef enum StdVideoH265SliceType {
-    STD_VIDEO_H265_SLICE_TYPE_B = 0,
-    STD_VIDEO_H265_SLICE_TYPE_P = 1,
-    STD_VIDEO_H265_SLICE_TYPE_I = 2,
-    STD_VIDEO_H265_SLICE_TYPE_INVALID = 0x7FFFFFFF
-} StdVideoH265SliceType;
-
-typedef enum StdVideoH265PictureType {
-    STD_VIDEO_H265_PICTURE_TYPE_P   = 0,
-    STD_VIDEO_H265_PICTURE_TYPE_B   = 1,
-    STD_VIDEO_H265_PICTURE_TYPE_I   = 2,
-    STD_VIDEO_H265_PICTURE_TYPE_IDR = 3,
-    STD_VIDEO_H265_PICTURE_TYPE_INVALID = 0x7FFFFFFF
-} StdVideoH265PictureType;
-
-typedef struct StdVideoH265DecPicBufMgr
-{
-    uint32_t max_latency_increase_plus1[STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE];
-    uint8_t  max_dec_pic_buffering_minus1[STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE];
-    uint8_t  max_num_reorder_pics[STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE];
-} StdVideoH265DecPicBufMgr;
-
-typedef struct StdVideoH265SubLayerHrdParameters { // sub_layer_hrd_parameters
-    uint32_t bit_rate_value_minus1[STD_VIDEO_H265_CPB_CNT_LIST_SIZE];
-    uint32_t cpb_size_value_minus1[STD_VIDEO_H265_CPB_CNT_LIST_SIZE];
-    uint32_t cpb_size_du_value_minus1[STD_VIDEO_H265_CPB_CNT_LIST_SIZE];
-    uint32_t bit_rate_du_value_minus1[STD_VIDEO_H265_CPB_CNT_LIST_SIZE];
-    uint32_t cbr_flag; // each bit represents a range of CpbCounts (bit 0 - cpb_cnt_minus1) per sub-layer
-} StdVideoH265SubLayerHrdParameters;
-
-typedef struct StdVideoH265HrdFlags {
-    uint32_t nal_hrd_parameters_present_flag : 1;
-    uint32_t vcl_hrd_parameters_present_flag : 1;
-    uint32_t sub_pic_hrd_params_present_flag : 1;
-    uint32_t sub_pic_cpb_params_in_pic_timing_sei_flag : 1;
-    uint32_t fixed_pic_rate_general_flag : 8;    // each bit represents a sublayer, bit 0 - vps_max_sub_layers_minus1
-    uint32_t fixed_pic_rate_within_cvs_flag : 8; // each bit represents a sublayer, bit 0 - vps_max_sub_layers_minus1
-    uint32_t low_delay_hrd_flag : 8;             // each bit represents a sublayer, bit 0 - vps_max_sub_layers_minus1
-} StdVideoH265HrdFlags;
-
-typedef struct StdVideoH265HrdParameters {
-    uint8_t                            tick_divisor_minus2;
-    uint8_t                            du_cpb_removal_delay_increment_length_minus1;
-    uint8_t                            dpb_output_delay_du_length_minus1;
-    uint8_t                            bit_rate_scale;
-    uint8_t                            cpb_size_scale;
-    uint8_t                            cpb_size_du_scale;
-    uint8_t                            initial_cpb_removal_delay_length_minus1;
-    uint8_t                            au_cpb_removal_delay_length_minus1;
-    uint8_t                            dpb_output_delay_length_minus1;
-    uint8_t                            cpb_cnt_minus1[STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE];
-    uint16_t                           elemental_duration_in_tc_minus1[STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE];
-    StdVideoH265SubLayerHrdParameters* pSubLayerHrdParametersNal[STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE]; // NAL per layer ptr to sub_layer_hrd_parameters
-    StdVideoH265SubLayerHrdParameters* pSubLayerHrdParametersVcl[STD_VIDEO_H265_SUBLAYERS_MINUS1_LIST_SIZE]; // VCL per layer ptr to sub_layer_hrd_parameters
-    StdVideoH265HrdFlags               flags;
-} StdVideoH265HrdParameters;
-
-typedef struct StdVideoH265VpsFlags {
-    uint32_t vps_temporal_id_nesting_flag : 1;
-    uint32_t vps_sub_layer_ordering_info_present_flag : 1;
-    uint32_t vps_timing_info_present_flag : 1;
-    uint32_t vps_poc_proportional_to_timing_flag : 1;
-} StdVideoH265VpsFlags;
-
-typedef struct StdVideoH265VideoParameterSet
-{
-    uint8_t                      vps_video_parameter_set_id;
-    uint8_t                      vps_max_sub_layers_minus1;
-    uint32_t                     vps_num_units_in_tick;
-    uint32_t                     vps_time_scale;
-    uint32_t                     vps_num_ticks_poc_diff_one_minus1;
-    StdVideoH265DecPicBufMgr*    pDecPicBufMgr;
-    StdVideoH265HrdParameters*   pHrdParameters;
-    StdVideoH265VpsFlags         flags;
-} StdVideoH265VideoParameterSet;
-
-typedef struct StdVideoH265ScalingLists
-{
-    uint8_t ScalingList4x4[STD_VIDEO_H265_SCALING_LIST_4X4_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_4X4_NUM_ELEMENTS];       // ScalingList[ 0 ][ MatrixID ][ i ] (sizeID = 0)
-    uint8_t ScalingList8x8[STD_VIDEO_H265_SCALING_LIST_8X8_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_8X8_NUM_ELEMENTS];       // ScalingList[ 1 ][ MatrixID ][ i ] (sizeID = 1)
-    uint8_t ScalingList16x16[STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_16X16_NUM_ELEMENTS];     // ScalingList[ 2 ][ MatrixID ][ i ] (sizeID = 2)
-    uint8_t ScalingList32x32[STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS][STD_VIDEO_H265_SCALING_LIST_32X32_NUM_ELEMENTS];     // ScalingList[ 3 ][ MatrixID ][ i ] (sizeID = 3)
-    uint8_t ScalingListDCCoef16x16[STD_VIDEO_H265_SCALING_LIST_16X16_NUM_LISTS];   // scaling_list_dc_coef_minus8[ sizeID - 2 ][ matrixID ] + 8, sizeID = 2
-    uint8_t ScalingListDCCoef32x32[STD_VIDEO_H265_SCALING_LIST_32X32_NUM_LISTS];   // scaling_list_dc_coef_minus8[ sizeID - 2 ][ matrixID ] + 8. sizeID = 3
-} StdVideoH265ScalingLists;
-
-typedef struct StdVideoH265SpsVuiFlags {
-    uint32_t aspect_ratio_info_present_flag : 1;
-    uint32_t overscan_info_present_flag : 1;
-    uint32_t overscan_appropriate_flag : 1;
-    uint32_t video_signal_type_present_flag : 1;
-    uint32_t video_full_range_flag : 1;
-    uint32_t colour_description_present_flag : 1;
-    uint32_t chroma_loc_info_present_flag : 1;
-    uint32_t neutral_chroma_indication_flag : 1;
-    uint32_t field_seq_flag : 1;
-    uint32_t frame_field_info_present_flag : 1;
-    uint32_t default_display_window_flag : 1;
-    uint32_t vui_timing_info_present_flag : 1;
-    uint32_t vui_poc_proportional_to_timing_flag : 1;
-    uint32_t vui_hrd_parameters_present_flag : 1;
-    uint32_t bitstream_restriction_flag : 1;
-    uint32_t tiles_fixed_structure_flag : 1;
-    uint32_t motion_vectors_over_pic_boundaries_flag : 1;
-    uint32_t restricted_ref_pic_lists_flag : 1;
-} StdVideoH265SpsVuiFlags;
-
-typedef struct StdVideoH265SequenceParameterSetVui {
-    uint8_t                     aspect_ratio_idc;
-    uint16_t                    sar_width;
-    uint16_t                    sar_height;
-    uint8_t                     video_format;
-    uint8_t                     colour_primaries;
-    uint8_t                     transfer_characteristics;
-    uint8_t                     matrix_coeffs;
-    uint8_t                     chroma_sample_loc_type_top_field;
-    uint8_t                     chroma_sample_loc_type_bottom_field;
-    uint16_t                    def_disp_win_left_offset;
-    uint16_t                    def_disp_win_right_offset;
-    uint16_t                    def_disp_win_top_offset;
-    uint16_t                    def_disp_win_bottom_offset;
-    uint32_t                    vui_num_units_in_tick;
-    uint32_t                    vui_time_scale;
-    uint32_t                    vui_num_ticks_poc_diff_one_minus1;
-    StdVideoH265HrdParameters*  pHrdParameters;
-    uint16_t                    min_spatial_segmentation_idc;
-    uint8_t                     max_bytes_per_pic_denom;
-    uint8_t                     max_bits_per_min_cu_denom;
-    uint8_t                     log2_max_mv_length_horizontal;
-    uint8_t                     log2_max_mv_length_vertical;
-    StdVideoH265SpsVuiFlags     flags;
-} StdVideoH265SequenceParameterSetVui;
-
-typedef struct StdVideoH265PredictorPaletteEntries
-{
-    uint16_t PredictorPaletteEntries[STD_VIDEO_H265_PREDICTOR_PALETTE_COMPONENTS_LIST_SIZE][STD_VIDEO_H265_PREDICTOR_PALETTE_COMP_ENTRIES_LIST_SIZE];
-} StdVideoH265PredictorPaletteEntries;
-
-typedef struct StdVideoH265SpsFlags {
-    uint32_t sps_temporal_id_nesting_flag : 1;
-    uint32_t separate_colour_plane_flag : 1;
-    uint32_t scaling_list_enabled_flag : 1;
-    uint32_t sps_scaling_list_data_present_flag : 1;
-    uint32_t amp_enabled_flag : 1;
-    uint32_t sample_adaptive_offset_enabled_flag : 1;
-    uint32_t pcm_enabled_flag : 1;
-    uint32_t pcm_loop_filter_disabled_flag : 1;
-    uint32_t long_term_ref_pics_present_flag : 1;
-    uint32_t sps_temporal_mvp_enabled_flag : 1;
-    uint32_t strong_intra_smoothing_enabled_flag : 1;
-    uint32_t vui_parameters_present_flag : 1;
-    uint32_t sps_extension_present_flag : 1;
-    uint32_t sps_range_extension_flag : 1;
-
-    // extension SPS flags, valid when STD_VIDEO_H265_PROFILE_IDC_FORMAT_RANGE_EXTENSIONS is set
-    uint32_t transform_skip_rotation_enabled_flag : 1;
-    uint32_t transform_skip_context_enabled_flag : 1;
-    uint32_t implicit_rdpcm_enabled_flag : 1;
-    uint32_t explicit_rdpcm_enabled_flag : 1;
-    uint32_t extended_precision_processing_flag : 1;
-    uint32_t intra_smoothing_disabled_flag : 1;
-    uint32_t high_precision_offsets_enabled_flag : 1;
-    uint32_t persistent_rice_adaptation_enabled_flag : 1;
-    uint32_t cabac_bypass_alignment_enabled_flag : 1;
-
-    // extension SPS flags, valid when STD_VIDEO_H265_PROFILE_IDC_SCC_EXTENSIONS is set
-    uint32_t sps_curr_pic_ref_enabled_flag : 1;
-    uint32_t palette_mode_enabled_flag : 1;
-    uint32_t sps_palette_predictor_initializer_present_flag : 1;
-    uint32_t intra_boundary_filtering_disabled_flag : 1;
-} StdVideoH265SpsFlags;
-
-typedef struct StdVideoH265SequenceParameterSet
-{
-    StdVideoH265ProfileIdc               profile_idc;
-    StdVideoH265Level                    level_idc;
-    uint32_t                             pic_width_in_luma_samples;
-    uint32_t                             pic_height_in_luma_samples;
-    uint8_t                              sps_video_parameter_set_id;
-    uint8_t                              sps_max_sub_layers_minus1;
-    uint8_t                              sps_seq_parameter_set_id;
-    uint8_t                              chroma_format_idc;
-    uint8_t                              bit_depth_luma_minus8;
-    uint8_t                              bit_depth_chroma_minus8;
-    uint8_t                              log2_max_pic_order_cnt_lsb_minus4;
-    uint8_t                              sps_max_dec_pic_buffering_minus1;
-    uint8_t                              log2_min_luma_coding_block_size_minus3;
-    uint8_t                              log2_diff_max_min_luma_coding_block_size;
-    uint8_t                              log2_min_luma_transform_block_size_minus2;
-    uint8_t                              log2_diff_max_min_luma_transform_block_size;
-    uint8_t                              max_transform_hierarchy_depth_inter;
-    uint8_t                              max_transform_hierarchy_depth_intra;
-    uint8_t                              num_short_term_ref_pic_sets;
-    uint8_t                              num_long_term_ref_pics_sps;
-    uint8_t                              pcm_sample_bit_depth_luma_minus1;
-    uint8_t                              pcm_sample_bit_depth_chroma_minus1;
-    uint8_t                              log2_min_pcm_luma_coding_block_size_minus3;
-    uint8_t                              log2_diff_max_min_pcm_luma_coding_block_size;
-    uint32_t                             conf_win_left_offset;
-    uint32_t                             conf_win_right_offset;
-    uint32_t                             conf_win_top_offset;
-    uint32_t                             conf_win_bottom_offset;
-    StdVideoH265DecPicBufMgr*            pDecPicBufMgr;
-    StdVideoH265SpsFlags                 flags;
-    StdVideoH265ScalingLists*            pScalingLists;             // Must be a valid pointer if sps_scaling_list_data_present_flag is set
-    StdVideoH265SequenceParameterSetVui* pSequenceParameterSetVui;  // Must be a valid pointer if StdVideoH265SpsFlags:vui_parameters_present_flag is set palette_max_size;
-
-    // extension SPS flags, valid when STD_VIDEO_H265_PROFILE_IDC_SCC_EXTENSIONS is set
-    uint8_t                              palette_max_size;
-    uint8_t                              delta_palette_max_predictor_size;
-    uint8_t                              motion_vector_resolution_control_idc;
-    uint8_t                              sps_num_palette_predictor_initializer_minus1;
-    StdVideoH265PredictorPaletteEntries* pPredictorPaletteEntries;  // Must be a valid pointer if sps_palette_predictor_initializer_present_flag is set
-} StdVideoH265SequenceParameterSet;
-
-
-typedef struct StdVideoH265PpsFlags {
-    uint32_t dependent_slice_segments_enabled_flag : 1;
-    uint32_t output_flag_present_flag : 1;
-    uint32_t sign_data_hiding_enabled_flag : 1;
-    uint32_t cabac_init_present_flag : 1;
-    uint32_t constrained_intra_pred_flag : 1;
-    uint32_t transform_skip_enabled_flag : 1;
-    uint32_t cu_qp_delta_enabled_flag : 1;
-    uint32_t pps_slice_chroma_qp_offsets_present_flag : 1;
-    uint32_t weighted_pred_flag : 1;
-    uint32_t weighted_bipred_flag : 1;
-    uint32_t transquant_bypass_enabled_flag : 1;
-    uint32_t tiles_enabled_flag : 1;
-    uint32_t entropy_coding_sync_enabled_flag : 1;
-    uint32_t uniform_spacing_flag : 1;
-    uint32_t loop_filter_across_tiles_enabled_flag : 1;
-    uint32_t pps_loop_filter_across_slices_enabled_flag : 1;
-    uint32_t deblocking_filter_control_present_flag : 1;
-    uint32_t deblocking_filter_override_enabled_flag : 1;
-    uint32_t pps_deblocking_filter_disabled_flag : 1;
-    uint32_t pps_scaling_list_data_present_flag : 1;
-    uint32_t lists_modification_present_flag : 1;
-    uint32_t slice_segment_header_extension_present_flag : 1;
-    uint32_t pps_extension_present_flag : 1;
-
-    // extension PPS flags, valid when STD_VIDEO_H265_PROFILE_IDC_FORMAT_RANGE_EXTENSIONS is set
-    uint32_t cross_component_prediction_enabled_flag : 1;
-    uint32_t chroma_qp_offset_list_enabled_flag : 1;
-
-    // extension PPS flags, valid when STD_VIDEO_H265_PROFILE_IDC_SCC_EXTENSIONS is set
-    uint32_t pps_curr_pic_ref_enabled_flag : 1;
-    uint32_t residual_adaptive_colour_transform_enabled_flag : 1;
-    uint32_t pps_slice_act_qp_offsets_present_flag : 1;
-    uint32_t pps_palette_predictor_initializer_present_flag : 1;
-    uint32_t monochrome_palette_flag : 1;
-    uint32_t pps_range_extension_flag : 1;
-} StdVideoH265PpsFlags;
-
-typedef struct StdVideoH265PictureParameterSet
-{
-    uint8_t                              pps_pic_parameter_set_id;
-    uint8_t                              pps_seq_parameter_set_id;
-    uint8_t                              num_extra_slice_header_bits;
-    uint8_t                              num_ref_idx_l0_default_active_minus1;
-    uint8_t                              num_ref_idx_l1_default_active_minus1;
-    int8_t                               init_qp_minus26;
-    uint8_t                              diff_cu_qp_delta_depth;
-    int8_t                               pps_cb_qp_offset;
-    int8_t                               pps_cr_qp_offset;
-    uint8_t                              num_tile_columns_minus1;
-    uint8_t                              num_tile_rows_minus1;
-    uint16_t                             column_width_minus1[STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_COLS_LIST_SIZE];
-    uint16_t                             row_height_minus1[STD_VIDEO_H265_CHROMA_QP_OFFSET_TILE_ROWS_LIST_SIZE];
-    int8_t                               pps_beta_offset_div2;
-    int8_t                               pps_tc_offset_div2;
-    uint8_t                              log2_parallel_merge_level_minus2;
-    StdVideoH265PpsFlags                 flags;
-    StdVideoH265ScalingLists*            pScalingLists; // Must be a valid pointer if pps_scaling_list_data_present_flag is set
-
-    // extension PPS, valid when STD_VIDEO_H265_PROFILE_IDC_FORMAT_RANGE_EXTENSIONS is set
-    uint8_t                              log2_max_transform_skip_block_size_minus2;
-    uint8_t                              diff_cu_chroma_qp_offset_depth;
-    uint8_t                              chroma_qp_offset_list_len_minus1;
-    int8_t                               cb_qp_offset_list[STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE];
-    int8_t                               cr_qp_offset_list[STD_VIDEO_H265_CHROMA_QP_OFFSET_LIST_SIZE];
-    uint8_t                              log2_sao_offset_scale_luma;
-    uint8_t                              log2_sao_offset_scale_chroma;
-
-    // extension PPS, valid when STD_VIDEO_H265_PROFILE_IDC_SCC_EXTENSIONS is set
-    int8_t                               pps_act_y_qp_offset_plus5;
-    int8_t                               pps_act_cb_qp_offset_plus5;
-    int8_t                               pps_act_cr_qp_offset_plus5;
-    uint8_t                              pps_num_palette_predictor_initializer;
-    uint8_t                              luma_bit_depth_entry_minus8;
-    uint8_t                              chroma_bit_depth_entry_minus8;
-    StdVideoH265PredictorPaletteEntries* pPredictorPaletteEntries;  // Must be a valid pointer if pps_palette_predictor_initializer_present_flag is set
-} StdVideoH265PictureParameterSet;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // VULKAN_VIDEO_CODEC_H265STD_H_
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h b/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
deleted file mode 100644
index a1efa05..0000000
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-** Copyright (c) 2019-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#ifndef VULKAN_VIDEO_CODEC_H265STD_DECODE_H_
-#define VULKAN_VIDEO_CODEC_H265STD_DECODE_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vk_video/vulkan_video_codec_h265std.h"
-
-// *************************************************
-// Video h265 Decode related parameters:
-// *************************************************
-
-#define STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE 8
-
-typedef struct StdVideoDecodeH265PictureInfoFlags {
-    uint32_t IrapPicFlag : 1;
-    uint32_t IdrPicFlag  : 1;
-    uint32_t IsReference : 1;
-    uint32_t short_term_ref_pic_set_sps_flag : 1;
-} StdVideoDecodeH265PictureInfoFlags;
-
-typedef struct StdVideoDecodeH265PictureInfo {
-    uint8_t                            vps_video_parameter_set_id;
-    uint8_t                            sps_seq_parameter_set_id;
-    uint8_t                            pps_pic_parameter_set_id;
-    uint8_t                            num_short_term_ref_pic_sets;
-    int32_t                            PicOrderCntVal;
-    uint16_t                           NumBitsForSTRefPicSetInSlice; // number of bits used in st_ref_pic_set()
-                                                                     //when short_term_ref_pic_set_sps_flag is 0; otherwise set to 0.
-    uint8_t                            NumDeltaPocsOfRefRpsIdx;      // NumDeltaPocs[ RefRpsIdx ] when short_term_ref_pic_set_sps_flag = 1, otherwise 0
-    uint8_t                            RefPicSetStCurrBefore[STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE]; // slotIndex as used in
-                                                                     // VkVideoReferenceSlotKHR structures representing
-                                                                     //pReferenceSlots in VkVideoDecodeInfoKHR, 0xff for invalid slotIndex
-    uint8_t                            RefPicSetStCurrAfter[STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE];   // slotIndex as used in
-                                                                     // VkVideoReferenceSlotKHR structures representing
-                                                                     //pReferenceSlots in VkVideoDecodeInfoKHR, 0xff for invalid slotIndex
-    uint8_t                            RefPicSetLtCurr[STD_VIDEO_DECODE_H265_REF_PIC_SET_LIST_SIZE]; // slotIndex as used in
-                                                                     // VkVideoReferenceSlotKHR structures representing
-                                                                     //pReferenceSlots in VkVideoDecodeInfoKHR, 0xff for invalid slotIndex
-    StdVideoDecodeH265PictureInfoFlags flags;
-} StdVideoDecodeH265PictureInfo;
-
-typedef struct StdVideoDecodeH265ReferenceInfoFlags {
-    uint32_t is_long_term : 1;
-    uint32_t is_non_existing : 1;
-} StdVideoDecodeH265ReferenceInfoFlags;
-
-typedef struct StdVideoDecodeH265ReferenceInfo {
-    int32_t                              PicOrderCntVal;
-    StdVideoDecodeH265ReferenceInfoFlags flags;
-} StdVideoDecodeH265ReferenceInfo;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // VULKAN_VIDEO_CODEC_H265STD_DECODE_H_
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h b/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
deleted file mode 100644
index ffffef2..0000000
--- a/registry/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-** Copyright (c) 2019-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#ifndef VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_
-#define VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "vk_video/vulkan_video_codec_h265std.h"
-
-// *************************************************
-// Video h265 Encode related parameters:
-// *************************************************
-
-#define STD_VIDEO_ENCODE_H265_LUMA_LIST_SIZE   15
-#define STD_VIDEO_ENCODE_H265_CHROMA_LIST_SIZE 15
-#define STD_VIDEO_ENCODE_H265_CHROMA_LISTS_NUM  2
-
-typedef struct StdVideoEncodeH265SliceHeaderFlags {
-    uint32_t first_slice_segment_in_pic_flag : 1;
-    uint32_t no_output_of_prior_pics_flag : 1;
-    uint32_t dependent_slice_segment_flag : 1;
-    uint32_t short_term_ref_pic_set_sps_flag : 1;
-    uint32_t slice_temporal_mvp_enable_flag : 1;
-    uint32_t slice_sao_luma_flag : 1;
-    uint32_t slice_sao_chroma_flag : 1;
-    uint32_t num_ref_idx_active_override_flag : 1;
-    uint32_t mvd_l1_zero_flag : 1;
-    uint32_t cabac_init_flag : 1;
-    uint32_t slice_deblocking_filter_disable_flag : 1;
-    uint32_t collocated_from_l0_flag : 1;
-    uint32_t slice_loop_filter_across_slices_enabled_flag : 1;
-    uint32_t bLastSliceInPic : 1;
-    uint32_t reservedBits : 18;
-    uint16_t luma_weight_l0_flag;   // bit 0 - num_ref_idx_l0_active_minus1
-    uint16_t chroma_weight_l0_flag; // bit 0 - num_ref_idx_l0_active_minus1
-    uint16_t luma_weight_l1_flag;   // bit 0 - num_ref_idx_l1_active_minus1
-    uint16_t chroma_weight_l1_flag; // bit 0 - num_ref_idx_l1_active_minus1
-} StdVideoEncodeH265SliceHeaderFlags;
-
-typedef struct StdVideoEncodeH265SliceHeader {
-    StdVideoH265SliceType              slice_type;
-    uint8_t                            slice_pic_parameter_set_id;
-    uint8_t                            num_short_term_ref_pic_sets;
-    uint32_t                           slice_segment_address;
-    uint8_t                            short_term_ref_pic_set_idx;
-    uint8_t                            num_long_term_sps;
-    uint8_t                            num_long_term_pics;
-    uint8_t                            collocated_ref_idx;
-    uint8_t                            num_ref_idx_l0_active_minus1; // [0, 14]
-    uint8_t                            num_ref_idx_l1_active_minus1; // [0, 14]
-    uint8_t                            luma_log2_weight_denom;       // [0, 7]
-    int8_t                             delta_chroma_log2_weight_denom;
-    int8_t                             delta_luma_weight_l0[STD_VIDEO_ENCODE_H265_LUMA_LIST_SIZE];
-    int8_t                             luma_offset_l0[STD_VIDEO_ENCODE_H265_LUMA_LIST_SIZE];
-    int8_t                             delta_chroma_weight_l0[STD_VIDEO_ENCODE_H265_CHROMA_LIST_SIZE][STD_VIDEO_ENCODE_H265_CHROMA_LISTS_NUM];
-    int8_t                             delta_chroma_offset_l0[STD_VIDEO_ENCODE_H265_CHROMA_LIST_SIZE][STD_VIDEO_ENCODE_H265_CHROMA_LISTS_NUM];
-    int8_t                             delta_luma_weight_l1[STD_VIDEO_ENCODE_H265_LUMA_LIST_SIZE];
-    int8_t                             luma_offset_l1[STD_VIDEO_ENCODE_H265_LUMA_LIST_SIZE];
-    int8_t                             delta_chroma_weight_l1[STD_VIDEO_ENCODE_H265_CHROMA_LIST_SIZE][STD_VIDEO_ENCODE_H265_CHROMA_LISTS_NUM];
-    int8_t                             delta_chroma_offset_l1[STD_VIDEO_ENCODE_H265_CHROMA_LIST_SIZE][STD_VIDEO_ENCODE_H265_CHROMA_LISTS_NUM];
-    uint8_t                            MaxNumMergeCand;
-    int8_t                             slice_qp_delta;
-    int8_t                             slice_cb_qp_offset;         // [-12, 12]
-    int8_t                             slice_cr_qp_offset;         // [-12, 12]
-    int8_t                             slice_beta_offset_div2;    // [-6, 6]
-    int8_t                             slice_tc_offset_div2;       // [-6, 6]
-    int8_t                             slice_act_y_qp_offset;
-    int8_t                             slice_act_cb_qp_offset;
-    int8_t                             slice_act_cr_qp_offset;
-    StdVideoEncodeH265SliceHeaderFlags flags;
-} StdVideoEncodeH265SliceHeader;
-
-typedef struct StdVideoEncodeH265ReferenceModificationFlags {
-    uint32_t ref_pic_list_modification_flag_l0 : 1;
-    uint32_t ref_pic_list_modification_flag_l1 : 1;
-} StdVideoEncodeH265ReferenceModificationFlags;
-
-typedef struct StdVideoEncodeH265ReferenceModifications {
-    StdVideoEncodeH265ReferenceModificationFlags flags;
-    uint8_t                                      referenceList0ModificationsCount; // num_ref_idx_l0_active_minus1
-    uint8_t*                                     pReferenceList0Modifications;     // list_entry_l0
-    uint8_t                                      referenceList1ModificationsCount; // num_ref_idx_l1_active_minus1
-    uint8_t*                                     pReferenceList1Modifications;     // list_entry_l1
-} StdVideoEncodeH265ReferenceModifications;
-
-typedef struct StdVideoEncodeH265PictureInfoFlags {
-    uint32_t is_reference_flag : 1;
-    uint32_t IrapPicFlag : 1;
-    uint32_t long_term_flag : 1;
-} StdVideoEncodeH265PictureInfoFlags;
-
-typedef struct StdVideoEncodeH265PictureInfo {
-    StdVideoH265PictureType            PictureType;
-    uint8_t                            sps_video_parameter_set_id;
-    uint8_t                            pps_seq_parameter_set_id;
-    int32_t                            PicOrderCntVal;
-    uint8_t                            TemporalId;
-    StdVideoEncodeH265PictureInfoFlags flags;
-} StdVideoEncodeH265PictureInfo;
-
-typedef struct StdVideoEncodeH265ReferenceInfoFlags {
-    uint32_t is_long_term : 1;
-    uint32_t isUsedFlag : 1;
-} StdVideoEncodeH265ReferenceInfoFlags;
-
-typedef struct StdVideoEncodeH265ReferenceInfo {
-    int32_t                              PicOrderCntVal;
-    uint8_t                              TemporalId;
-    StdVideoEncodeH265ReferenceInfoFlags flags;
-} StdVideoEncodeH265ReferenceInfo;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // VULKAN_VIDEO_CODEC_H265STD_ENCODE_H_
diff --git a/registry/vulkan/include/vk_video/vulkan_video_codecs_common.h b/registry/vulkan/include/vk_video/vulkan_video_codecs_common.h
deleted file mode 100644
index 8cc227a..0000000
--- a/registry/vulkan/include/vk_video/vulkan_video_codecs_common.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-** Copyright (c) 2019-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#ifndef VULKAN_VIDEO_CODEC_COMMON_H_
-#define VULKAN_VIDEO_CODEC_COMMON_H_ 1
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define VK_MAKE_VIDEO_STD_VERSION(major, minor, patch) \
-    ((((uint32_t)(major)) << 22) | (((uint32_t)(minor)) << 12) | ((uint32_t)(patch)))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // VULKAN_VIDEO_CODEC_COMMON_H_
diff --git a/registry/vulkan/include/vulkan/vk_platform.h b/registry/vulkan/include/vulkan/vk_platform.h
deleted file mode 100644
index 18b913a..0000000
--- a/registry/vulkan/include/vulkan/vk_platform.h
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// File: vk_platform.h
-//
-/*
-** Copyright 2014-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-
-#ifndef VK_PLATFORM_H_
-#define VK_PLATFORM_H_
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif // __cplusplus
-
-/*
-***************************************************************************************************
-*   Platform-specific directives and type declarations
-***************************************************************************************************
-*/
-
-/* Platform-specific calling convention macros.
- *
- * Platforms should define these so that Vulkan clients call Vulkan commands
- * with the same calling conventions that the Vulkan implementation expects.
- *
- * VKAPI_ATTR - Placed before the return type in function declarations.
- *              Useful for C++11 and GCC/Clang-style function attribute syntax.
- * VKAPI_CALL - Placed after the return type in function declarations.
- *              Useful for MSVC-style calling convention syntax.
- * VKAPI_PTR  - Placed between the '(' and '*' in function pointer types.
- *
- * Function declaration:  VKAPI_ATTR void VKAPI_CALL vkCommand(void);
- * Function pointer type: typedef void (VKAPI_PTR *PFN_vkCommand)(void);
- */
-#if defined(_WIN32)
-    // On Windows, Vulkan commands use the stdcall convention
-    #define VKAPI_ATTR
-    #define VKAPI_CALL __stdcall
-    #define VKAPI_PTR  VKAPI_CALL
-#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
-    #error "Vulkan isn't supported for the 'armeabi' NDK ABI"
-#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE)
-    // On Android 32-bit ARM targets, Vulkan functions use the "hardfloat"
-    // calling convention, i.e. float parameters are passed in registers. This
-    // is true even if the rest of the application passes floats on the stack,
-    // as it does by default when compiling for the armeabi-v7a NDK ABI.
-    #define VKAPI_ATTR __attribute__((pcs("aapcs-vfp")))
-    #define VKAPI_CALL
-    #define VKAPI_PTR  VKAPI_ATTR
-#else
-    // On other platforms, use the default calling convention
-    #define VKAPI_ATTR
-    #define VKAPI_CALL
-    #define VKAPI_PTR
-#endif
-
-#if !defined(VK_NO_STDDEF_H)
-    #include <stddef.h>
-#endif // !defined(VK_NO_STDDEF_H)
-
-#if !defined(VK_NO_STDINT_H)
-    #if defined(_MSC_VER) && (_MSC_VER < 1600)
-        typedef signed   __int8  int8_t;
-        typedef unsigned __int8  uint8_t;
-        typedef signed   __int16 int16_t;
-        typedef unsigned __int16 uint16_t;
-        typedef signed   __int32 int32_t;
-        typedef unsigned __int32 uint32_t;
-        typedef signed   __int64 int64_t;
-        typedef unsigned __int64 uint64_t;
-    #else
-        #include <stdint.h>
-    #endif
-#endif // !defined(VK_NO_STDINT_H)
-
-#ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
-
-#endif
diff --git a/registry/vulkan/include/vulkan/vulkan.h b/registry/vulkan/include/vulkan/vulkan.h
deleted file mode 100644
index 3f7cdba..0000000
--- a/registry/vulkan/include/vulkan/vulkan.h
+++ /dev/null
@@ -1,92 +0,0 @@
-#ifndef VULKAN_H_
-#define VULKAN_H_ 1
-
-/*
-** Copyright 2015-2021 The Khronos Group Inc.
-**
-** SPDX-License-Identifier: Apache-2.0
-*/
-
-#include "vk_platform.h"
-#include "vulkan_core.h"
-
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-#include "vulkan_android.h"
-#endif
-
-#ifdef VK_USE_PLATFORM_FUCHSIA
-#include <zircon/types.h>
-#include "vulkan_fuchsia.h"
-#endif
-
-#ifdef VK_USE_PLATFORM_IOS_MVK
-#include "vulkan_ios.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_MACOS_MVK
-#include "vulkan_macos.h"
-#endif
-
-#ifdef VK_USE_PLATFORM_METAL_EXT
-#include "vulkan_metal.h"
-#endif
-
-#ifdef VK_USE_PLATFORM_VI_NN
-#include "vulkan_vi.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-#include <wayland-client.h>
-#include "vulkan_wayland.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-#include <windows.h>
-#include "vulkan_win32.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_XCB_KHR
-#include <xcb/xcb.h>
-#include "vulkan_xcb.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-#include <X11/Xlib.h>
-#include "vulkan_xlib.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_DIRECTFB_EXT
-#include <directfb.h>
-#include "vulkan_directfb.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
-#include <X11/Xlib.h>
-#include <X11/extensions/Xrandr.h>
-#include "vulkan_xlib_xrandr.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_GGP
-#include <ggp_c/vulkan_types.h>
-#include "vulkan_ggp.h"
-#endif
-
-
-#ifdef VK_USE_PLATFORM_SCREEN_QNX
-#include <screen/screen.h>
-#include "vulkan_screen.h"
-#endif
-
-#ifdef VK_ENABLE_BETA_EXTENSIONS
-#include "vulkan_beta.h"
-#endif
-
-#endif // VULKAN_H_