Add #defines needed by OpenSolaris, fix breakage by the #defines