--- MuseScore-3.5.0/aeolus/aeolus.cpp.orig	2020-08-05 06:42:00.000000000 -0600
+++ MuseScore-3.5.0/aeolus/aeolus.cpp	2020-08-07 16:10:04.157643046 -0600
@@ -28,7 +28,7 @@ namespace Ms {
       extern QString mscoreGlobalShare;
       };
 
-#include "synthesizer/event.h"
+#include "audio/midi/event.h"
 #include "libmscore/xml.h"
 #include "sparm_p.h"
 
@@ -70,16 +70,16 @@ Aeolus::Aeolus() : Synthesizer()
       _fsamp = 0.0f;
       _fsize = 0;
       _ifc_init = nullptr;
-      _midimap = { 0 };
-      _asectp = { nullptr };
-      _divisp = { nullptr };
-      _keymap = { 0 };
-      _audiopar = { 0.0f };
-      routb = { 0.0f };
-      loutb = { 0.0f };
-      _asectpar = { nullptr };
-      _ifelms = { 0 };
-      _tempstr = { 0 };
+      memset(&_midimap, 0, 16 * sizeof(uint16_t));
+      memset(&_asectp, 0, NASECT * sizeof(Asection *));
+      memset(&_divisp, 0, NDIVIS * sizeof(Division *));
+      memset(&_keymap, 0, NNOTES * sizeof(unsigned char));
+      memset(&_audiopar, 0, 4 * sizeof(float));
+      memset(&routb, 0, PERIOD * sizeof(float));
+      memset(&loutb, 0, PERIOD * sizeof(float));
+      memset(&_asectpar, 0, NASECT * sizeof(SyntiParameter *));
+      memset(&_ifelms, 0, NGROUP * sizeof(uint32_t));
+      memset(&_tempstr, 0, 64 * sizeof(char));
       }
 
 Aeolus::~Aeolus()
--- MuseScore-3.5.0/aeolus/aeolusgui.h.orig	2020-08-05 06:42:00.000000000 -0600
+++ MuseScore-3.5.0/aeolus/aeolusgui.h	2020-08-07 15:52:03.693200753 -0600
@@ -13,7 +13,7 @@
 #ifndef __AEOLUSGUI_H__
 #define __AEOLUSGUI_H__
 
-#include "synthesizer/synthesizergui.h"
+#include "audio/midi/synthesizergui.h"
 #include "ui_aeolus_gui.h"
 #include "aeolus.h"
 
--- MuseScore-3.5.0/aeolus/aeolus.h.orig	2020-08-05 06:42:00.000000000 -0600
+++ MuseScore-3.5.0/aeolus/aeolus.h	2020-08-07 15:52:35.942228223 -0600
@@ -21,8 +21,8 @@
 #define __AEOLUS_H__
 
 #include "stdint.h"
-#include "synthesizer/synthesizer.h"
-#include "synthesizer/midipatch.h"
+#include "audio/midi/synthesizer.h"
+#include "audio/midi/midipatch.h"
 
 #include "asection.h"
 #include "division.h"
--- MuseScore-3.5.0/aeolus/global.h.orig	2020-08-05 06:42:00.000000000 -0600
+++ MuseScore-3.5.0/aeolus/global.h	2020-08-07 15:52:55.725245071 -0600
@@ -91,8 +91,8 @@ enum // GLOBAL LIMITS
 #define HOLD_MASK 64
 #define ALL_MASK 127
 
-#include "synthesizer/synthesizer.h"
-#include "synthesizer/midipatch.h"
+#include "audio/midi/synthesizer.h"
+#include "audio/midi/midipatch.h"
 #include "effects/effect.h"
 #include "sparm.h"