diff --git a/library/axi_clkgen/axi_clkgen_ip.tcl b/library/axi_clkgen/axi_clkgen_ip.tcl
index b136a9799..7f0296682 100644
--- a/library/axi_clkgen/axi_clkgen_ip.tcl
+++ b/library/axi_clkgen/axi_clkgen_ip.tcl
@@ -1,14 +1,15 @@
 # ip
 
-source ../scripts/adi_ip.tcl
+source ../scripts/adi_env.tcl
+source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
 adi_ip_create axi_clkgen
 adi_ip_files axi_clkgen [list \
-  "../common/ad_rst.v" \
-  "../common/ad_mmcm_drp.v" \
-  "../common/up_axi.v" \
-  "../common/up_drp_cntrl.v" \
-  "../common/up_clkgen.v" \
+  "$ad_hdl_dir/library/common/ad_rst.v" \
+  "$ad_hdl_dir/library/common/ad_mmcm_drp.v" \
+  "$ad_hdl_dir/library/common/up_axi.v" \
+  "$ad_hdl_dir/library/common/up_drp_cntrl.v" \
+  "$ad_hdl_dir/library/common/up_clkgen.v" \
   "axi_clkgen.v" ]
 
 adi_ip_properties axi_clkgen
diff --git a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
index 906f43605..505787ea9 100644
--- a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
+++ b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
@@ -1,21 +1,22 @@
 # ip
 
-source ../scripts/adi_ip.tcl
+source ../scripts/adi_env.tcl
+source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
 adi_ip_create axi_hdmi_tx
 adi_ip_files axi_hdmi_tx [list \
-  "../common/ad_mem.v" \
-  "../common/ad_rst.v" \
-  "../common/ad_csc_1_mul.v" \
-  "../common/ad_csc_1_add.v" \
-  "../common/ad_csc_1.v" \
-  "../common/ad_csc_RGB2CrYCb.v" \
-  "../common/ad_ss_444to422.v" \
-  "../common/up_axi.v" \
-  "../common/up_xfer_cntrl.v" \
-  "../common/up_xfer_status.v" \
-  "../common/up_clock_mon.v" \
-  "../common/up_hdmi_tx.v" \
+  "$ad_hdl_dir/library/common/ad_mem.v" \
+  "$ad_hdl_dir/library/common/ad_rst.v" \
+  "$ad_hdl_dir/library/common/ad_csc_1_mul.v" \
+  "$ad_hdl_dir/library/common/ad_csc_1_add.v" \
+  "$ad_hdl_dir/library/common/ad_csc_1.v" \
+  "$ad_hdl_dir/library/common/ad_csc_RGB2CrYCb.v" \
+  "$ad_hdl_dir/library/common/ad_ss_444to422.v" \
+  "$ad_hdl_dir/library/common/up_axi.v" \
+  "$ad_hdl_dir/library/common/up_xfer_cntrl.v" \
+  "$ad_hdl_dir/library/common/up_xfer_status.v" \
+  "$ad_hdl_dir/library/common/up_clock_mon.v" \
+  "$ad_hdl_dir/library/common/up_hdmi_tx.v" \
   "axi_hdmi_tx_vdma.v" \
   "axi_hdmi_tx_core.v" \
   "axi_hdmi_tx.v" ]
diff --git a/library/axi_i2s_adi/axi_i2s_adi_ip.tcl b/library/axi_i2s_adi/axi_i2s_adi_ip.tcl
index cf3a08ebc..3c0468342 100644
--- a/library/axi_i2s_adi/axi_i2s_adi_ip.tcl
+++ b/library/axi_i2s_adi/axi_i2s_adi_ip.tcl
@@ -1,14 +1,15 @@
 # ip
 
-source ../scripts/adi_ip.tcl
+source ../scripts/adi_env.tcl
+source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
 adi_ip_create axi_i2s_adi
 adi_ip_files axi_i2s_adi [list \
-  "../common/axi_ctrlif.vhd" \
-  "../common/axi_streaming_dma_tx_fifo.vhd" \
-  "../common/axi_streaming_dma_rx_fifo.vhd" \
-  "../common/pl330_dma_fifo.vhd" \
-  "../common/dma_fifo.vhd" \
+  "$ad_hdl_dir/library/common/axi_ctrlif.vhd" \
+  "$ad_hdl_dir/library/common/axi_streaming_dma_tx_fifo.vhd" \
+  "$ad_hdl_dir/library/common/axi_streaming_dma_rx_fifo.vhd" \
+  "$ad_hdl_dir/library/common/pl330_dma_fifo.vhd" \
+  "$ad_hdl_dir/library/common/dma_fifo.vhd" \
   "i2s_controller.vhd" \
   "i2s_rx.vhd" \
   "i2s_tx.vhd" \
diff --git a/library/axi_spdif_tx/axi_spdif_tx_ip.tcl b/library/axi_spdif_tx/axi_spdif_tx_ip.tcl
index 0f097630a..9a6cc5e9d 100644
--- a/library/axi_spdif_tx/axi_spdif_tx_ip.tcl
+++ b/library/axi_spdif_tx/axi_spdif_tx_ip.tcl
@@ -1,13 +1,14 @@
 # ip
 
-source ../scripts/adi_ip.tcl
+source ../scripts/adi_env.tcl
+source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
 adi_ip_create axi_spdif_tx
 adi_ip_files axi_spdif_tx [list \
-  "../common/axi_ctrlif.vhd" \
-  "../common/axi_streaming_dma_tx_fifo.vhd" \
-  "../common/pl330_dma_fifo.vhd" \
-  "../common/dma_fifo.vhd" \
+  "$ad_hdl_dir/library/common/axi_ctrlif.vhd" \
+  "$ad_hdl_dir/library/common/axi_streaming_dma_tx_fifo.vhd" \
+  "$ad_hdl_dir/library/common/pl330_dma_fifo.vhd" \
+  "$ad_hdl_dir/library/common/dma_fifo.vhd" \
   "tx_package.vhd" \
   "tx_encoder.vhd" \
   "axi_spdif_tx.vhd" ]
diff --git a/library/util_i2c_mixer/util_i2c_mixer_ip.tcl b/library/util_i2c_mixer/util_i2c_mixer_ip.tcl
index e9b955ce0..518a6ab29 100644
--- a/library/util_i2c_mixer/util_i2c_mixer_ip.tcl
+++ b/library/util_i2c_mixer/util_i2c_mixer_ip.tcl
@@ -1,6 +1,7 @@
 # ip
 
-source ../scripts/adi_ip.tcl
+source ../scripts/adi_env.tcl
+source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
 adi_ip_create util_i2c_mixer
 adi_ip_files util_i2c_mixer [list \