Revert "Fix for hurd/BSD header includes from Julien Puydt."
Revert "Fix for hurd/BSD header includes from Julien Puydt."

This reverts commit 1e587d68b132a54b7608bd5f67534e4c43fb5612.

jpflori/flint2,fredrik-johansson/flint2,dsroche/flint2,fredrik-johansson/flint2,jpflori/flint2,wbhart/flint2,fredrik-johansson/flint2,dsroche/flint2,wbhart/flint2,dsroche/flint2,jpflori/flint2,dsroche/flint2,jpflori/flint2,wbhart/flint2