diff --git a/src/gtklistmodels/gtk.h b/src/gtklistmodels/gtkmodels.h
similarity index 100%
rename from src/gtklistmodels/gtk.h
rename to src/gtklistmodels/gtkmodels.h
diff --git a/src/gtklistmodels/meson.build b/src/gtklistmodels/meson.build
new file mode 100644
index 0000000..c7fa51f
--- /dev/null
+++ b/src/gtklistmodels/meson.build
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2022 Purism SPC
+#
+# This file is part of Calls.
+#
+# Calls is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Calls is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Calls.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Evangelos Ribeiro Tzaras <devrtz@fortysixandtwo.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+gtklistmodel_sources = files([
+ 'gtkmodels.h',
+ 'gtkcustomfilter.c', 'gtkcustomfilter.h',
+ 'gtkcustomsorter.c', 'gtkcustomsorter.h',
+ 'gtkfilter.c', 'gtkfilter.h',
+ 'gtkfilterlistmodel.c', 'gtkfilterlistmodel.h',
+ 'gtkflattenlistmodel.c', 'gtkflattenlistmodel.h',
+ 'gtkintl.h',
+ 'gtkprivate.h',
+ 'gtkrbtree.c',
+ 'gtkrbtreeprivate.h',
+ 'gtkslicelistmodel.c', 'gtkslicelistmodel.h',
+ 'gtksorter.c', 'gtksorter.h',
+ 'gtksortlistmodel.c', 'gtksortlistmodel.h',
+ 'gtktypebuiltins.c', 'gtktypebuiltins.h',
+ ])
diff --git a/src/meson.build b/src/meson.build
index 1b68e80..58d361c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -26,7 +26,7 @@ gnome = import('gnome')
 
 subdir('dbus')
 
-src_include = include_directories('.')
+src_include = include_directories('.', 'gtklistmodels')
 calls_includes = [ top_include, src_include ]
 
 calls_deps = [ dependency('gobject-2.0', version: '>= 2.58'),
@@ -82,6 +82,8 @@ calls_generated_sources = [
   generated_dbus_sources,
 ]
 
+subdir('gtklistmodels')
+
 calls_sources = files(['calls-message-source.c', 'calls-message-source.h',
                        'calls-call.c',
                        'calls-dbus-manager.c',
@@ -115,7 +117,7 @@ calls_sources = files(['calls-message-source.c', 'calls-message-source.h',
                        'calls-secret-store.c', 'calls-secret-store.h',
                        'calls-network-watch.c', 'calls-network-watch.h',
                        'calls-ui-call-data.c', 'calls-ui-call-data.h',
-                      ]) + calls_generated_sources
+                      ]) + calls_generated_sources + gtklistmodel_sources
 
 calls_config_data = config_data