diff --git a/include/meson.build b/include/meson.build
deleted file mode 100644
index c5b83c3..0000000
--- a/include/meson.build
+++ /dev/null
@@ -1,7 +0,0 @@
-conf_data = configuration_data()
-conf_data.set10('VALIDATION_UNSECURE_FEATURE', get_option('validate-unsecure-feature').enabled())
-conf_data.set10('INSECURE_UNRESTRICTED_SENSOR_OVERRIDE', get_option('insecure-sensor-override').enabled())
-configure_file(input: 'dbus-sensor_config.h.in',
-               output: 'dbus-sensor_config.h',
-               configuration: conf_data)
-
diff --git a/meson.build b/meson.build
index 1b355d5..c004542 100644
--- a/meson.build
+++ b/meson.build
@@ -88,65 +88,6 @@
     uring,
 ]
 
-thresholds_a = static_library(
-    'thresholds_a',
-    'src/Thresholds.cpp',
-    dependencies: default_deps,
-    implicit_include_directories: false,
-    include_directories: 'include',
-)
-
-thresholds_dep = declare_dependency(
-    link_with: [ thresholds_a ],
-    dependencies: default_deps,
-)
-
-utils_a = static_library(
-    'utils_a',
-    [
-        'src/FileHandle.cpp',
-        'src/SensorPaths.cpp',
-        'src/Utils.cpp',
-    ],
-    dependencies: default_deps,
-    implicit_include_directories: false,
-    include_directories: 'include',
-)
-
-utils_dep = declare_dependency(
-    link_with: [ utils_a ],
-    dependencies: [ sdbusplus ],
-)
-
-devicemgmt_a = static_library(
-    'devicemgmt_a',
-    [
-        'src/DeviceMgmt.cpp',
-    ],
-    dependencies: default_deps,
-    implicit_include_directories: false,
-    include_directories: 'include',
-)
-
-devicemgmt_dep = declare_dependency(
-    link_with: [ devicemgmt_a ],
-    dependencies: default_deps,
-)
-
-pwmsensor_a = static_library(
-    'pwmsensor_a',
-    'src/PwmSensor.cpp',
-    dependencies: [ default_deps, thresholds_dep ],
-    implicit_include_directories: false,
-    include_directories: 'include',
-)
-
-pwmsensor_dep = declare_dependency(
-    link_with: [ pwmsensor_a ],
-    dependencies: [ default_deps, thresholds_dep ],
-)
-
-subdir('include')
 subdir('service_files')
 subdir('src')
 
diff --git a/src/ADCSensor.cpp b/src/ADCSensor.cpp
index fe2c8a7..2fc35e0 100644
--- a/src/ADCSensor.cpp
+++ b/src/ADCSensor.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
+#include "ADCSensor.hpp"
+
 #include <unistd.h>
 
-#include <ADCSensor.hpp>
 #include <boost/asio/read_until.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
diff --git a/include/ADCSensor.hpp b/src/ADCSensor.hpp
similarity index 97%
rename from include/ADCSensor.hpp
rename to src/ADCSensor.hpp
index 5c4b8ed..72fcd90 100644
--- a/include/ADCSensor.hpp
+++ b/src/ADCSensor.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <Thresholds.hpp>
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <boost/asio/streambuf.hpp>
 #include <gpiod.hpp>
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 #include <memory>
 #include <optional>
diff --git a/src/ADCSensorMain.cpp b/src/ADCSensorMain.cpp
index 3cbb5f6..f184d23 100644
--- a/src/ADCSensorMain.cpp
+++ b/src/ADCSensorMain.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
-#include <ADCSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
+#include "ADCSensor.hpp"
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/ChassisIntrusionSensor.cpp b/src/ChassisIntrusionSensor.cpp
index 2bb04ce..f7e7783 100644
--- a/src/ChassisIntrusionSensor.cpp
+++ b/src/ChassisIntrusionSensor.cpp
@@ -14,11 +14,12 @@
 // limitations under the License.
 */
 
