diff --git a/src/drivers/dw/ssi-spi.c b/src/drivers/dw/ssi-spi.c
index e6ce5be07..3bdefd046 100644
--- a/src/drivers/dw/ssi-spi.c
+++ b/src/drivers/dw/ssi-spi.c
@@ -321,7 +321,7 @@ static enum task_state spi_completion_work(void *data)
 		/* configure to receive next header */
 		spi->ipc_status = IPC_READ;
 		config = spi->config + SPI_DIR_RX;
-		config->transfer_len = ALIGN_UP(sizeof(*hdr), 16);
+		config->transfer_len = ALIGN_UP_COMPILE(sizeof(*hdr), 16);
 		spi_set_config(spi, config);
 		spi_trigger(spi, SPI_TRIGGER_START, SPI_DIR_RX);
 
@@ -346,7 +346,7 @@ int spi_push(struct spi *spi, const void *data, size_t size)
 		return ret;
 
 	/* configure transmit path of SPI-slave */
-	config->transfer_len = ALIGN_UP(size, 16);
+	config->transfer_len = ALIGN_UP_COMPILE(size, 16);
 	ret = spi_set_config(spi, config);
 	if (ret < 0)
 		return ret;
@@ -389,7 +389,7 @@ static int spi_slave_init(struct spi *spi)
 	/* configure receive path of SPI-slave */
 	config->dir = SPI_DIR_RX;
 	config->dest_buf = spi->rx_buffer;
-	config->transfer_len = ALIGN_UP(sizeof(struct sof_ipc_hdr), 16);
+	config->transfer_len = ALIGN_UP_COMPILE(sizeof(struct sof_ipc_hdr), 16);
 
 	ret = spi_set_config(spi, config);
 	if (ret < 0)
diff --git a/src/drivers/intel/hda/hda-dma.c b/src/drivers/intel/hda/hda-dma.c
index e65e8553c..46bf0970f 100644
--- a/src/drivers/intel/hda/hda-dma.c
+++ b/src/drivers/intel/hda/hda-dma.c
@@ -747,7 +747,7 @@ static int hda_dma_set_config(struct dma_chan_data *channel,
 	if (config->direction == DMA_DIR_LMEM_TO_HMEM ||
 	    config->direction == DMA_DIR_HMEM_TO_LMEM)
 		dma_chan_reg_write(channel, DGMBS,
-				   ALIGN_UP(buffer_bytes,
+				   ALIGN_UP_COMPILE(buffer_bytes,
 					    HDA_DMA_BUFFER_ALIGNMENT));
 
 	/* firmware control buffer */
diff --git a/src/platform/intel/cavs/lib/pm_memory.c b/src/platform/intel/cavs/lib/pm_memory.c
index 967e62aaa..3068b123d 100644
--- a/src/platform/intel/cavs/lib/pm_memory.c
+++ b/src/platform/intel/cavs/lib/pm_memory.c
@@ -38,7 +38,7 @@ static void memory_banks_get(void *start, void *end, uint32_t base,
 	 * or end for end address
 	 */
 	if ((uintptr_t)start % SRAM_BANK_SIZE)
-		start = (void *)ALIGN_UP((uintptr_t)start, SRAM_BANK_SIZE);
+		start = (void *)ALIGN_UP_COMPILE((uintptr_t)start, SRAM_BANK_SIZE);
 
 	if ((uintptr_t)end % SRAM_BANK_SIZE)
 		end = (void *)ALIGN_DOWN((uintptr_t)end, SRAM_BANK_SIZE);
diff --git a/src/platform/intel/cavs/lps_wait.c b/src/platform/intel/cavs/lps_wait.c
index e3cc0c345..712a58b44 100644
--- a/src/platform/intel/cavs/lps_wait.c
+++ b/src/platform/intel/cavs/lps_wait.c
@@ -69,7 +69,7 @@ static void platform_pg_task(void)
 
 	offset_to_entry = (uint32_t)&lps_pic_restore_vector
 			- (uint32_t)&lps_pic_restore_vector_literals;
-	vector_size = ALIGN_UP((size_t)&lps_pic_restore_vector_end
+	vector_size = ALIGN_UP_COMPILE((size_t)&lps_pic_restore_vector_end
 			       - (size_t)&lps_pic_restore_vector_literals, 4);
 
 	/* Half of area is available,