diff --git a/sdbusplus/asio/connection.hpp b/include/sdbusplus/asio/connection.hpp
similarity index 100%
rename from sdbusplus/asio/connection.hpp
rename to include/sdbusplus/asio/connection.hpp
diff --git a/sdbusplus/asio/detail/async_send_handler.hpp b/include/sdbusplus/asio/detail/async_send_handler.hpp
similarity index 100%
rename from sdbusplus/asio/detail/async_send_handler.hpp
rename to include/sdbusplus/asio/detail/async_send_handler.hpp
diff --git a/sdbusplus/asio/object_server.hpp b/include/sdbusplus/asio/object_server.hpp
similarity index 100%
rename from sdbusplus/asio/object_server.hpp
rename to include/sdbusplus/asio/object_server.hpp
diff --git a/sdbusplus/asio/sd_event.hpp b/include/sdbusplus/asio/sd_event.hpp
similarity index 100%
rename from sdbusplus/asio/sd_event.hpp
rename to include/sdbusplus/asio/sd_event.hpp
diff --git a/sdbusplus/bus.hpp b/include/sdbusplus/bus.hpp
similarity index 100%
rename from sdbusplus/bus.hpp
rename to include/sdbusplus/bus.hpp
diff --git a/sdbusplus/bus/match.hpp b/include/sdbusplus/bus/match.hpp
similarity index 100%
rename from sdbusplus/bus/match.hpp
rename to include/sdbusplus/bus/match.hpp
diff --git a/sdbusplus/exception.hpp b/include/sdbusplus/exception.hpp
similarity index 100%
rename from sdbusplus/exception.hpp
rename to include/sdbusplus/exception.hpp
diff --git a/sdbusplus/message.hpp b/include/sdbusplus/message.hpp
similarity index 100%
rename from sdbusplus/message.hpp
rename to include/sdbusplus/message.hpp
diff --git a/sdbusplus/message/append.hpp b/include/sdbusplus/message/append.hpp
similarity index 100%
rename from sdbusplus/message/append.hpp
rename to include/sdbusplus/message/append.hpp
diff --git a/sdbusplus/message/native_types.hpp b/include/sdbusplus/message/native_types.hpp
similarity index 100%
rename from sdbusplus/message/native_types.hpp
rename to include/sdbusplus/message/native_types.hpp
diff --git a/sdbusplus/message/read.hpp b/include/sdbusplus/message/read.hpp
similarity index 100%
rename from sdbusplus/message/read.hpp
rename to include/sdbusplus/message/read.hpp
diff --git a/sdbusplus/message/types.hpp b/include/sdbusplus/message/types.hpp
similarity index 100%
rename from sdbusplus/message/types.hpp
rename to include/sdbusplus/message/types.hpp
diff --git a/sdbusplus/sdbus.hpp b/include/sdbusplus/sdbus.hpp
similarity index 100%
rename from sdbusplus/sdbus.hpp
rename to include/sdbusplus/sdbus.hpp
diff --git a/sdbusplus/server.hpp b/include/sdbusplus/server.hpp
similarity index 100%
rename from sdbusplus/server.hpp
rename to include/sdbusplus/server.hpp
diff --git a/sdbusplus/server/README.md b/include/sdbusplus/server/README.md
similarity index 100%
rename from sdbusplus/server/README.md
rename to include/sdbusplus/server/README.md
diff --git a/sdbusplus/server/bindings.hpp b/include/sdbusplus/server/bindings.hpp
similarity index 100%
rename from sdbusplus/server/bindings.hpp
rename to include/sdbusplus/server/bindings.hpp
diff --git a/sdbusplus/server/interface.hpp b/include/sdbusplus/server/interface.hpp
similarity index 100%
rename from sdbusplus/server/interface.hpp
rename to include/sdbusplus/server/interface.hpp
diff --git a/sdbusplus/server/manager.hpp b/include/sdbusplus/server/manager.hpp
similarity index 100%
rename from sdbusplus/server/manager.hpp
rename to include/sdbusplus/server/manager.hpp
diff --git a/sdbusplus/server/object.hpp b/include/sdbusplus/server/object.hpp
similarity index 100%
rename from sdbusplus/server/object.hpp
rename to include/sdbusplus/server/object.hpp
diff --git a/sdbusplus/server/transaction.hpp b/include/sdbusplus/server/transaction.hpp
similarity index 100%
rename from sdbusplus/server/transaction.hpp
rename to include/sdbusplus/server/transaction.hpp
diff --git a/sdbusplus/slot.hpp b/include/sdbusplus/slot.hpp
similarity index 100%
rename from sdbusplus/slot.hpp
rename to include/sdbusplus/slot.hpp
diff --git a/sdbusplus/test/sdbus_mock.hpp b/include/sdbusplus/test/sdbus_mock.hpp
similarity index 100%
rename from sdbusplus/test/sdbus_mock.hpp
rename to include/sdbusplus/test/sdbus_mock.hpp
diff --git a/sdbusplus/timer.hpp b/include/sdbusplus/timer.hpp
similarity index 100%
rename from sdbusplus/timer.hpp
rename to include/sdbusplus/timer.hpp
diff --git a/sdbusplus/utility/container_traits.hpp b/include/sdbusplus/utility/container_traits.hpp
similarity index 100%
rename from sdbusplus/utility/container_traits.hpp
rename to include/sdbusplus/utility/container_traits.hpp
diff --git a/sdbusplus/utility/read_into_tuple.hpp b/include/sdbusplus/utility/read_into_tuple.hpp
similarity index 100%
rename from sdbusplus/utility/read_into_tuple.hpp
rename to include/sdbusplus/utility/read_into_tuple.hpp
diff --git a/sdbusplus/utility/tuple_to_array.hpp b/include/sdbusplus/utility/tuple_to_array.hpp
similarity index 100%
rename from sdbusplus/utility/tuple_to_array.hpp
rename to include/sdbusplus/utility/tuple_to_array.hpp
diff --git a/sdbusplus/utility/type_traits.hpp b/include/sdbusplus/utility/type_traits.hpp
similarity index 100%
rename from sdbusplus/utility/type_traits.hpp
rename to include/sdbusplus/utility/type_traits.hpp
diff --git a/sdbusplus/vtable.hpp b/include/sdbusplus/vtable.hpp
similarity index 100%
rename from sdbusplus/vtable.hpp
rename to include/sdbusplus/vtable.hpp
diff --git a/meson.build b/meson.build
index 8ea6b9b..678b960 100644
--- a/meson.build
+++ b/meson.build
@@ -8,17 +8,18 @@
 )
 
 libsystemd_pkg = dependency('libsystemd')
