diff --git a/src/musredit_qt5/mupp/var/include/PExpressionDef.hpp b/src/musredit_qt5/mupp/var/include/PExpressionDef.hpp
index 125df780..86e3dcec 100644
--- a/src/musredit_qt5/mupp/var/include/PExpressionDef.hpp
+++ b/src/musredit_qt5/mupp/var/include/PExpressionDef.hpp
@@ -33,7 +33,7 @@
 #include "PExpression.hpp"
 #include "PErrorHandler.hpp"
 #include "PAnnotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 
 namespace mupp { namespace parser
 {
diff --git a/src/musredit_qt5/mupp/var/include/PProgram.hpp b/src/musredit_qt5/mupp/var/include/PProgram.hpp
index 0eaa2aa1..491d7064 100644
--- a/src/musredit_qt5/mupp/var/include/PProgram.hpp
+++ b/src/musredit_qt5/mupp/var/include/PProgram.hpp
@@ -42,9 +42,9 @@
 
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 
 namespace mupp { namespace prog {
     ///////////////////////////////////////////////////////////////////////////
diff --git a/src/musredit_qt5/musrStep/PMusrStep.cpp b/src/musredit_qt5/musrStep/PMusrStep.cpp
index 249dbe98..88f92f5b 100644
--- a/src/musredit_qt5/musrStep/PMusrStep.cpp
+++ b/src/musredit_qt5/musrStep/PMusrStep.cpp
@@ -544,7 +544,7 @@ int PMusrStep::writeMsrFile()
   bool paramBlock = false;
   do {
     line = getLine(data, idx);
-    if ((idx == -1) || (idx == data.count())) {
+    if ((idx == -1) || (idx == data.size())) {
       done = true;
     } else {
       if (line.startsWith("FITPARAMETER")) {
diff --git a/src/musredit_qt6/mupp/var/include/PExpressionDef.hpp b/src/musredit_qt6/mupp/var/include/PExpressionDef.hpp
index 125df780..86e3dcec 100644
--- a/src/musredit_qt6/mupp/var/include/PExpressionDef.hpp
+++ b/src/musredit_qt6/mupp/var/include/PExpressionDef.hpp
@@ -33,7 +33,7 @@
 #include "PExpression.hpp"
 #include "PErrorHandler.hpp"
 #include "PAnnotation.hpp"
-#include <boost/spirit/include/phoenix_function.hpp>
+#include <boost/phoenix/function.hpp>
 
 namespace mupp { namespace parser
 {
diff --git a/src/musredit_qt6/mupp/var/include/PProgram.hpp b/src/musredit_qt6/mupp/var/include/PProgram.hpp
index 0eaa2aa1..491d7064 100644
--- a/src/musredit_qt6/mupp/var/include/PProgram.hpp
+++ b/src/musredit_qt6/mupp/var/include/PProgram.hpp
@@ -42,9 +42,9 @@
 
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/spirit/include/phoenix_core.hpp>
-#include <boost/spirit/include/phoenix_function.hpp>
-#include <boost/spirit/include/phoenix_operator.hpp>
+#include <boost/phoenix/core.hpp>
+#include <boost/phoenix/function.hpp>
+#include <boost/phoenix/operator.hpp>
 
 namespace mupp { namespace prog {
     ///////////////////////////////////////////////////////////////////////////
diff --git a/src/musredit_qt6/musrStep/PMusrStep.cpp b/src/musredit_qt6/musrStep/PMusrStep.cpp
index 422dfc72..c2e6bb5a 100644
--- a/src/musredit_qt6/musrStep/PMusrStep.cpp
+++ b/src/musredit_qt6/musrStep/PMusrStep.cpp
@@ -539,7 +539,7 @@ int PMusrStep::writeMsrFile()
   bool paramBlock = false;
   do {
     line = getLine(data, idx);
-    if ((idx == -1) || (idx == data.count())) {
+    if ((idx == -1) || (idx == data.size())) {
       done = true;
     } else {
       if (line.startsWith("FITPARAMETER")) {