9 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index c8a5dd51e..c2dbef89b 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -97,6 +97,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 LIBUHD_APPEND_SOURCES(
     ${CMAKE_CURRENT_BINARY_DIR}/constants.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wax.cpp
 )
diff --git a/host/lib/convert/convert_impl.cpp b/host/lib/convert/convert_impl.cpp
index 6a5a1465d..d43cecfec 100644
--- a/host/lib/convert/convert_impl.cpp
+++ b/host/lib/convert/convert_impl.cpp
@@ -17,7 +17,7 @@
 
 #include <uhd/convert.hpp>
 #include <uhd/utils/static.hpp>
-#include <uhd/utils/exception.hpp>
+#include <uhd/exception.hpp>
 #include <iostream>
 
 using namespace uhd;
diff --git a/host/lib/utils/exception.cpp b/host/lib/exception.cpp
index e66addb0c..2299aa93f 100644
--- a/host/lib/utils/exception.cpp
+++ b/host/lib/exception.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils/assert.hpp>
+#include <uhd/exception.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/format.hpp>
 
diff --git a/host/lib/transport/usb_dummy_impl.cpp b/host/lib/transport/usb_dummy_impl.cpp
index 8a9772e7f..419a52279 100644
--- a/host/lib/transport/usb_dummy_impl.cpp
+++ b/host/lib/transport/usb_dummy_impl.cpp
@@ -18,7 +18,7 @@
 #include <uhd/transport/usb_device_handle.hpp>
 #include <uhd/transport/usb_control.hpp>
 #include <uhd/transport/usb_zero_copy.hpp>
-#include <uhd/utils/exception.hpp>
+#include <uhd/exception.hpp>
 
 using namespace uhd;
 using namespace uhd::transport;
diff --git a/host/lib/types/sensors.cpp b/host/lib/types/sensors.cpp
index 5f7115d70..401c229a3 100644
--- a/host/lib/types/sensors.cpp
+++ b/host/lib/types/sensors.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <uhd/types/sensors.hpp>
-#include <uhd/utils/exception.hpp>
+#include <uhd/exception.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index 890969b5a..0756c7971 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -22,7 +22,7 @@
 #include <boost/cstdint.hpp>
 #include <boost/foreach.hpp>
 #include <iostream>
-#include <uhd/utils/exception.hpp>
+#include <uhd/exception.hpp>
 
 static const bool codec_ctrl_debug = false;
 
diff --git a/host/lib/usrp/usrp2/codec_impl.cpp b/host/lib/usrp/usrp2/codec_impl.cpp
index 09bec6db2..2135b155a 100644
--- a/host/lib/usrp/usrp2/codec_impl.cpp
+++ b/host/lib/usrp/usrp2/codec_impl.cpp
@@ -22,7 +22,7 @@
 #include <boost/bind.hpp>
 #include <boost/assign/list_of.hpp>
 #include <uhd/utils/assert.hpp>
-#include <uhd/utils/exception.hpp>
+#include <uhd/exception.hpp>
 
 using namespace uhd;
 using namespace uhd::usrp;
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 4407a3011..6426ffd3e 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -17,7 +17,7 @@
 
 #include "usrp2_regs.hpp"
 #include "usrp2_iface.hpp"
-#include <uhd/utils/exception.hpp>
+#include <uhd/exception.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/types/dict.hpp>
 #include <boost/thread.hpp>
diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt
index 082553ff9..c0d99b37e 100644
--- a/host/lib/utils/CMakeLists.txt
+++ b/host/lib/utils/CMakeLists.txt
@@ -110,7 +110,6 @@ SET_SOURCE_FILES_PROPERTIES(
 # Append sources
 ########################################################################
 LIBUHD_APPEND_SOURCES(
-    ${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/gain_group.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/images.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/load_modules.cpp