diff --git a/meson.build b/meson.build
index edec6f0..3c870fc 100644
--- a/meson.build
+++ b/meson.build
@@ -9,16 +9,10 @@ espeak_dep = dependency('espeak-ng')
 alsa_dep = dependency('alsa')
 m_dep = cc.find_library('m', required : false)
 
+subdir('src')
+
 executable('espeakup',
-           'src/cli.c',
-           'src/espeak.c',
-           'src/espeakup.c',
-           'src/espeakup.h',
-           'src/queue.c',
-           'src/queue.h',
-           'src/signal.c',
-           'src/softsynth.c',
-           'src/stringhandling.c',
-           'src/stringhandling.h',
+           espeakup_sources,
+           include_directories : espeakup_incdir,
            dependencies : [thread_dep, espeak_dep, alsa_dep, m_dep],
            install : true)
diff --git a/src/espeakup.h b/src/include/espeakup.h
similarity index 100%
rename from src/espeakup.h
rename to src/include/espeakup.h
diff --git a/src/queue.h b/src/include/queue.h
similarity index 100%
rename from src/queue.h
rename to src/include/queue.h
diff --git a/src/stringhandling.h b/src/include/stringhandling.h
similarity index 100%
rename from src/stringhandling.h
rename to src/include/stringhandling.h
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 0000000..f3de06b
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1,10 @@
+espeakup_incdir = include_directories('include')
+espeakup_sources = files([
+        'cli.c',
+        'espeak.c',
+        'espeakup.c',
+        'queue.c',
+        'signal.c',
+        'softsynth.c',
+        'stringhandling.c'
+])