diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b026e..1b49606 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,25 +9,22 @@
 # disable now to wa boost bug chriskohlhoff/asio#533
 # set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 
-include_directories (
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/phosphor-dbus-interfaces
-)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
 link_directories (${DBUSINTERFACE_LIBRARIES})
 
 find_package (PkgConfig REQUIRED)
+
 pkg_check_modules (SYSTEMD libsystemd REQUIRED)
 include_directories (${SYSTEMD_INCLUDE_DIRS})
 link_directories (${SYSTEMD_LIBRARY_DIRS})
 
 # import sdbusplus
-find_package (PkgConfig REQUIRED)
 pkg_check_modules (SDBUSPLUSPLUS sdbusplus REQUIRED)
 include_directories (${SDBUSPLUSPLUS_INCLUDE_DIRS})
 link_directories (${SDBUSPLUSPLUS_LIBRARY_DIRS})
+find_program (SDBUSPLUSPLUS sdbus++)
 
 # phosphor-dbus-interfaces
-find_package (PkgConfig REQUIRED)
 pkg_check_modules (DBUSINTERFACE phosphor-dbus-interfaces REQUIRED)
 include_directories (${DBUSINTERFACE_INCLUDE_DIRS})
 link_directories (${DBUSINTERFACE_LIBRARY_DIRS})
@@ -47,19 +44,13 @@
 
 include_directories (${CMAKE_CURRENT_BINARY_DIR})
 
-find_package (PkgConfig REQUIRED)
-pkg_check_modules (SDBUSPLUSPLUS sdbusplus REQUIRED)
-include_directories (${SDBUSPLUSPLUS_INCLUDE_DIRS})
-link_directories (${SDBUSPLUSPLUS_LIBRARY_DIRS})
-find_program (SDBUSPLUSPLUS sdbus++)
-
 add_executable (smbiosmdrv2app ${SRC_FILES})
 target_link_libraries (smbiosmdrv2app ${SYSTEMD_LIBRARIES})
 target_link_libraries (smbiosmdrv2app ${DBUSINTERFACE_LIBRARIES})
 target_link_libraries (smbiosmdrv2app ${SDBUSPLUSPLUS_LIBRARIES})
 target_link_libraries (smbiosmdrv2app phosphor_logging)
 
-add_executable (cpuinfoapp src/cpuinfo_main.cpp)
+add_executable (cpuinfoapp src/cpuinfo_main.cpp src/speed_select.cpp)
 target_link_libraries (cpuinfoapp ${SYSTEMD_LIBRARIES})
 target_link_libraries (cpuinfoapp ${DBUSINTERFACE_LIBRARIES})
 target_link_libraries (cpuinfoapp ${SDBUSPLUSPLUS_LIBRARIES})