diff --git a/usrp/fpga/Makefile.am b/usrp/fpga/Makefile.am
index 61227f056b..02f971da36 100644
--- a/usrp/fpga/Makefile.am
+++ b/usrp/fpga/Makefile.am

diff --git a/usrp/fpga/gen_makefile_extra.py b/usrp/fpga/gen_makefile_extra.py
index 165a849404..e20a852af5 100755
--- a/usrp/fpga/gen_makefile_extra.py
+++ b/usrp/fpga/gen_makefile_extra.py

diff --git a/usrp/fpga/models/pll.v b/usrp/fpga/models/pll.v
index d87964844c..1d0cc7966b 100644
--- a/usrp/fpga/models/pll.v
+++ b/usrp/fpga/models/pll.v

diff --git a/usrp/fpga/rbf/Makefile.am b/usrp/fpga/rbf/Makefile.am
index dbc2875fc0..ae2cbab813 100644
--- a/usrp/fpga/rbf/Makefile.am
+++ b/usrp/fpga/rbf/Makefile.am

diff --git a/usrp/fpga/sdr_lib/bus_interface.v b/usrp/fpga/sdr_lib/bus_interface.v
index 3f5f748d5a..b326889c03 100755
--- a/usrp/fpga/sdr_lib/bus_interface.v
+++ b/usrp/fpga/sdr_lib/bus_interface.v

diff --git a/usrp/fpga/sdr_lib/cic_decim.v b/usrp/fpga/sdr_lib/cic_decim.v
index 45b863f162..d7e5310b88 100755
--- a/usrp/fpga/sdr_lib/cic_decim.v
+++ b/usrp/fpga/sdr_lib/cic_decim.v

diff --git a/usrp/fpga/sdr_lib/cic_int_shifter.v b/usrp/fpga/sdr_lib/cic_int_shifter.v
index 112d8712bb..fd928373b4 100644
--- a/usrp/fpga/sdr_lib/cic_int_shifter.v
+++ b/usrp/fpga/sdr_lib/cic_int_shifter.v

diff --git a/usrp/fpga/sdr_lib/cic_interp.v b/usrp/fpga/sdr_lib/cic_interp.v
index 43ab17d3b9..0dd621623c 100755
--- a/usrp/fpga/sdr_lib/cic_interp.v
+++ b/usrp/fpga/sdr_lib/cic_interp.v

diff --git a/usrp/fpga/sdr_lib/clk_divider.v b/usrp/fpga/sdr_lib/clk_divider.v
index a687297b47..fdef234d2c 100755
--- a/usrp/fpga/sdr_lib/clk_divider.v
+++ b/usrp/fpga/sdr_lib/clk_divider.v

diff --git a/usrp/fpga/sdr_lib/cordic.v b/usrp/fpga/sdr_lib/cordic.v
index 8c8c0ab0df..fee241f622 100755
--- a/usrp/fpga/sdr_lib/cordic.v
+++ b/usrp/fpga/sdr_lib/cordic.v

diff --git a/usrp/fpga/sdr_lib/cordic_stage.v b/usrp/fpga/sdr_lib/cordic_stage.v
index c9c0ef9a31..0106da5cb1 100755
--- a/usrp/fpga/sdr_lib/cordic_stage.v
+++ b/usrp/fpga/sdr_lib/cordic_stage.v

diff --git a/usrp/fpga/sdr_lib/ddc.v b/usrp/fpga/sdr_lib/ddc.v
index 48bca9a799..0d4da9bbca 100755
--- a/usrp/fpga/sdr_lib/ddc.v
+++ b/usrp/fpga/sdr_lib/ddc.v

diff --git a/usrp/fpga/sdr_lib/dpram.v b/usrp/fpga/sdr_lib/dpram.v
index 5c38decce7..28af90163c 100644
--- a/usrp/fpga/sdr_lib/dpram.v
+++ b/usrp/fpga/sdr_lib/dpram.v

diff --git a/usrp/fpga/sdr_lib/duc.v b/usrp/fpga/sdr_lib/duc.v
index 780fc9f233..6dac95b496 100755
--- a/usrp/fpga/sdr_lib/duc.v
+++ b/usrp/fpga/sdr_lib/duc.v

