5 files changed, 1 insertions, 51 deletions
diff --git a/host/apps/discover_usrps.cpp b/host/apps/discover_usrps.cpp
index 7e8c21673..5172a4a26 100644
--- a/host/apps/discover_usrps.cpp
+++ b/host/apps/discover_usrps.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd.hpp>
+#include <uhd/device.hpp>
 #include <uhd/props.hpp>
 #include <boost/program_options.hpp>
 #include <boost/format.hpp>
diff --git a/host/include/CMakeLists.txt b/host/include/CMakeLists.txt
index 34b705cab..3f7ca2cb7 100644
--- a/host/include/CMakeLists.txt
+++ b/host/include/CMakeLists.txt
@@ -17,8 +17,3 @@
 
 
 ADD_SUBDIRECTORY(uhd)
-
-INSTALL(FILES
-    uhd.hpp
-    DESTINATION ${HEADER_DIR}
-)
diff --git a/host/include/uhd.hpp b/host/include/uhd.hpp
deleted file mode 100644
index ee8c13dfe..000000000
--- a/host/include/uhd.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_HPP
-#define INCLUDED_UHD_HPP
-
-//include convenience headers
-#include <uhd/device.hpp>
-
-#endif /* INCLUDED_UHD_HPP */
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index edfefa127..97f1ac52e 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -22,7 +22,6 @@ SET(libuhd_sources
     device.cpp
     device_addr.cpp
     gain_handler.cpp
-    uhd.cpp
     wax.cpp
     transport/udp.cpp
     usrp/dboard/basic.cpp
diff --git a/host/lib/uhd.cpp b/host/lib/uhd.cpp
deleted file mode 100644
index 5e250c76f..000000000
--- a/host/lib/uhd.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd.hpp>
-
-//nothing here, just includes the header so the compiler can check