The equation for conservation of angular momentum in electrodynamics is
\begin{equation} \frac{\mathrm d\vec{L}_\mathrm{mec}}{\mathrm dt} + \frac{\mathrm d\vec{L}_\mathrm{EM}}{\mathrm dt} = \int M \cdot \mathrm d \vec{S} \end{equation}
where $\vec{L}_\mathrm{EM}=\int \vec{r} \times (\frac{\vec{E} \times \vec{B}}{4\pi c})\mathrm dV$ is the electromagnetic angular momentum and $M_{il}=\epsilon_{ijk}r_j T_{kl}$ with $T_{ij}$ the Maxwell tensor.
The question is: does $\vec{L}_\mathrm{EM}$ include both orbital and intrinsic angular momentum? Looking at the definition it just seems like an orbital angular momentum $\vec{r}\times\vec{p_{EM}}$ but I think that intrinsic angular momentum should also be included somewhere... is it?