diff --git a/usrp/fpga/sdr_lib/ext_fifo.v b/usrp/fpga/sdr_lib/ext_fifo.v
index dfe1f2fe7a..41e30de714 100644
--- a/usrp/fpga/sdr_lib/ext_fifo.v
+++ b/usrp/fpga/sdr_lib/ext_fifo.v

diff --git a/usrp/fpga/sdr_lib/gen_sync.v b/usrp/fpga/sdr_lib/gen_sync.v
index d72b39d56e..d6efdba982 100644
--- a/usrp/fpga/sdr_lib/gen_sync.v
+++ b/usrp/fpga/sdr_lib/gen_sync.v

diff --git a/usrp/fpga/sdr_lib/hb/halfband_decim.v b/usrp/fpga/sdr_lib/hb/halfband_decim.v
index 2a05ce52c6..dff4d902c4 100644
--- a/usrp/fpga/sdr_lib/hb/halfband_decim.v
+++ b/usrp/fpga/sdr_lib/hb/halfband_decim.v

diff --git a/usrp/fpga/sdr_lib/io_pins.v b/usrp/fpga/sdr_lib/io_pins.v
index da20b3b035..ad1b7b4a86 100644
--- a/usrp/fpga/sdr_lib/io_pins.v
+++ b/usrp/fpga/sdr_lib/io_pins.v

diff --git a/usrp/fpga/sdr_lib/master_control.v b/usrp/fpga/sdr_lib/master_control.v
index d42817c729..863d44a82f 100644
--- a/usrp/fpga/sdr_lib/master_control.v
+++ b/usrp/fpga/sdr_lib/master_control.v

diff --git a/usrp/fpga/sdr_lib/master_control_multi.v b/usrp/fpga/sdr_lib/master_control_multi.v
index af1e0b1f14..95c4ec17e5 100644
--- a/usrp/fpga/sdr_lib/master_control_multi.v
+++ b/usrp/fpga/sdr_lib/master_control_multi.v

diff --git a/usrp/fpga/sdr_lib/phase_acc.v b/usrp/fpga/sdr_lib/phase_acc.v
index d00716fd0c..f44853d36b 100755
--- a/usrp/fpga/sdr_lib/phase_acc.v
+++ b/usrp/fpga/sdr_lib/phase_acc.v

diff --git a/usrp/fpga/sdr_lib/rx_buffer.v b/usrp/fpga/sdr_lib/rx_buffer.v
index 70c800e3df..ec5b8eefee 100644
--- a/usrp/fpga/sdr_lib/rx_buffer.v
+++ b/usrp/fpga/sdr_lib/rx_buffer.v

diff --git a/usrp/fpga/sdr_lib/rx_chain.v b/usrp/fpga/sdr_lib/rx_chain.v
index 4031e6bfbb..73c0c26eaa 100644
--- a/usrp/fpga/sdr_lib/rx_chain.v
+++ b/usrp/fpga/sdr_lib/rx_chain.v

diff --git a/usrp/fpga/sdr_lib/rx_chain_dual.v b/usrp/fpga/sdr_lib/rx_chain_dual.v
index 698859468d..d9d98f3fcb 100644
--- a/usrp/fpga/sdr_lib/rx_chain_dual.v
+++ b/usrp/fpga/sdr_lib/rx_chain_dual.v

diff --git a/usrp/fpga/sdr_lib/serial_io.v b/usrp/fpga/sdr_lib/serial_io.v
index 1fe43c9590..62f92bed2a 100644
--- a/usrp/fpga/sdr_lib/serial_io.v
+++ b/usrp/fpga/sdr_lib/serial_io.v

diff --git a/usrp/fpga/sdr_lib/sign_extend.v b/usrp/fpga/sdr_lib/sign_extend.v
index 2417909bd7..eae67faf28 100644
--- a/usrp/fpga/sdr_lib/sign_extend.v
+++ b/usrp/fpga/sdr_lib/sign_extend.v