+#include "ChassisIntrusionSensor.hpp"
+
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <ChassisIntrusionSensor.hpp>
 #include <boost/asio/io_service.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 
diff --git a/include/ChassisIntrusionSensor.hpp b/src/ChassisIntrusionSensor.hpp
similarity index 100%
rename from include/ChassisIntrusionSensor.hpp
rename to src/ChassisIntrusionSensor.hpp
diff --git a/src/DeviceMgmt.cpp b/src/DeviceMgmt.cpp
index f137908..ffc0376 100644
--- a/src/DeviceMgmt.cpp
+++ b/src/DeviceMgmt.cpp
@@ -1,4 +1,4 @@
-#include <DeviceMgmt.hpp>
+#include "DeviceMgmt.hpp"
 
 #include <filesystem>
 #include <fstream>
diff --git a/include/DeviceMgmt.hpp b/src/DeviceMgmt.hpp
similarity index 97%
rename from include/DeviceMgmt.hpp
rename to src/DeviceMgmt.hpp
index 4a5b7a1..07b28b5 100644
--- a/include/DeviceMgmt.hpp
+++ b/src/DeviceMgmt.hpp
@@ -1,5 +1,7 @@
 #pragma once
-#include <Utils.hpp>
+
+#include "Utils.hpp"
+
 #include <boost/container/flat_map.hpp>
 
 #include <functional>
diff --git a/src/ExitAirTempSensor.cpp b/src/ExitAirTempSensor.cpp
index 7f947e5..d126def 100644
--- a/src/ExitAirTempSensor.cpp
+++ b/src/ExitAirTempSensor.cpp
@@ -14,9 +14,11 @@
 // limitations under the License.
 */
 
-#include <ExitAirTempSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
+#include "ExitAirTempSensor.hpp"
+
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <sdbusplus/asio/connection.hpp>
diff --git a/include/ExitAirTempSensor.hpp b/src/ExitAirTempSensor.hpp
similarity index 100%
rename from include/ExitAirTempSensor.hpp
rename to src/ExitAirTempSensor.hpp
diff --git a/include/ExternalSensor.hpp b/src/ExternalSensor.hpp
similarity index 100%
rename from include/ExternalSensor.hpp
rename to src/ExternalSensor.hpp
diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index 7260131..2c51396 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -14,10 +14,11 @@
 // limitations under the License.
 */
 
-#include <PwmSensor.hpp>
-#include <TachSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
+#include "PwmSensor.hpp"
+#include "TachSensor.hpp"
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/FileHandle.cpp b/src/FileHandle.cpp
index af32192..227ce23 100644
--- a/src/FileHandle.cpp
+++ b/src/FileHandle.cpp
@@ -1,8 +1,8 @@
+#include "FileHandle.hpp"
+
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <FileHandle.hpp>
-
 #include <iostream>
 #include <stdexcept>
 
diff --git a/include/FileHandle.hpp b/src/FileHandle.hpp
similarity index 100%
rename from include/FileHandle.hpp
rename to src/FileHandle.hpp
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index e777c42..7ac03a3 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
-#include <DeviceMgmt.hpp>
-#include <HwmonTempSensor.hpp>
-#include <Utils.hpp>
+#include "DeviceMgmt.hpp"
+#include "HwmonTempSensor.hpp"
+#include "Utils.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/HwmonTempSensor.cpp b/src/HwmonTempSensor.cpp
index 144f9d9..b4042ff 100644
--- a/src/HwmonTempSensor.cpp
+++ b/src/HwmonTempSensor.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
+#include "HwmonTempSensor.hpp"
+
 #include <unistd.h>
 
-#include <HwmonTempSensor.hpp>
 #include <boost/asio/read_until.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
