diff --git a/data/meson.build b/data/meson.build
index 9f40f3e3d0de64ca3f25c45367daadba26852ad3..c9b1fb684dd11269c7d81c8f89817b1e06c746a5 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -15,6 +15,6 @@ moody_resources = gnome.compile_resources(
    'moody-resources',
    'ch.gnugen.Moody.gresources.xml',
    source_dir : ['ui', 'media'],
-   c_name: 'hdy',
+   c_name: 'moody',
 )
 
diff --git a/meson.build b/meson.build
index 9428b561e384f9668e6807453423b07f978e7578..28f668f42886ddcc81311956a33dc9bf06c30205 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('moody', 'c',
         version: '0.0.1',
         license: 'GPL-3+',
-  meson_version: '>= 0.47.0',
+  meson_version: '>= 0.50.0',
 )
 
 gnome = import('gnome')
@@ -22,10 +22,6 @@ configure_file(
   configuration: config_h,
 )
 
-add_project_arguments([
-  '-I' + meson.build_root(),
-], language: 'c')
-
 
 cc = meson.get_compiler('c')
 
@@ -102,17 +98,28 @@ message('\n'.join(summary))
 
 moody_sources = [
   moody_resources,
-  'src/moody.c',
-  'src/moodle-provider.c',
-  'src/moodle-parser.c',
-  'src/gui-window.c',
-  'src/gui-pass-dialog.c',
+  'src/data-struct.h',
   'src/gui-course.c',
-  'src/gui-week.c',
+  'src/gui-course.h',
+  'src/gui-pass-dialog.c',
+  'src/gui-pass-dialog.h',
   'src/gui-resource.c',
+  'src/gui-resource.h',
+  'src/gui-week.c',
+  'src/gui-week.h',
+  'src/gui-window.c',
+  'src/gui-window.h',
+  'src/moodle-parser.c',
+  'src/moodle-parser.h',
+  'src/moodle-provider.c',
+  'src/moodle-provider.h',
+  'src/moody.c',
   'src/password.c',
+  'src/password.h',
   'src/settings.c',
+  'src/settings.h',
   'src/utils.c',
+  'src/utils.h',
 ]
 
 libhandy_dep = dependency('libhandy-0.0', version: '>= 0.0.8')