4 files changed, 27 insertions, 28 deletions
diff --git a/contrib/base32hex.c b/contrib/base32hex.c
index 1684ac9e..b5df2798 100644
--- a/contrib/base32hex.c
+++ b/contrib/base32hex.c
@@ -14,7 +14,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "contrib/base32hex.h"
+#include "base32hex.h"
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/contrib/base64.c b/contrib/base64.c
index e577901b..f41db400 100644
--- a/contrib/base64.c
+++ b/contrib/base64.c
@@ -14,7 +14,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "contrib/base64.h"
+#include "base64.h"
 #include "libknot/errcode.h"
 
 #include <stdlib.h>
diff --git a/contrib/meson.build b/contrib/meson.build
new file mode 100644
index 00000000..c9fcb62c
--- /dev/null
+++ b/contrib/meson.build
@@ -0,0 +1,24 @@
+contrib_src = [
+  'ccan/asprintf/asprintf.c',
+  'ccan/ilog/ilog.c',
+  'ccan/json/json.c',
+  'ucw/mempool.c',
+  'ucw/mempool-fmt.c',
+  'murmurhash3/murmurhash3.c',
+  'base32hex.c',
+  'base64.c'
+]
+
+contrib_inc = include_directories('.')
+
+contrib_lib = static_library(
+  'contrib',
+  contrib_src,
+  include_directories: contrib_inc,
+  dependencies: libknot, # errcode.h
+)
+
+contrib_dep = declare_dependency(
+  include_directories: contrib_inc,
+  link_with: contrib_lib,
+)
diff --git a/meson.build b/meson.build
index 94fc23f1..51c0acda 100644
--- a/meson.build
+++ b/meson.build
@@ -129,32 +129,7 @@ if host_machine.system() == 'darwin'
 endif
 
 
-## contrib
-
-contrib_src = [
-  'contrib/ccan/asprintf/asprintf.c',
-  'contrib/ccan/ilog/ilog.c',
-  'contrib/ccan/json/json.c',
-  'contrib/ucw/mempool.c',
-  'contrib/ucw/mempool-fmt.c',
-  'contrib/murmurhash3/murmurhash3.c',
-  'contrib/base32hex.c',
-  'contrib/base64.c'
-]
-
-contrib_inc = include_directories('contrib')
-
-contrib_lib = static_library(
-  'contrib',
-  contrib_src,
-  include_directories: contrib_inc,
-  dependencies: libknot, # errcode.h
-)
-
-contrib_dep = declare_dependency(
-  include_directories: contrib_inc,
-  link_with: contrib_lib,
-)
+subdir('contrib')
 
 ### libkres