-root_inc = include_directories('.')
+root_inc = include_directories('include')
 
 libsdbusplus_src = files(
-    'sdbusplus/exception.cpp',
-    'sdbusplus/sdbus.cpp',
-    'sdbusplus/server/transaction.cpp',
+    'src/exception.cpp',
+    'src/sdbus.cpp',
+    'src/server/transaction.cpp',
 )
 
 libsdbusplus = library(
     'sdbusplus',
     libsdbusplus_src,
+    include_directories: root_inc,
     dependencies: libsystemd_pkg,
     version: meson.project_version(),
     install: true,
@@ -43,12 +44,9 @@
 subdir('test')
 
 install_subdir(
-    'sdbusplus',
+    'include/sdbusplus',
     install_dir: get_option('includedir'),
     strip_directory: false,
-    # TODO (stwcx): Once we remove autotools, we can move these files
-    # out of the same directory as the headers and remove this.
-    exclude_files: [ 'exception.cpp', 'sdbus.cpp', 'server/transaction.cpp' ],
 )
 
 import('pkgconfig').generate(
diff --git a/sdbusplus/exception.cpp b/src/exception.cpp
similarity index 100%
rename from sdbusplus/exception.cpp
rename to src/exception.cpp
diff --git a/sdbusplus/sdbus.cpp b/src/sdbus.cpp
similarity index 100%
rename from sdbusplus/sdbus.cpp
rename to src/sdbus.cpp
diff --git a/sdbusplus/server/transaction.cpp b/src/server/transaction.cpp
similarity index 83%
rename from sdbusplus/server/transaction.cpp
rename to src/server/transaction.cpp
index be91b8f..2a9697f 100644
--- a/sdbusplus/server/transaction.cpp
+++ b/src/server/transaction.cpp
@@ -1,4 +1,4 @@
-#include "transaction.hpp"
+#include "sdbusplus/server/transaction.hpp"
 
 namespace sdbusplus
 {