diff --git a/src/dmon.h b/lib/dmon/dmon.h
similarity index 100%
rename from src/dmon.h
rename to lib/dmon/dmon.h
diff --git a/src/dmon_extra.h b/lib/dmon/dmon_extra.h
similarity index 100%
rename from src/dmon_extra.h
rename to lib/dmon/dmon_extra.h
diff --git a/lib/font_renderer/meson.build b/lib/font_renderer/meson.build
index d596e15..569de82 100644
--- a/lib/font_renderer/meson.build
+++ b/lib/font_renderer/meson.build
@@ -9,7 +9,7 @@ font_renderer_sources = [
 
 font_renderer_cdefs = ['-DFONT_RENDERER_HEIGHT_HACK']
 
-font_renderer_include = include_directories('.')
+lite_includes += include_directories('.')
 
 libfontrenderer = static_library('fontrenderer',
     font_renderer_sources,
diff --git a/meson.build b/meson.build
index f1d2b35..613204b 100644
--- a/meson.build
+++ b/meson.build
@@ -23,6 +23,7 @@ endif
 
 cc = meson.get_compiler('c')
 
+lite_includes = []
 lite_cargs = []
 # On macos we need to use the SDL renderer to support retina displays
 if get_option('renderer') or host_machine.system() == 'darwin'
@@ -118,11 +119,9 @@ configure_file(
     install_dir : lite_datadir / 'core',
 )
 
-#===============================================================================
-# Targets
-#===============================================================================
 if not get_option('source-only')
     subdir('lib/font_renderer')
+    subdir('lib/dmon')
     subdir('src')
     subdir('scripts')
 endif
diff --git a/src/meson.build b/src/meson.build
index 2da04fd..503fdc4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -22,11 +22,11 @@ elif host_machine.system() == 'darwin'
     lite_sources += 'bundle_open.m'
 endif
 
-lite_include = include_directories('.')
+lite_includes += include_directories('.')
 
 executable('lite-xl',
     lite_sources + lite_rc,
-    include_directories: [lite_include, font_renderer_include],
+    include_directories: lite_includes,
     dependencies: lite_deps,
     c_args: lite_cargs,
     objc_args: lite_cargs,