Fixed header file dependency chain to prevent compilation errors on CentOS pertaining to duplicate type definition