Fix GH#22384: Don't align dynamics when hairpin line isn't visible

Backport of musescore#22813

Plus some cleanup in the includes

libmscore/hairpin.cpp

@@ -10,20 +10,19 @@
 //  the file LICENCE.GPL
 //=============================================================================
 
-#include "hairpin.h"
+#include "changeMap.h"
 #include "dynamichairpingroup.h"
-#include "style.h"
-#include "xml.h"
-#include "utils.h"
-#include "score.h"
+#include "hairpin.h"
 #include "measure.h"
+#include "mscore.h"
+#include "score.h"
 #include "segment.h"
+#include "staff.h"
+#include "style.h"
 #include "system.h"
 #include "undo.h"
-#include "staff.h"
-#include "mscore.h"
-#include "chord.h"
-#include "changeMap.h"
+#include "utils.h"
+#include "xml.h"
 
 namespace Ms {
 
@@ -304,7 +303,8 @@ void HairpinSegment::layout()
                   rypos() += yd;
                   }
 
-            if (hairpin()->addToSkyline() && !hairpin()->diagonal()) {
+            if (hairpin()->addToSkyline() && !hairpin()->lineVisible()
+                && !hairpin()->diagonal()) {
                   // align dynamics with hairpin
                   if (sd && sd->autoplace() && sd->placement() == hairpin()->placement()) {
                         qreal ny = y() + ddiff - sd->offset().y();