diff --git a/intern/guardedalloc/intern/memory_usage.cc b/intern/guardedalloc/intern/memory_usage.cc
index 9d714fee31e..a858613e715 100644
--- a/intern/guardedalloc/intern/memory_usage.cc
+++ b/intern/guardedalloc/intern/memory_usage.cc
@@ -233,7 +233,7 @@ size_t memory_usage_block_num()
 
   /* Count the number of active blocks. */
   int64_t blocks_num = global.blocks_num_outside_locals;
-  for (Local *local : global.locals) {
+  for (const Local *local : global.locals) {
     blocks_num += local->blocks_num;
   }
   return size_t(blocks_num);
@@ -246,7 +246,7 @@ size_t memory_usage_current()
 
   /* Count the memory that's currently in use. */
   int64_t mem_in_use = global.mem_in_use_outside_locals;
-  for (Local *local : global.locals) {
+  for (const Local *local : global.locals) {
     mem_in_use += local->mem_in_use;
   }
   return size_t(mem_in_use);
diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc
index a640deb8af6..c374a77fd04 100644
--- a/source/blender/blenloader/intern/readfile.cc
+++ b/source/blender/blenloader/intern/readfile.cc
@@ -4617,7 +4617,7 @@ static FileData *read_library_file_data(FileData *basefd,
 
   if (mainptr->curlib->packedfile) {
     /* Read packed file. */
-    PackedFile *pf = mainptr->curlib->packedfile;
+    const PackedFile *pf = mainptr->curlib->packedfile;
 
     BLO_reportf_wrap(basefd->reports,
                      RPT_INFO,
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.cc b/source/blender/blentranslation/msgfmt/msgfmt.cc
index 7916c23126e..6beceedefef 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.cc
+++ b/source/blender/blentranslation/msgfmt/msgfmt.cc
@@ -225,7 +225,7 @@ static char *generate(GHash *messages, size_t *r_output_size)
   BLI_assert(h == ik);
 
   for (int i = 0; i < num_keys; i++) {
-    Offset *off = &offsets[i];
+    const Offset *off = &offsets[i];
 
     /* The index table first has the list of keys, then the list of values.
      * Each entry has first the size of the string, then the file offset. */
diff --git a/source/blender/editors/include/UI_resources.hh b/source/blender/editors/include/UI_resources.hh
index 39e9d9013e8..c1ff1ffba29 100644
--- a/source/blender/editors/include/UI_resources.hh
+++ b/source/blender/editors/include/UI_resources.hh
@@ -495,7 +495,7 @@ bTheme *UI_GetTheme();
  * For the rare case we need to temp swap in a different theme (off-screen render).
  */
 void UI_Theme_Store(bThemeState *theme_state);
-void UI_Theme_Restore(bThemeState *theme_state);
+void UI_Theme_Restore(const bThemeState *theme_state);
 
 /**
  * Return shadow width outside menus and popups.
diff --git a/source/blender/editors/interface/resources.cc b/source/blender/editors/interface/resources.cc
index 66d769d5638..e4f724eea0e 100644
--- a/source/blender/editors/interface/resources.cc
+++ b/source/blender/editors/interface/resources.cc
@@ -1129,7 +1129,7 @@ void UI_Theme_Store(bThemeState *theme_state)
 {
   *theme_state = g_theme_state;
 }
-void UI_Theme_Restore(bThemeState *theme_state)
+void UI_Theme_Restore(const bThemeState *theme_state)
 {
   g_theme_state = *theme_state;
 }