-#if defined(NEED_RQUOTA) || (defined(sun) && defined(__svr4__)) || \
-(defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 6)
+#if defined(NEED_RQUOTA) || defined(SOLARIS) || (defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ < 6)
+
+#include <rpc/rpc.h>
+#include <rpcsvc/rquota.h>