diff --git a/gcc.symbols.imp b/gcc.symbols.imp
index 59c325d..6a89003 100644
--- a/gcc.symbols.imp
+++ b/gcc.symbols.imp
@@ -43,6 +43,7 @@
   { symbol: [ "fsblkcnt_t", private, "<sys/statvfs.h>", public ] },
   { symbol: [ "fsfilcnt_t", private, "<sys/types.h>", public ] },
   { symbol: [ "fsfilcnt_t", private, "<sys/statvfs.h>", public ] },
+  { symbol: [ "getopt", private, "<unistd.h>", public ] },
   { symbol: [ "gid_t", private, "<sys/types.h>", public ] },
   { symbol: [ "gid_t", private, "<grp.h>", public ] },
   { symbol: [ "gid_t", private, "<pwd.h>", public ] },
@@ -101,6 +102,10 @@
   { symbol: [ "off_t", private, "<sys/mman.h>", public ] },
   { symbol: [ "off_t", private, "<sys/stat.h>", public ] },
   { symbol: [ "off_t", private, "<unistd.h>", public ] },
+  { symbol: [ "optarg", private, "<unistd.h>", public ] },
+  { symbol: [ "opterr", private, "<unistd.h>", public ] },
+  { symbol: [ "optind", private, "<unistd.h>", public ] },
+  { symbol: [ "optopt", private, "<unistd.h>", public ] },
   { symbol: [ "pid_t", private, "<sys/types.h>", public ] },
   { symbol: [ "pid_t", private, "<fcntl.h>", public ] },
   { symbol: [ "pid_t", private, "<sched.h>", public ] },
diff --git a/iwyu_include_picker.cc b/iwyu_include_picker.cc
index 4e6b490..ef8eb94 100644
--- a/iwyu_include_picker.cc
+++ b/iwyu_include_picker.cc
@@ -120,6 +120,7 @@ const IncludeMapEntry libc_symbol_map[] = {
   { "fsblkcnt_t", kPrivate, "<sys/statvfs.h>", kPublic },
   { "fsfilcnt_t", kPrivate, "<sys/types.h>", kPublic },
   { "fsfilcnt_t", kPrivate, "<sys/statvfs.h>", kPublic },
+  { "getopt", kPrivate, "<unistd.h>", kPublic },
   { "gid_t", kPrivate, "<sys/types.h>", kPublic },
   { "gid_t", kPrivate, "<grp.h>", kPublic },
   { "gid_t", kPrivate, "<pwd.h>", kPublic },
@@ -178,6 +179,10 @@ const IncludeMapEntry libc_symbol_map[] = {
   { "off_t", kPrivate, "<sys/mman.h>", kPublic },
   { "off_t", kPrivate, "<sys/stat.h>", kPublic },
   { "off_t", kPrivate, "<unistd.h>", kPublic },
+  { "optarg", kPrivate, "<unistd.h>", kPublic },
+  { "opterr", kPrivate, "<unistd.h>", kPublic },
+  { "optind", kPrivate, "<unistd.h>", kPublic },
+  { "optopt", kPrivate, "<unistd.h>", kPublic },
   { "pid_t", kPrivate, "<sys/types.h>", kPublic },
   { "pid_t", kPrivate, "<fcntl.h>", kPublic },
   { "pid_t", kPrivate, "<sched.h>", kPublic },