diff --git a/include/HwmonTempSensor.hpp b/src/HwmonTempSensor.hpp
similarity index 95%
rename from include/HwmonTempSensor.hpp
rename to src/HwmonTempSensor.hpp
index 40be3bb..27ffccd 100644
--- a/include/HwmonTempSensor.hpp
+++ b/src/HwmonTempSensor.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <DeviceMgmt.hpp>
-#include <Thresholds.hpp>
+#include "DeviceMgmt.hpp"
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <boost/asio/random_access_file.hpp>
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 #include <string>
 #include <vector>
diff --git a/src/IntelCPUSensor.cpp b/src/IntelCPUSensor.cpp
index 3410574..2995d60 100644
--- a/src/IntelCPUSensor.cpp
+++ b/src/IntelCPUSensor.cpp
@@ -14,10 +14,12 @@
 // limitations under the License.
 */
 
+#include "IntelCPUSensor.hpp"
+
+#include "Utils.hpp"
+
 #include <unistd.h>
 
-#include <IntelCPUSensor.hpp>
-#include <Utils.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/asio/read_until.hpp>
 #include <sdbusplus/asio/connection.hpp>
diff --git a/include/IntelCPUSensor.hpp b/src/IntelCPUSensor.hpp
similarity index 98%
rename from include/IntelCPUSensor.hpp
rename to src/IntelCPUSensor.hpp
index 5f9124e..399e765 100644
--- a/include/IntelCPUSensor.hpp
+++ b/src/IntelCPUSensor.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <Thresholds.hpp>
-#include <Utils.hpp>
+#include "Thresholds.hpp"
+#include "Utils.hpp"
+
 #include <boost/asio/streambuf.hpp>
 #include <boost/container/flat_map.hpp>
 #include <gpiod.hpp>
diff --git a/src/IntelCPUSensorMain.cpp b/src/IntelCPUSensorMain.cpp
index aa06628..ecc36dc 100644
--- a/src/IntelCPUSensorMain.cpp
+++ b/src/IntelCPUSensorMain.cpp
@@ -14,11 +14,12 @@
 // limitations under the License.
 */
 
+#include "IntelCPUSensor.hpp"
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <fcntl.h>
 
-#include <IntelCPUSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/IntrusionSensorMain.cpp b/src/IntrusionSensorMain.cpp
index 3b63b6e..fb8510c 100644
--- a/src/IntrusionSensorMain.cpp
+++ b/src/IntrusionSensorMain.cpp
@@ -14,8 +14,9 @@
 // limitations under the License.
 */
 
-#include <ChassisIntrusionSensor.hpp>
-#include <Utils.hpp>
+#include "ChassisIntrusionSensor.hpp"
+#include "Utils.hpp"
+
 #include <boost/asio/io_service.hpp>
 #include <boost/container/flat_map.hpp>
 #include <phosphor-logging/lg2.hpp>
diff --git a/src/IpmbSDRSensor.cpp b/src/IpmbSDRSensor.cpp
index 1470340..73cfb43 100644
--- a/src/IpmbSDRSensor.cpp
+++ b/src/IpmbSDRSensor.cpp
@@ -1,4 +1,4 @@
-#include <IpmbSDRSensor.hpp>
+#include "IpmbSDRSensor.hpp"
 
 const constexpr char* ipmbService = "xyz.openbmc_project.Ipmi.Channel.Ipmb";
 const constexpr char* ipmbDbusPath = "/xyz/openbmc_project/Ipmi/Channel/Ipmb";
diff --git a/include/IpmbSDRSensor.hpp b/src/IpmbSDRSensor.hpp
similarity index 100%
rename from include/IpmbSDRSensor.hpp
rename to src/IpmbSDRSensor.hpp
diff --git a/src/IpmbSensor.cpp b/src/IpmbSensor.cpp
index ba39214..9bc884e 100644
--- a/src/IpmbSensor.cpp
+++ b/src/IpmbSensor.cpp
@@ -14,10 +14,12 @@
 // limitations under the License.
 */
 
