diff --git a/images/Cursors.h b/images/Cursors.h
index c8feafd90..abe8a71be 100644
--- a/images/Cursors.h
+++ b/images/Cursors.h
@@ -54,4 +54,4 @@
 
 #endif
 
-std::unique_ptr<wxCursor> MakeCursor(int WXUNUSED(CursorId), const char * pXpm[36], int HotX, int HotY);
+std::unique_ptr<wxCursor> MakeCursor(int WXUNUSED(CursorId), const char * const pXpm[36], int HotX, int HotY);
diff --git a/src/MixerBoard.cpp b/src/MixerBoard.cpp
index 4d5db94d3..edae6bc20 100644
--- a/src/MixerBoard.cpp
+++ b/src/MixerBoard.cpp
@@ -1404,7 +1404,7 @@ int MixerBoard::FindMixerTrackCluster(const PlayableTrack* pTrack,
 
 void MixerBoard::LoadMusicalInstruments()
 {
-   const struct Data { const char **bitmap; wxString name; } table[] = {
+   const struct Data { const char * const *bitmap; wxString name; } table[] = {
       {acoustic_guitar_gtr_xpm, wxT("acoustic_guitar_gtr")},
       {acoustic_piano_pno_xpm, wxT("acoustic_piano_pno")},
       {back_vocal_bg_vox_xpm, wxT("back_vocal_bg_vox")},
diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 05f87122e..979efff8a 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -271,7 +271,7 @@ END_EVENT_TABLE()
 
 /// Makes a cursor from an XPM, uses CursorId as a fallback.
 /// TODO:  Move this function to some other source file for reuse elsewhere.
-std::unique_ptr<wxCursor> MakeCursor( int WXUNUSED(CursorId), const char * pXpm[36],  int HotX, int HotY )
+std::unique_ptr<wxCursor> MakeCursor( int WXUNUSED(CursorId), const char * const pXpm[36],  int HotX, int HotY )
 {
 #ifdef CURSORS_SIZE32
    const int HotAdjust =0;
diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp
index 61c8020ea..a07a0e679 100644
--- a/src/effects/Effect.cpp
+++ b/src/effects/Effect.cpp
@@ -3784,7 +3784,7 @@ void EffectUIHost::OnDefaults(wxCommandEvent & WXUNUSED(evt))
    return;
 }
 
-wxBitmap EffectUIHost::CreateBitmap(const char *xpm[], bool up, bool pusher)
+wxBitmap EffectUIHost::CreateBitmap(const char * const xpm[], bool up, bool pusher)
 {
    wxMemoryDC dc;
    wxBitmap pic(xpm);
diff --git a/src/effects/Effect.h b/src/effects/Effect.h
index 24d4a6f7c..ad69c2bc6 100644
--- a/src/effects/Effect.h
+++ b/src/effects/Effect.h
@@ -638,7 +638,7 @@ private:
    void OnDefaults(wxCommandEvent & evt);
 
    void UpdateControls();
-   wxBitmap CreateBitmap(const char *xpm[], bool up, bool pusher);
+   wxBitmap CreateBitmap(const char * const xpm[], bool up, bool pusher);
    void LoadUserPresets();
 
    void InitializeRealtime();