diff --git a/meson.build b/meson.build
index 9c406d9f..ec8faaac 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('tracy', ['cpp'])
+project('tracy', ['cpp', 'c'])
 
 if get_option('tracy_enable')
   add_project_arguments('-DTRACY_ENABLE', language : 'cpp')
@@ -156,7 +156,9 @@ common_includes = [
 tracy_header_files = common_includes + client_includes + includes
 
 tracy_src = [
-    'public/TracyClient.cpp'
+    'public/TracyClient.cpp',
+    'public/common/tracy_lz4.cpp',
+    'public/common/tracy_lz4hc.cpp'
 ]
 
 tracy_public_include_dirs = include_directories('public')
@@ -201,6 +203,7 @@ tracy_dep_dynamic = declare_dependency(
 
 meson.override_dependency('tracy', tracy_dep)
 
+subdir('zstd')
 subdir('imgui')
 subdir('server')
 subdir('profiler')
diff --git a/profiler/meson.build b/profiler/meson.build
index 1ae19ab9..f189f1b1 100644
--- a/profiler/meson.build
+++ b/profiler/meson.build
@@ -8,7 +8,9 @@ profiler_sources = files(
     'src/ImGuiContext.cpp', 
     'src/ResolvService.cpp',
     'src/RunQueue.cpp',
-    'src/WindowPosition.cpp')
+    'src/WindowPosition.cpp',
+    'src/imgui/imgui_impl_glfw.cpp',
+    'src/imgui/imgui_impl_opengl3.cpp')
 
 if get_option('tracy_gtk_fileselector')
     profiler_sources += files('../nfd/nfd_gtk.cpp')
@@ -18,4 +20,4 @@ profiler_inc = include_directories('src', 'src/imgui')
 
 glfw = dependency('glfw3')
 
-executable('profiler', profiler_sources, include_directories: profiler_inc, dependencies: [glfw, threads_dep, server_dep, tracy_dep])
\ No newline at end of file
+executable('profiler', profiler_sources, include_directories: profiler_inc, dependencies: [glfw, threads_dep, server_dep, tracy_dep, zstd_dep])
\ No newline at end of file
diff --git a/server/meson.build b/server/meson.build
index 662a7322..fee42cd2 100644
--- a/server/meson.build
+++ b/server/meson.build
@@ -17,8 +17,37 @@ server_sources = files(
         'TracyTaskDispatch.cpp',
         'TracyTexture.cpp',
         'TracyTextureCompression.cpp',
-        'TracyThreadCompression.cpp',
-        'TracyTexture.cpp')
+        'TracyThreadCompress.cpp',
+        'TracyUserData.cpp',
+        'TracyView_Annotations.cpp',
+        'TracyView_Callstack.cpp',
+        'TracyView_Compare.cpp',
+        'TracyView_ConnectionState.cpp',
+        'TracyView_ContextSwitch.cpp',
+        'TracyView_CpuData.cpp',
+        'TracyView_FindZone.cpp',
+        'TracyView_FrameOverview.cpp',
+        'TracyView_FrameTimeline.cpp',
+        'TracyView_FrameTree.cpp',
+        'TracyView_Locks.cpp',
+        'TracyView_Memory.cpp',
+        'TracyView_Messages.cpp',
+        'TracyView_Navigation.cpp',
+        'TracyView_NotificationArea.cpp',
+        'TracyView_Options.cpp',
+        'TracyView_Playback.cpp',
+        'TracyView_Plots.cpp',
+        'TracyView_Ranges.cpp',
+        'TracyView_Samples.cpp',
+        'TracyView_Statistics.cpp',
+        'TracyView_Timeline.cpp',
+        'TracyView_TraceInfo.cpp',
+        'TracyView_Utility.cpp',
+        'TracyView_ZoneInfo.cpp',
+        'TracyView_ZoneTimeline.cpp',
+        'TracyView.cpp',
+        'TracyWeb.cpp',
+        'TracyWorker.cpp')
 
 capstone = dependency('capstone')
 
diff --git a/zstd/meson.build b/zstd/meson.build
new file mode 100644
index 00000000..4b8a9524
--- /dev/null
+++ b/zstd/meson.build
@@ -0,0 +1,36 @@
+zstd_sources = files(
+    'common/debug.c',
+    'common/entropy_common.c',
+    'common/error_private.c',
+    'common/fse_decompress.c',
+    'common/pool.c',
+    'common/threading.c',
+    'common/xxhash.c',
+    'common/zstd_common.c',
+    'compress/fse_compress.c',
+    'compress/hist.c',
+    'compress/huf_compress.c',
+    'compress/zstd_compress_literals.c',
+    'compress/zstd_compress_sequences.c',
+    'compress/zstd_compress_superblock.c',
+    'compress/zstd_compress.c',
+    'compress/zstd_double_fast.c',
+    'compress/zstd_fast.c',
+    'compress/zstd_lazy.c',
+    'compress/zstd_ldm.c',
+    'compress/zstd_opt.c',
+    'compress/zstdmt_compress.c',
+    'decompress/huf_decompress_amd64.S',
+    'decompress/huf_decompress.c',
+    'decompress/zstd_ddict.c',
+    'decompress/zstd_decompress_block.c',
+    'decompress/zstd_decompress.c',
+    'dictBuilder/cover.c',
+    'dictBuilder/divsufsort.c',
+    'dictBuilder/fastcover.c',
+    'dictBuilder/zdict.c',
+    )
+
+zstd_inc = include_directories('.')
+zstd_lib = static_library('zstd', zstd_sources, include_directories: zstd_inc)
+zstd_dep = declare_dependency(include_directories: zstd_inc, link_with: zstd_lib)
\ No newline at end of file