diff --git a/MANIFEST b/MANIFEST
index ca4f933e6..e0f137af4 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -11,6 +11,7 @@ common/Makefile.in
 common/aix.c
 common/alloc.c
 common/atobool.c
+common/atoid.c
 common/error.c
 common/fileops.c
 common/fmt_string.c
@@ -167,7 +168,6 @@ plugins/sample/sample_plugin.exp
 plugins/sudoers/Makefile.in
 plugins/sudoers/aixcrypt.exp
 plugins/sudoers/alias.c
-plugins/sudoers/atoid.c
 plugins/sudoers/audit.c
 plugins/sudoers/auth/API
 plugins/sudoers/auth/afs.c
diff --git a/common/Makefile.in b/common/Makefile.in
index d5ce67fe9..c55db4892 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -66,9 +66,9 @@ DEFS = @OSDEFS@ -D_PATH_SUDO_CONF=\"$(sysconfdir)/sudo.conf\"
 
 SHELL = @SHELL@
 
-LTOBJS = alloc.lo atobool.lo error.lo fileops.lo fmt_string.lo lbuf.lo list.lo \
-	 secure_path.lo setgroups.lo sudo_conf.lo sudo_debug.lo sudo_printf.lo \
-	 term.lo ttysize.lo @COMMON_OBJS@
+LTOBJS = alloc.lo atobool.lo atoid.lo error.lo fileops.lo fmt_string.lo \
+	 lbuf.lo list.lo secure_path.lo setgroups.lo sudo_conf.lo \
+	 sudo_debug.lo sudo_printf.lo term.lo ttysize.lo @COMMON_OBJS@
 
 PARSELN_TEST_OBJS = parseln_test.lo
 
@@ -163,6 +163,9 @@ alloc.lo: $(srcdir)/alloc.c $(top_builddir)/config.h $(incdir)/missing.h \
 atobool.lo: $(srcdir)/atobool.c $(top_builddir)/config.h $(incdir)/missing.h \
             $(incdir)/sudo_debug.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atobool.c
+atoid.lo: $(srcdir)/atoid.c $(top_builddir)/config.h $(incdir)/gettext.h \
+          $(incdir)/missing.h $(incdir)/sudo_debug.h
+	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atoid.c
 conf_test.lo: $(srcdir)/regress/sudo_conf/conf_test.c $(top_builddir)/config.h \
               $(top_srcdir)/compat/stdbool.h $(incdir)/missing.h \
               $(incdir)/sudo_conf.h $(incdir)/list.h
diff --git a/plugins/sudoers/atoid.c b/common/atoid.c
similarity index 100%
rename from plugins/sudoers/atoid.c
rename to common/atoid.c
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 4860faeee..97459c7d0 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -132,7 +132,7 @@ LIBPARSESUDOERS_OBJS = alias.lo audit.lo base64.lo defaults.lo hexchar.lo \
 		       gram.lo match.lo match_addr.lo pwutil.lo pwutil_impl.lo \
 		       timestr.lo toke.lo toke_util.lo redblack.lo sha2.lo
 
-SUDOERS_OBJS = $(AUTH_OBJS) atoid.lo boottime.lo check.lo env.lo find_path.lo \
+SUDOERS_OBJS = $(AUTH_OBJS) boottime.lo check.lo env.lo find_path.lo \
 	       goodpath.lo group_plugin.lo interfaces.lo iolog.lo \
 	       iolog_path.lo locale.lo logging.lo logwrap.lo parse.lo \
 	       policy.lo prompt.lo set_perms.lo sudo_nss.lo sudoers.lo \
@@ -452,9 +452,6 @@ alias.lo: $(srcdir)/alias.c $(top_builddir)/config.h $(srcdir)/sudoers.h \
           $(incdir)/sudo_plugin.h $(incdir)/sudo_debug.h $(incdir)/gettext.h \
           $(srcdir)/parse.h $(srcdir)/redblack.h $(devdir)/gram.h
 	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/alias.c
-atoid.lo: $(srcdir)/atoid.c $(top_builddir)/config.h $(incdir)/missing.h \
-          $(incdir)/sudo_debug.h
-	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/atoid.c
 audit.lo: $(srcdir)/audit.c $(top_builddir)/config.h \
           $(top_srcdir)/compat/stdbool.h $(incdir)/missing.h \
           $(srcdir)/logging.h $(incdir)/sudo_debug.h $(srcdir)/bsm_audit.h \