diff --git a/meson.build b/meson.build
index b3a044f..261df7e 100644
--- a/meson.build
+++ b/meson.build
@@ -10,13 +10,12 @@ espeak_dep = dependency('espeak-ng')
 alsa_dep = dependency('alsa')
 math_dep = cc.find_library('m', required : false)
 
-subdir('src')
 subdir('doc')
 subdir('services')
+subdir('src')
 
 executable('espeakup',
-           espeakup_sources,
            espeakup_version,
-           include_directories : espeakup_incdir,
+           espeakup_sources,
            dependencies : [thread_dep, espeak_dep, alsa_dep, math_dep],
            install : true)
diff --git a/src/include/espeakup.h b/src/espeakup.h
similarity index 100%
rename from src/include/espeakup.h
rename to src/espeakup.h
diff --git a/src/include/meson.build b/src/include/meson.build
deleted file mode 100644
index 3d65414..0000000
--- a/src/include/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-espeakup_version = vcs_tag(input : 'version.h.in',
-        output : 'version.h')
diff --git a/src/meson.build b/src/meson.build
index e90332e..f1c4610 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,5 @@
-espeakup_incdir = include_directories('include')
+espeakup_version = vcs_tag(input : 'version.h.in', output : 'version.h')
 
-subdir('include')
 
 espeakup_sources = files([
         'cli.c',
diff --git a/src/include/queue.h b/src/queue.h
similarity index 100%
rename from src/include/queue.h
rename to src/queue.h
diff --git a/src/include/stringhandling.h b/src/stringhandling.h
similarity index 100%
rename from src/include/stringhandling.h
rename to src/stringhandling.h
diff --git a/src/include/version.h.in b/src/version.h.in
similarity index 100%
rename from src/include/version.h.in
rename to src/version.h.in