diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index 3648d1508f..6b054077da 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -925,7 +925,7 @@ void onConfigurationChangeTriggerCallback() {
 	if (changed) {
 	#if EFI_ENGINE_CONTROL
 		engine->updateTriggerWaveform();
-		engine->triggerCentral.noiseFilter.resetAccumSignalData();
+		getTriggerCentral()->noiseFilter.resetAccumSignalData();
 	#endif
 	}
 #if EFI_DEFAILED_LOGGING
@@ -933,7 +933,7 @@ void onConfigurationChangeTriggerCallback() {
 #endif /* EFI_DEFAILED_LOGGING */
 
 	// we do not want to miss two updates in a row
-	engine->triggerCentral.triggerConfigChanged = engine->triggerCentral.triggerConfigChanged || changed;
+	getTriggerCentral()->triggerConfigChanged = getTriggerCentral()->triggerConfigChanged || changed;
 }
 
 static void initVvtShape(TriggerWaveform& shape, const TriggerConfiguration& config, TriggerDecoderBase &initState) {
diff --git a/firmware/util/efilib.h b/firmware/util/efilib.h
index 3354dc27dc..139f28fd20 100644
--- a/firmware/util/efilib.h
+++ b/firmware/util/efilib.h
@@ -8,7 +8,9 @@
 #pragma once
 
 #include <stdint.h>
+#ifdef __cplusplus
 #include <rusefi/arrays.h>
+#endif
 
 #define _MAX_FILLER 11