diff --git a/addons/captives/functions/fnc_handleLocal.sqf b/addons/captives/functions/fnc_handleLocal.sqf
index ee11e74fcb..49ee5f0010 100644
--- a/addons/captives/functions/fnc_handleLocal.sqf
+++ b/addons/captives/functions/fnc_handleLocal.sqf
@@ -29,7 +29,7 @@ if (_local) then {
         if (_unit getVariable [QGVAR(handcuffAnimEHID), -1] != -1) exitWith {};
 
         // Otherwise, restart the AnimChanged EH in the new machine
-        private _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedHandcuffed)];
+        private _animChangedEHID = _unit addEventHandler ["AnimChanged", {call FUNC(handleAnimChangedHandcuffed)}];
         TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
         _unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
     };
@@ -40,7 +40,7 @@ if (_local) then {
         if (_unit getVariable [QGVAR(surrenderAnimEHID), -1] != -1) exitWith {};
 
         // Otherwise, restart the AnimChanged EH in the new machine
-        private _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedSurrendered)];
+        private _animChangedEHID = _unit addEventHandler ["AnimChanged", {call FUNC(handleAnimChangedSurrendered)}];
         TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
         _unit setVariable [QGVAR(surrenderAnimEHID), _animChangedEHID];
     };
diff --git a/addons/captives/functions/fnc_setHandcuffed.sqf b/addons/captives/functions/fnc_setHandcuffed.sqf
index 9a713af0b4..4f949db60d 100644
--- a/addons/captives/functions/fnc_setHandcuffed.sqf
+++ b/addons/captives/functions/fnc_setHandcuffed.sqf
@@ -73,7 +73,7 @@ if (_state) then {
             TRACE_1("removing animChanged EH",_animChangedEHID);
             _unit removeEventHandler ["AnimChanged", _animChangedEHID];
         };
-        _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedHandcuffed)];
+        _animChangedEHID = _unit addEventHandler ["AnimChanged", {call FUNC(handleAnimChangedHandcuffed)}];
         TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
         _unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
 
diff --git a/addons/captives/functions/fnc_setSurrendered.sqf b/addons/captives/functions/fnc_setSurrendered.sqf
index a0551d0219..ee54b6b5e7 100644
--- a/addons/captives/functions/fnc_setSurrendered.sqf
+++ b/addons/captives/functions/fnc_setSurrendered.sqf
@@ -64,7 +64,7 @@ if (_state) then {
                 TRACE_1("removing animChanged EH",_animChangedEHID);
                 _unit removeEventHandler ["AnimChanged", _animChangedEHID];
             };
-            _animChangedEHID = _unit addEventHandler ["AnimChanged", DFUNC(handleAnimChangedSurrendered)];
+            _animChangedEHID = _unit addEventHandler ["AnimChanged", {call FUNC(handleAnimChangedSurrendered)}];
             _unit setVariable [QGVAR(surrenderAnimEHID), _animChangedEHID];
         };
     }, [_unit], 0.01] call CBA_fnc_waitAndExecute;
diff --git a/addons/pylons/XEH_postInit.sqf b/addons/pylons/XEH_postInit.sqf
index 72a07078d0..0e21dabe69 100644
--- a/addons/pylons/XEH_postInit.sqf
+++ b/addons/pylons/XEH_postInit.sqf
@@ -50,7 +50,7 @@
         GVAR(currentAircraftNamespace) = true call CBA_fnc_createNamespace;
         publicVariable QGVAR(currentAircraftNamespace);
 
-        addMissionEventHandler ["HandleDisconnect", LINKFUNC(handleDisconnect)];
+        addMissionEventHandler ["HandleDisconnect", {call FUNC(handleDisconnect)}];
     };
 
     GVAR(searchDistanceSqr) = GVAR(searchDistance) ^ 2;
diff --git a/addons/refuel/XEH_postInit.sqf b/addons/refuel/XEH_postInit.sqf
index 92726bb61e..43933f2cf5 100644
--- a/addons/refuel/XEH_postInit.sqf
+++ b/addons/refuel/XEH_postInit.sqf
@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 
 if (isServer) then {
-    addMissionEventHandler ["HandleDisconnect", LINKFUNC(handleDisconnect)];
+    addMissionEventHandler ["HandleDisconnect", {call FUNC(handleDisconnect)}];
 };
 
 [QGVAR(initSource), LINKFUNC(initSource)] call CBA_fnc_addEventHandler;