Revert "Core/RBAC: Remove unnecessary header includes from other header files"

This reverts commit 15343d9bb074823e9b631cef873b7ba93663fad2.
Revert "Core/RBAC: Fix mem leak"

This reverts commit 22353a012ff506f9388355b0d464bfafaf610902.