diff --git a/girepository/tools/generate.c b/girepository/decompiler/decompiler.c
similarity index 100%
rename from girepository/tools/generate.c
rename to girepository/decompiler/decompiler.c
diff --git a/girepository/decompiler/meson.build b/girepository/decompiler/meson.build
new file mode 100644
index 000000000..cb4553262
--- /dev/null
+++ b/girepository/decompiler/meson.build
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# SPDX-FileCopyrightText: 2024 GNOME Foundation
+
+custom_c_args = [
+  '-DG_LOG_DOMAIN="GLib-GirDecompiler"',
+]
+
+if cc.get_id() != 'msvc'
+  custom_c_args = cc.get_supported_arguments([
+    '-Wno-old-style-definition',
+    '-Wno-cast-align',
+    '-Wno-unused-parameter',
+    '-Wno-duplicated-branches',
+  ])
+endif
+
+gidecompiletypelib = executable('gi-decompile-typelib', 'decompiler.c',
+  dependencies: [
+    libgirepository_dep,
+    libgirepository_internals_dep,
+    libgio_dep,
+  ],
+  install: true,
+  c_args: custom_c_args,
+)
diff --git a/girepository/tools/g-ir-inspect.c b/girepository/inspector/inspector.c
similarity index 100%
rename from girepository/tools/g-ir-inspect.c
rename to girepository/inspector/inspector.c
diff --git a/girepository/inspector/meson.build b/girepository/inspector/meson.build
new file mode 100644
index 000000000..8948cedc8
--- /dev/null
+++ b/girepository/inspector/meson.build
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# SPDX-FileCopyrightText: 2024 GNOME Foundation
+
+custom_c_args = [
+  '-DG_LOG_DOMAIN="GLib-GirInspector"',
+]
+
+if cc.get_id() != 'msvc'
+  custom_c_args = cc.get_supported_arguments([
+    '-Wno-old-style-definition',
+    '-Wno-cast-align',
+    '-Wno-unused-parameter',
+    '-Wno-duplicated-branches',
+  ])
+endif
+
+giinspecttypelib = executable('gi-inspect-typelib', 'inspector.c',
+  dependencies: [
+    libgirepository_dep,
+    libgio_dep,
+  ],
+  install: true,
+  c_args: custom_c_args,
+)
diff --git a/girepository/meson.build b/girepository/meson.build
index 3dd539376..3292f6672 100644
--- a/girepository/meson.build
+++ b/girepository/meson.build
@@ -243,3 +243,5 @@ if build_tests
 endif
 
 subdir('compiler')
+subdir('decompiler')
+subdir('inspector')
\ No newline at end of file