diff --git a/embedtool.cpp b/embedtool.cpp
index f4fd28a6..7ee9dc41 100644
--- a/embedtool.cpp
+++ b/embedtool.cpp
@@ -41,7 +41,7 @@ int main(int argc, char **argv) {
         return 3;
     }
 
-    outputf << "#include <stddef.h>\n#include <stdint.h>\nconst uint8_t " << arrayname << "[] = {";
+    outputf << "#include <stddef.h>\n#include <stdint.h>\nextern const uint8_t " << arrayname << "[] = {";
 
     uint64_t len = 0;
     for (;;) {
@@ -53,7 +53,7 @@ int main(int argc, char **argv) {
         ++len;
     }
 
-    outputf << "};\nconst size_t " << arrayname << "_len = " << len << "ULL;";
+    outputf << "};\nextern const size_t " << arrayname << "_len = " << len << "ULL;";
 
     return 0;
 }
diff --git a/libretro/README.md b/libretro/README.md
index e354f7fa..2fead819 100644
--- a/libretro/README.md
+++ b/libretro/README.md
@@ -32,7 +32,6 @@ This stage produces the actual core file.
 Required software:
 * C and C++ compilers
 * [Git](https://git-scm.com)
-* [xxd](https://github.com/vim/vim/blob/master/runtime/doc/xxd.man)
 * [Meson](https://mesonbuild.com)
 * [Ninja](https://ninja-build.org)
 * [CMake](https://cmake.org)
diff --git a/meson.build b/meson.build
index e2ab0c70..674b4160 100644
--- a/meson.build
+++ b/meson.build
@@ -14,7 +14,7 @@ endif
 
 compilers = {'c': meson.get_compiler('c'), 'cpp': meson.get_compiler('cpp')}
 
-global_sources = []
+global_sources = [vcs_tag(command: ['git', 'rev-parse', '--short=7', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h')]
 global_dependencies = []
 global_include_dirs = []
 global_args = []
@@ -32,8 +32,6 @@ global_args += '-DHAVE_NANOSLEEP'
 # Ext libs
 # ====================
 
-global_sources += vcs_tag(command: ['git', 'rev-parse', '--short', 'HEAD'], fallback: 'unknown', input: 'src/git-hash.h.in', output: 'git-hash.h')
-
 if is_libretro
     embedtool = executable('embedtool', sources: 'embedtool.cpp', native: true, override_options: [])