diff --git a/usrp/fpga/sdr_lib/strobe_gen.v b/usrp/fpga/sdr_lib/strobe_gen.v
index 0511b6a1db..a27dda8d3d 100644
--- a/usrp/fpga/sdr_lib/strobe_gen.v
+++ b/usrp/fpga/sdr_lib/strobe_gen.v

diff --git a/usrp/fpga/sdr_lib/tx_buffer.v b/usrp/fpga/sdr_lib/tx_buffer.v
index cae6607b30..ff8fd839dc 100644
--- a/usrp/fpga/sdr_lib/tx_buffer.v
+++ b/usrp/fpga/sdr_lib/tx_buffer.v

diff --git a/usrp/fpga/sdr_lib/tx_chain.v b/usrp/fpga/sdr_lib/tx_chain.v
index 8f0a17a52b..60f8684758 100644
--- a/usrp/fpga/sdr_lib/tx_chain.v
+++ b/usrp/fpga/sdr_lib/tx_chain.v

diff --git a/usrp/fpga/sdr_lib/tx_chain_hb.v b/usrp/fpga/sdr_lib/tx_chain_hb.v
index 6cbe29c000..5594348b4b 100644
--- a/usrp/fpga/sdr_lib/tx_chain_hb.v
+++ b/usrp/fpga/sdr_lib/tx_chain_hb.v

diff --git a/usrp/fpga/tb/cordic_tb.v b/usrp/fpga/tb/cordic_tb.v
index ed85b37b15..946fc776c7 100644
--- a/usrp/fpga/tb/cordic_tb.v
+++ b/usrp/fpga/tb/cordic_tb.v

diff --git a/usrp/fpga/tb/decim_tb.v b/usrp/fpga/tb/decim_tb.v
index ecf20cf4a2..d9a9261254 100644
--- a/usrp/fpga/tb/decim_tb.v
+++ b/usrp/fpga/tb/decim_tb.v

diff --git a/usrp/fpga/tb/fullchip_tb.v b/usrp/fpga/tb/fullchip_tb.v
index c446ff0e18..2406fa777c 100755
--- a/usrp/fpga/tb/fullchip_tb.v
+++ b/usrp/fpga/tb/fullchip_tb.v

diff --git a/usrp/fpga/tb/interp_tb.v b/usrp/fpga/tb/interp_tb.v
index 8a8e89ff97..830fceb312 100755
--- a/usrp/fpga/tb/interp_tb.v
+++ b/usrp/fpga/tb/interp_tb.v

diff --git a/usrp/fpga/tb/justinterp_tb.v b/usrp/fpga/tb/justinterp_tb.v
index ffbd0f178a..f976964883 100644
--- a/usrp/fpga/tb/justinterp_tb.v
+++ b/usrp/fpga/tb/justinterp_tb.v

diff --git a/usrp/fpga/tb/usrp_tasks.v b/usrp/fpga/tb/usrp_tasks.v
index 00f82b9e10..93395f96a0 100755
--- a/usrp/fpga/tb/usrp_tasks.v
+++ b/usrp/fpga/tb/usrp_tasks.v

diff --git a/usrp/fpga/toplevel/mrfm/mrfm.py b/usrp/fpga/toplevel/mrfm/mrfm.py
index 0ce46012dd..414f5817ef 100644
--- a/usrp/fpga/toplevel/mrfm/mrfm.py
+++ b/usrp/fpga/toplevel/mrfm/mrfm.py

diff --git a/usrp/fpga/toplevel/mrfm/mrfm.v b/usrp/fpga/toplevel/mrfm/mrfm.v
index cf9d1119aa..7a0e380590 100644
--- a/usrp/fpga/toplevel/mrfm/mrfm.v
+++ b/usrp/fpga/toplevel/mrfm/mrfm.v

diff --git a/usrp/fpga/toplevel/mrfm/mrfm_fft.py b/usrp/fpga/toplevel/mrfm/mrfm_fft.py
index 343ab01979..9ca8670822 100755
--- a/usrp/fpga/toplevel/mrfm/mrfm_fft.py
+++ b/usrp/fpga/toplevel/mrfm/mrfm_fft.py