-#include <IpmbSDRSensor.hpp>
-#include <IpmbSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
+#include "IpmbSensor.hpp"
+
+#include "IpmbSDRSensor.hpp"
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <boost/container/flat_map.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
diff --git a/include/IpmbSensor.hpp b/src/IpmbSensor.hpp
similarity index 100%
rename from include/IpmbSensor.hpp
rename to src/IpmbSensor.hpp
diff --git a/src/MCUTempSensor.cpp b/src/MCUTempSensor.cpp
index f3ada3c..a5d964d 100644
--- a/src/MCUTempSensor.cpp
+++ b/src/MCUTempSensor.cpp
@@ -13,9 +13,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-#include <MCUTempSensor.hpp>
-#include <Utils.hpp>
-#include <VariantVisitors.hpp>
+
+#include "MCUTempSensor.hpp"
+
+#include "Utils.hpp"
+#include "VariantVisitors.hpp"
+
 #include <boost/container/flat_map.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
diff --git a/include/MCUTempSensor.hpp b/src/MCUTempSensor.hpp
similarity index 100%
rename from include/MCUTempSensor.hpp
rename to src/MCUTempSensor.hpp
diff --git a/include/NVMeBasicContext.hpp b/src/NVMeBasicContext.hpp
similarity index 100%
rename from include/NVMeBasicContext.hpp
rename to src/NVMeBasicContext.hpp
diff --git a/include/NVMeContext.hpp b/src/NVMeContext.hpp
similarity index 100%
rename from include/NVMeContext.hpp
rename to src/NVMeContext.hpp
diff --git a/src/NVMeSensor.cpp b/src/NVMeSensor.cpp
index d32d166..4301158 100644
--- a/src/NVMeSensor.cpp
+++ b/src/NVMeSensor.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 */
 
-#include <NVMeSensor.hpp>
+#include "NVMeSensor.hpp"
 
 #include <iostream>
 
diff --git a/include/NVMeSensor.hpp b/src/NVMeSensor.hpp
similarity index 100%
rename from include/NVMeSensor.hpp
rename to src/NVMeSensor.hpp
diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp
index 96a3017..9ad0706 100644
--- a/src/NVMeSensorMain.cpp
+++ b/src/NVMeSensorMain.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
-#include <NVMeBasicContext.hpp>
-#include <NVMeContext.hpp>
-#include <NVMeSensor.hpp>
+#include "NVMeBasicContext.hpp"
+#include "NVMeContext.hpp"
+#include "NVMeSensor.hpp"
+
 #include <boost/asio/steady_timer.hpp>
 
 #include <optional>
diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
index 27bb8b1..ce8301e 100644
--- a/src/PSUEvent.cpp
+++ b/src/PSUEvent.cpp
@@ -14,8 +14,10 @@
 // limitations under the License.
 */
 
-#include <PSUEvent.hpp>
-#include <SensorPaths.hpp>
+#include "PSUEvent.hpp"
+
+#include "SensorPaths.hpp"
+
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/read_until.hpp>
 #include <boost/container/flat_map.hpp>
diff --git a/include/PSUEvent.hpp b/src/PSUEvent.hpp
similarity index 98%
rename from include/PSUEvent.hpp
rename to src/PSUEvent.hpp
index 25a7ebc..12fc2ef 100644
--- a/include/PSUEvent.hpp
+++ b/src/PSUEvent.hpp
@@ -16,7 +16,8 @@
 
 #pragma once
 
-#include <Utils.hpp>
+#include "Utils.hpp"
+
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/random_access_file.hpp>
 #include <boost/asio/steady_timer.hpp>
diff --git a/src/PSUSensor.cpp b/src/PSUSensor.cpp
index 6e2934f..986fe59 100644
--- a/src/PSUSensor.cpp
+++ b/src/PSUSensor.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
+#include "PSUSensor.hpp"
+
 #include <unistd.h>
 
