diff --git a/src/common/serialization/vst3/attribute-list.h b/src/common/serialization/vst3/attribute-list.h
index 9f395ccd..23ab7ff2 100644
--- a/src/common/serialization/vst3/attribute-list.h
+++ b/src/common/serialization/vst3/attribute-list.h
@@ -88,3 +88,5 @@ class YaAttributeList : public Steinberg::Vst::IAttributeList {
     std::unordered_map<std::string, std::u16string> attrs_string;
     std::unordered_map<std::string, std::vector<uint8_t>> attrs_binary;
 };
+
+#pragma GCC diagnostic pop
diff --git a/src/common/serialization/vst3/event-list.h b/src/common/serialization/vst3/event-list.h
index af0c6793..930f6f19 100644
--- a/src/common/serialization/vst3/event-list.h
+++ b/src/common/serialization/vst3/event-list.h
@@ -260,6 +260,8 @@ class YaEventList : public Steinberg::Vst::IEventList {
     std::vector<Steinberg::Vst::Event> reconstructed_events;
 };
 
+#pragma GCC diagnostic pop
+
 namespace Steinberg {
 namespace Vst {
 template <typename S>
@@ -305,5 +307,3 @@ void serialize(S& s, LegacyMIDICCOutEvent& event) {
 }
 }  // namespace Vst
 }  // namespace Steinberg
-
-#pragma GCC diagnostic pop