diff --git a/CMakeLists.txt b/CMakeLists.txt
index d00d64a..4e695a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lstdc++fs")
 set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
+option (YOCTO "Enable Building in Yocto" OFF)
 option (HUNTER_ENABLED "Enable hunter package pulling" OFF)
 include ("cmake/HunterGate.cmake")
 
@@ -27,8 +28,7 @@
 set (EXTERNAL_PACKAGES Boost sdbusplus-project nlohmann-json)
 set (SENSOR_LINK_LIBS -lsystemd stdc++fs sdbusplus)
 
-option (EXTERNAL_PROJECT "Enable Cloning External Projects" OFF)
-if (EXTERNAL_PROJECT)
+if (NOT YOCTO)
     option (ENABLE_TEST "Enable Google Test" OFF)
     include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include/non-yocto)
 
@@ -115,7 +115,7 @@
 add_dependencies (adcsensor sdbusplus)
 target_link_libraries (adcsensor ${SENSOR_LINK_LIBS})
 
-if (EXTERNAL_PROJECT)
+if (NOT YOCTO)
     add_dependencies (fansensor ${EXTERNAL_PACKAGES})
     add_dependencies (hwmontempsensor ${EXTERNAL_PACKAGES})
     add_dependencies (adcsensor ${EXTERNAL_PACKAGES})
diff --git a/include/non-yocto/linux/peci-ioctl.h b/include/non-yocto/linux/peci-ioctl.h
index 9cddb8b..d9498a1 100644
--- a/include/non-yocto/linux/peci-ioctl.h
+++ b/include/non-yocto/linux/peci-ioctl.h
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /* Copyright (c) 2018 Intel Corporation */
 
+// clang-format off
+
 #ifndef __PECI_IOCTL_H
 #define __PECI_IOCTL_H
 
@@ -245,3 +247,4 @@
 	      struct peci_crashdump_get_frame_msg)
 
 #endif /* __PECI_IOCTL_H */
+// clang-format on
diff --git a/tests/test_HwmonTempSensor.cpp b/tests/test_HwmonTempSensor.cpp
index a618720..f8efcc4 100644
--- a/tests/test_HwmonTempSensor.cpp
+++ b/tests/test_HwmonTempSensor.cpp
@@ -1,7 +1,8 @@
 #include <HwmonTempSensor.hpp>
 #include <dbus/connection.hpp>
-#include <nlohmann/json.hpp>
 #include <fstream>
+#include <nlohmann/json.hpp>
+
 #include "gtest/gtest.h"
 
 TEST(HwmonTempSensor, TestTMP75)
diff --git a/tests/test_TachSensor.cpp b/tests/test_TachSensor.cpp
index 059b18b..3e95aba 100644
--- a/tests/test_TachSensor.cpp
+++ b/tests/test_TachSensor.cpp
@@ -1,8 +1,9 @@
 #include <TachSensor.hpp>
 #include <Thresholds.hpp>
 #include <dbus/connection.hpp>
-#include <nlohmann/json.hpp>
 #include <fstream>
+#include <nlohmann/json.hpp>
+
 #include "gtest/gtest.h"
 
 TEST(TachSensor, TestTachSensor)