[fru-device] remove dependency on i2c-dev-user

This package was deleted in the i2c-tools project, stop
using it. Also update header order to new clang-format

Tested-by: Verified still builds in and out of tree

Change-Id: Ic72ff7d67e717bdf4e12b53e2f52b582fabe7404
Signed-off-by: James Feist <james.feist@linux.intel.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d61d12c..b1b2314 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,8 +63,6 @@
     include_directories (${CMAKE_BINARY_DIR}/phosphor-dbus-interfaces/include)
     link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
 
-    include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include/non-yocto)
-
     include_directories (${CMAKE_BINARY_DIR}/boost-src)
     set (CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/boost-src ${CMAKE_PREFIX_PATH})
     option (ENABLE_TEST "Enable Google Test" OFF)
@@ -93,6 +91,7 @@
 
 target_link_libraries (fru-device pthread)
 target_link_libraries (fru-device stdc++fs)
+target_link_libraries (fru-device i2c)
 target_link_libraries (fru-device ${Boost_LIBRARIES})
 target_link_libraries (fru-device -lsystemd)
 target_link_libraries (fru-device sdbusplus)