-#include <PSUSensor.hpp>
 #include <boost/asio/random_access_file.hpp>
 #include <boost/asio/read_until.hpp>
 #include <sdbusplus/asio/connection.hpp>
diff --git a/include/PSUSensor.hpp b/src/PSUSensor.hpp
similarity index 96%
rename from include/PSUSensor.hpp
rename to src/PSUSensor.hpp
index 63699ea..379b9d9 100644
--- a/include/PSUSensor.hpp
+++ b/src/PSUSensor.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <PwmSensor.hpp>
-#include <Thresholds.hpp>
+#include "PwmSensor.hpp"
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <boost/asio/random_access_file.hpp>
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 #include <array>
 #include <memory>
diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index 38f92a7..ad01a3e 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -14,9 +14,10 @@
 // limitations under the License.
 */
 
-#include <PSUEvent.hpp>
-#include <PSUSensor.hpp>
-#include <Utils.hpp>
+#include "PSUEvent.hpp"
+#include "PSUSensor.hpp"
+#include "Utils.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
diff --git a/src/PwmSensor.cpp b/src/PwmSensor.cpp
index 0ee8c88..ad54dfe 100644
--- a/src/PwmSensor.cpp
+++ b/src/PwmSensor.cpp
@@ -13,8 +13,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-#include <PwmSensor.hpp>
-#include <Utils.hpp>
+
+#include "PwmSensor.hpp"
+
+#include "Utils.hpp"
+
 #include <sdbusplus/asio/object_server.hpp>
 
 #include <fstream>
diff --git a/include/PwmSensor.hpp b/src/PwmSensor.hpp
similarity index 97%
rename from include/PwmSensor.hpp
rename to src/PwmSensor.hpp
index 2c8ebe6..f70079b 100644
--- a/include/PwmSensor.hpp
+++ b/src/PwmSensor.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
+#include "sensor.hpp"
+
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 #include <memory>
 #include <string>
diff --git a/src/SensorPaths.cpp b/src/SensorPaths.cpp
index 7eb8d09..bd8f173 100644
--- a/src/SensorPaths.cpp
+++ b/src/SensorPaths.cpp
@@ -1,4 +1,4 @@
-#include <SensorPaths.hpp>
+#include "SensorPaths.hpp"
 
 #include <cstring>
 #include <regex>
diff --git a/include/SensorPaths.hpp b/src/SensorPaths.hpp
similarity index 100%
rename from include/SensorPaths.hpp
rename to src/SensorPaths.hpp
diff --git a/src/TachSensor.cpp b/src/TachSensor.cpp
index 35185cd..9a1ff7c 100644
--- a/src/TachSensor.cpp
+++ b/src/TachSensor.cpp
@@ -14,10 +14,12 @@
 // limitations under the License.
 */
 
+#include "TachSensor.hpp"
+
+#include "Utils.hpp"
+
 #include <unistd.h>
 
-#include <TachSensor.hpp>
-#include <Utils.hpp>
 #include <boost/asio/read_until.hpp>
 #include <gpiod.hpp>
 #include <sdbusplus/asio/connection.hpp>
diff --git a/include/TachSensor.hpp b/src/TachSensor.hpp
similarity index 98%
rename from include/TachSensor.hpp
rename to src/TachSensor.hpp
index c360395..92c5202 100644
--- a/include/TachSensor.hpp
+++ b/src/TachSensor.hpp
@@ -1,12 +1,14 @@
 #pragma once
-#include <Thresholds.hpp>
+
+#include "Thresholds.hpp"
+#include "sensor.hpp"
+
 #include <boost/asio/random_access_file.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <gpiod.hpp>
 #include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/asio/object_server.hpp>
-#include <sensor.hpp>
 
 #include <memory>
 #include <optional>
diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index ee0456d..aa73063 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -1,8 +1,10 @@
-#include <Thresholds.hpp>
-#include <VariantVisitors.hpp>
+#include "Thresholds.hpp"
+
+#include "VariantVisitors.hpp"
+#include "sensor.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/container/flat_map.hpp>
-#include <sensor.hpp>
 
 #include <array>
 #include <cmath>
diff --git a/include/Thresholds.hpp b/src/Thresholds.hpp
similarity index 98%
rename from include/Thresholds.hpp
rename to src/Thresholds.hpp
index 0b17c62..cd89efc 100644
--- a/include/Thresholds.hpp
+++ b/src/Thresholds.hpp
@@ -1,5 +1,7 @@
 #pragma once
-#include <Utils.hpp>
+
+#include "Utils.hpp"
+
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <nlohmann/json.hpp>
diff --git a/src/Utils.cpp b/src/Utils.cpp
index eb4620d..56428bc 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -14,10 +14,12 @@
 // limitations under the License.
 */
 
+#include "Utils.hpp"
+
 #include "dbus-sensor_config.h"
 
-#include <DeviceMgmt.hpp>
-#include <Utils.hpp>
+#include "DeviceMgmt.hpp"
+
 #include <boost/container/flat_map.hpp>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
diff --git a/include/Utils.hpp b/src/Utils.hpp
similarity index 99%
rename from include/Utils.hpp
rename to src/Utils.hpp
index 91b2998..444030c 100644
--- a/include/Utils.hpp
+++ b/src/Utils.hpp
@@ -1,5 +1,7 @@
 #pragma once
-#include <VariantVisitors.hpp>
+
+#include "VariantVisitors.hpp"
+
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/asio/steady_timer.hpp>
 #include <boost/container/flat_map.hpp>
diff --git a/include/VariantVisitors.hpp b/src/VariantVisitors.hpp
similarity index 100%
rename from include/VariantVisitors.hpp
rename to src/VariantVisitors.hpp
diff --git a/include/dbus-sensor_config.h.in b/src/dbus-sensor_config.h.in
similarity index 100%
rename from include/dbus-sensor_config.h.in
rename to src/dbus-sensor_config.h.in
diff --git a/src/meson.build b/src/meson.build
index 9d44db3..6f47fb0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,3 +1,60 @@
+conf_data = configuration_data()
+conf_data.set10('VALIDATION_UNSECURE_FEATURE', get_option('validate-unsecure-feature').enabled())
+conf_data.set10('INSECURE_UNRESTRICTED_SENSOR_OVERRIDE', get_option('insecure-sensor-override').enabled())
+configure_file(input: 'dbus-sensor_config.h.in',
+               output: 'dbus-sensor_config.h',
+               configuration: conf_data)
+
+thresholds_a = static_library(
+    'thresholds_a',
+    'Thresholds.cpp',
+    dependencies: default_deps,
+)
+
+thresholds_dep = declare_dependency(
+    link_with: [ thresholds_a ],
+    dependencies: default_deps,
+)
+
+utils_a = static_library(
+    'utils_a',
+    [
+        'FileHandle.cpp',
+        'SensorPaths.cpp',
+        'Utils.cpp',
+    ],
+    dependencies: default_deps,
+)
+
+utils_dep = declare_dependency(
+    link_with: [ utils_a ],
+    dependencies: [ sdbusplus ],
+)
+
+devicemgmt_a = static_library(
+    'devicemgmt_a',
+    [
+        'DeviceMgmt.cpp',
+    ],
+    dependencies: default_deps,
+)
+
+devicemgmt_dep = declare_dependency(
+    link_with: [ devicemgmt_a ],
+    dependencies: default_deps,
+)
+
+pwmsensor_a = static_library(
+    'pwmsensor_a',
+    'PwmSensor.cpp',
+    dependencies: [ default_deps, thresholds_dep ],
+)
+
+pwmsensor_dep = declare_dependency(
+    link_with: [ pwmsensor_a ],
+    dependencies: [ default_deps, thresholds_dep ],
+)
+
 peci_incdirs = []
 if not meson.get_compiler('cpp').has_header('linux/peci-ioctl.h')
     peci_incdirs = ['../include']
