diff --git a/src/hud_elements.cpp b/src/hud_elements.cpp
index 48ae0389..c9d72212 100644
--- a/src/hud_elements.cpp
+++ b/src/hud_elements.cpp
@@ -17,6 +17,7 @@
 #include "string_utils.h"
 #include "app/mangoapp.h"
 #include <IconsForkAwesome.h>
+#include "version.h"
 
 #define CHAR_CELSIUS    "\xe2\x84\x83"
 #define CHAR_FAHRENHEIT "\xe2\x84\x89"
diff --git a/src/logging.cpp b/src/logging.cpp
index 71268030..1c28efdf 100644
--- a/src/logging.cpp
+++ b/src/logging.cpp
@@ -7,6 +7,7 @@
 #include "config.h"
 #include "file_utils.h"
 #include "string_utils.h"
+#include "version.h"
 
 using namespace std;
 
diff --git a/src/meson.build b/src/meson.build
index d08607f9..de93afc7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -159,7 +159,7 @@ link_args = cc.get_supported_link_arguments(['-Wl,-Bsymbolic-functions', '-Wl,-z
 # meson fails to check version-script so just force add
 link_args += '-Wl,--version-script,@0@'.format(join_paths(meson.current_source_dir(), 'mangohud.version'))
 
-vklayer_mesa_overlay = shared_library(
+mangohud_library = both_libraries(
   'MangoHud',
   mangohud_version,
   util_files,
@@ -193,6 +193,7 @@ vklayer_mesa_overlay = shared_library(
   install_dir : libdir_mangohud,
   install : true
 )
+
 if is_unixy
   mangohud_dlsym = shared_library(
     'MangoHud_dlsym',
@@ -222,11 +223,6 @@ if get_option('mangoapp')
   pre_args += '-DMANGOAPP'
   mangoapp = executable(
     'mangoapp',
-    mangohud_version,
-    util_files,
-    vk_enum_to_str,
-    vklayer_files,
-    opengl_files,
     files(
       'app/main.cpp',
     ),
@@ -247,10 +243,11 @@ if get_option('mangoapp')
       dbus_dep,
       dep_x11,
       glfw3_dep,
-      json_dep,
+      json_dep
     ],
     include_directories : [inc_common],
     install_tag : 'mangoapp',
+    link_with: mangohud_library.get_static_lib(),
     link_args : link_args,
     install : true
   )
diff --git a/src/overlay.h b/src/overlay.h
index 83b063c6..54782eae 100644
--- a/src/overlay.h
+++ b/src/overlay.h
@@ -7,7 +7,6 @@
 #include <vector>
 #include <deque>
 #include <imgui.h>
-#include "version.h"
 #include "overlay_params.h"
 #include "hud_elements.h"
 #include "engine_types.h"