diff --git a/radio/blocks/sources/uhd.lua b/radio/blocks/sources/uhd.lua
index 0a95b015e..870064371 100644
--- a/radio/blocks/sources/uhd.lua
+++ b/radio/blocks/sources/uhd.lua
@@ -67,6 +67,8 @@ if not package.loaded['radio.blocks.sinks.uhd'] then
         typedef struct uhd_tx_streamer* uhd_tx_streamer_handle;
         typedef struct uhd_rx_metadata_t* uhd_rx_metadata_handle;
         typedef struct uhd_tx_metadata_t* uhd_tx_metadata_handle;
+        typedef struct uhd_meta_range_t* uhd_meta_range_handle;
+        typedef struct uhd_string_vector_t* uhd_string_vector_handle;
 
         /* Structures and enums */
         typedef enum {
@@ -147,12 +149,6 @@ if not package.loaded['radio.blocks.sinks.uhd'] then
             UHD_ERROR_UNKNOWN = 100
         } uhd_error;
 
-        struct uhd_meta_range_t;
-        typedef struct uhd_meta_range_t* uhd_meta_range_handle;
-
-        struct uhd_string_vector_t;
-        typedef struct uhd_string_vector_t* uhd_string_vector_handle;
-
         /* Functions */
         uhd_error uhd_usrp_make(uhd_usrp_handle *h, const char *args);
         uhd_error uhd_usrp_free(uhd_usrp_handle *h);