@@ -15,8 +72,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -32,10 +87,7 @@
             thresholds_dep,
             utils_dep,
         ],
-        implicit_include_directories: false,
-        include_directories: [
-            '../include'
-        ] + peci_incdirs,
+        include_directories: peci_incdirs,
         install: true,
     )
 endif
@@ -50,8 +102,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -69,8 +119,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -87,8 +135,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -105,8 +151,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -122,8 +166,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -139,8 +181,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -156,8 +196,6 @@
         sources: nvme_srcs,
         dependencies: nvme_deps,
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -175,8 +213,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
@@ -192,8 +228,6 @@
             utils_dep,
         ],
         cpp_args: uring_args,
-        implicit_include_directories: false,
-        include_directories: '../include',
         install: true,
     )
 endif
diff --git a/include/sensor.hpp b/src/sensor.hpp
similarity index 99%
rename from include/sensor.hpp
rename to src/sensor.hpp
index f278212..d2ba8af 100644
--- a/include/sensor.hpp
+++ b/src/sensor.hpp
@@ -1,9 +1,11 @@
 #pragma once
+
 #include "dbus-sensor_config.h"
 
-#include <SensorPaths.hpp>
-#include <Thresholds.hpp>
-#include <Utils.hpp>
+#include "SensorPaths.hpp"
+#include "Thresholds.hpp"
+#include "Utils.hpp"
+
 #include <sdbusplus/asio/object_server.hpp>
 #include <sdbusplus/exception.hpp>
 
diff --git a/tests/meson.build b/tests/meson.build
index 51d5d60..008ba19 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -34,7 +34,7 @@
         'test_HwmonTempSensor.cpp',
         dependencies: ut_deps_list,
         implicit_include_directories: false,
-        include_directories: '../include',
+        include_directories: '../src',
     )
 )
 
@@ -45,7 +45,7 @@
         'test_TachSensor.cpp',
         dependencies: ut_deps_list,
         implicit_include_directories: false,
-        include_directories: '../include',
+        include_directories: '../src',
     )
 )
 endif
@@ -58,6 +58,6 @@
         '../src/Utils.cpp',
         dependencies: ut_deps_list,
         implicit_include_directories: false,
-        include_directories: '../include',
+        include_directories: '../src',
     )
 )
diff --git a/tests/test_HwmonTempSensor.cpp b/tests/test_HwmonTempSensor.cpp
index dc354a8..6ae65ce 100644
--- a/tests/test_HwmonTempSensor.cpp
+++ b/tests/test_HwmonTempSensor.cpp
@@ -1,5 +1,6 @@
-#include <HwmonTempSensor.hpp>
-#include <dbus/connection.hpp>
+#include "HwmonTempSensor.hpp"
+#include "dbus/connection.hpp"
+
 #include <nlohmann/json.hpp>
 
 #include <fstream>
diff --git a/tests/test_TachSensor.cpp b/tests/test_TachSensor.cpp
index 6ecb79d..01397d3 100644
--- a/tests/test_TachSensor.cpp
+++ b/tests/test_TachSensor.cpp
@@ -1,5 +1,6 @@
-#include <TachSensor.hpp>
-#include <Thresholds.hpp>
+#include "TachSensor.hpp"
+#include "Thresholds.hpp"
+
 #include <dbus/connection.hpp>
 #include <nlohmann/json.hpp>
 
diff --git a/tests/test_Utils.cpp b/tests/test_Utils.cpp
index e12bc16..2be1027 100644
--- a/tests/test_Utils.cpp
+++ b/tests/test_Utils.cpp
@@ -1,4 +1,4 @@
-#include <Utils.hpp>
+#include "Utils.hpp"
 
 #include <array>
 #include <filesystem>