3 files changed, 9 insertions, 3 deletions
diff --git a/host/lib/usrp/dboard/db_rfx.cpp b/host/lib/usrp/dboard/db_rfx.cpp
index bbc9716b1..3b3b96fad 100644
--- a/host/lib/usrp/dboard/db_rfx.cpp
+++ b/host/lib/usrp/dboard/db_rfx.cpp
@@ -258,8 +258,8 @@ double rfx_xcvr::set_lo_freq(
         (8, adf4360_regs_t::BAND_SELECT_CLOCK_DIV_8)
     ;
 
-    double actual_freq, ref_freq = this->get_iface()->get_clock_rate(unit);
-    int R, BS, P, B, A;
+    double actual_freq=0, ref_freq = this->get_iface()->get_clock_rate(unit);
+    int R=0, BS=0, P=0, B=0, A=0;
 
     /*
      * The goal here to to loop though possible R dividers,
diff --git a/host/lib/usrp/dboard/db_wbx.cpp b/host/lib/usrp/dboard/db_wbx.cpp
index 2a8a3a9f2..81edf7a11 100644
--- a/host/lib/usrp/dboard/db_wbx.cpp
+++ b/host/lib/usrp/dboard/db_wbx.cpp
@@ -303,7 +303,7 @@ double wbx_xcvr::set_lo_freq(
 
     double actual_freq, pfd_freq;
     double ref_freq = this->get_iface()->get_clock_rate(unit);
-    int R, BS, N, FRAC, MOD;
+    int R=0, BS=0, N=0, FRAC=0, MOD=0;
     int RFdiv = 1;
     adf4350_regs_t::reference_divide_by_2_t T     = adf4350_regs_t::REFERENCE_DIVIDE_BY_2_DISABLED;
     adf4350_regs_t::reference_doubler_t     D     = adf4350_regs_t::REFERENCE_DOUBLER_DISABLED;    
diff --git a/host/lib/usrp/usrp2/CMakeLists.txt b/host/lib/usrp/usrp2/CMakeLists.txt
index fee67dff9..99d0b8bdd 100644
--- a/host/lib/usrp/usrp2/CMakeLists.txt
+++ b/host/lib/usrp/usrp2/CMakeLists.txt
@@ -19,13 +19,19 @@
 
 LIBUHD_APPEND_SOURCES(
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.cpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/clock_ctrl.hpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.cpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/codec_ctrl.hpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_impl.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dboard_iface.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/dsp_impl.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/io_impl.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/mboard_impl.cpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.cpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/serdes_ctrl.hpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.cpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_iface.hpp
     ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.cpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_impl.hpp
+    ${CMAKE_SOURCE_DIR}/lib/usrp/usrp2/usrp2_regs.hpp
 )