diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index ce315938243a73..de87e8c6766184 100644
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -8,6 +8,7 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
diff --git a/sound/soc/sof/ops.c b/sound/soc/sof/ops.c
index a3b1aebb0fd14a..0668f64e1ef672 100644
--- a/sound/soc/sof/ops.c
+++ b/sound/soc/sof/ops.c
@@ -23,7 +23,7 @@ int snd_sof_pci_update_bits_unlocked(struct snd_sof_dev *sdev, u32 offset,
 {
 	bool change;
 	unsigned int old, new;
-	u32 ret;
+	u32 ret = ~0; /* explicit init to remove uninitialized use warnings */
 
 	pci_read_config_dword(sdev->pci, offset, &ret);
 	dev_dbg(sdev->dev, "Debug PCIR: %8.8x at  %8.8x\n",
diff --git a/sound/soc/sof/pm.c b/sound/soc/sof/pm.c
index d825ff402fc66a..56c60423e85c84 100644
--- a/sound/soc/sof/pm.c
+++ b/sound/soc/sof/pm.c
@@ -8,6 +8,7 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
+#include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>