diff --git a/include/bej_decoder_core.h b/include/libbej/bej_decoder_core.h
similarity index 100%
rename from include/bej_decoder_core.h
rename to include/libbej/bej_decoder_core.h
diff --git a/include/bej_decoder_json.hpp b/include/libbej/bej_decoder_json.hpp
similarity index 100%
rename from include/bej_decoder_json.hpp
rename to include/libbej/bej_decoder_json.hpp
diff --git a/include/bej_dictionary.h b/include/libbej/bej_dictionary.h
similarity index 100%
rename from include/bej_dictionary.h
rename to include/libbej/bej_dictionary.h
diff --git a/include/libbej/meson.build b/include/libbej/meson.build
new file mode 100644
index 0000000..de07150
--- /dev/null
+++ b/include/libbej/meson.build
@@ -0,0 +1,11 @@
+libbej_headers = files(
+  'bej_decoder_core.h',
+  'bej_decoder_json.hpp',
+  'bej_dictionary.h',
+  'rde_common.h'
+)
+
+install_headers(
+  libbej_headers,
+  subdir:'libbej'
+)
diff --git a/include/rde_common.h b/include/libbej/rde_common.h
similarity index 100%
rename from include/rde_common.h
rename to include/libbej/rde_common.h
diff --git a/include/meson.build b/include/meson.build
deleted file mode 100644
index ff3f19a..0000000
--- a/include/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-install_subdir('.', install_dir: get_option('includedir'))
diff --git a/meson.build b/meson.build
index bb7c166..d215d99 100644
--- a/meson.build
+++ b/meson.build
@@ -12,9 +12,9 @@
     'tests=' + (meson.is_subproject() ? 'disabled' : 'auto'),
   ])
 
-libbej_incs = include_directories('include')
+libbej_incs = include_directories('include/libbej')
 subdir('src')
-subdir('include')
+subdir('include/libbej')
 if not get_option('tests').disabled()
   subdir('test')
 endif