Updated armadillo-related includes