diff --git a/usrp/fpga/toplevel/mrfm/shifter.v b/usrp/fpga/toplevel/mrfm/shifter.v
index 08d49db6e4..dd4d4b5278 100644
--- a/usrp/fpga/toplevel/mrfm/shifter.v
+++ b/usrp/fpga/toplevel/mrfm/shifter.v

diff --git a/usrp/fpga/toplevel/sizetest/sizetest.v b/usrp/fpga/toplevel/sizetest/sizetest.v
index cdbd0861ad..5a847b9619 100644
--- a/usrp/fpga/toplevel/sizetest/sizetest.v
+++ b/usrp/fpga/toplevel/sizetest/sizetest.v

diff --git a/usrp/fpga/toplevel/usrp_multi/usrp_multi.v b/usrp/fpga/toplevel/usrp_multi/usrp_multi.v
index b27d3d3a66..e3706d71bb 100644
--- a/usrp/fpga/toplevel/usrp_multi/usrp_multi.v
+++ b/usrp/fpga/toplevel/usrp_multi/usrp_multi.v

diff --git a/usrp/fpga/toplevel/usrp_multi/usrp_multi.vh b/usrp/fpga/toplevel/usrp_multi/usrp_multi.vh
index 2904a93525..fb5dc8d1fa 100644
--- a/usrp/fpga/toplevel/usrp_multi/usrp_multi.vh
+++ b/usrp/fpga/toplevel/usrp_multi/usrp_multi.vh

diff --git a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rx_0tx.vh b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rx_0tx.vh
index 26a41e4d04..3c471463f8 100644
--- a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rx_0tx.vh
+++ b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rx_0tx.vh

diff --git a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_0tx.vh b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_0tx.vh
index 0673d96001..43ed8e638c 100644
--- a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_0tx.vh
+++ b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_0tx.vh

diff --git a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_2tx.vh b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_2tx.vh
index 80c7fbdcb2..9ec92a4ecf 100644
--- a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_2tx.vh
+++ b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_2rxhb_2tx.vh

diff --git a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_4rx_0tx.vh b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_4rx_0tx.vh
index 36176be4a6..42549befd8 100644
--- a/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_4rx_0tx.vh
+++ b/usrp/fpga/toplevel/usrp_multi/usrp_multi_config_4rx_0tx.vh

diff --git a/usrp/fpga/toplevel/usrp_multi/usrp_std.vh b/usrp/fpga/toplevel/usrp_multi/usrp_std.vh
index 189cf14b86..2732a1992d 100644
--- a/usrp/fpga/toplevel/usrp_multi/usrp_std.vh
+++ b/usrp/fpga/toplevel/usrp_multi/usrp_std.vh

diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std.v b/usrp/fpga/toplevel/usrp_std/usrp_std.v
index 9ba8c7c65b..ea556d70f0 100644
--- a/usrp/fpga/toplevel/usrp_std/usrp_std.v
+++ b/usrp/fpga/toplevel/usrp_std/usrp_std.v

diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std.vh b/usrp/fpga/toplevel/usrp_std/usrp_std.vh
index 65aed9b43d..5c239f75ef 100644
--- a/usrp/fpga/toplevel/usrp_std/usrp_std.vh
+++ b/usrp/fpga/toplevel/usrp_std/usrp_std.vh

diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std_config_2rxhb_2tx.vh b/usrp/fpga/toplevel/usrp_std/usrp_std_config_2rxhb_2tx.vh
index 74f1bfd1cf..fc30a54179 100644
--- a/usrp/fpga/toplevel/usrp_std/usrp_std_config_2rxhb_2tx.vh
+++ b/usrp/fpga/toplevel/usrp_std/usrp_std_config_2rxhb_2tx.vh

diff --git a/usrp/fpga/toplevel/usrp_std/usrp_std_config_4rx_0tx.vh b/usrp/fpga/toplevel/usrp_std/usrp_std_config_4rx_0tx.vh
index 0bd188778a..e6a662a431 100644
--- a/usrp/fpga/toplevel/usrp_std/usrp_std_config_4rx_0tx.vh
+++ b/usrp/fpga/toplevel/usrp_std/usrp_std_config_4rx_0tx.vh