diff --git a/panda/src/downloadertools/build_patch.cxx b/panda/src/downloadertools/build_patch.cxx
index 41dedea9c6..d0c3c91efa 100644
--- a/panda/src/downloadertools/build_patch.cxx
+++ b/panda/src/downloadertools/build_patch.cxx
@@ -1,5 +1,9 @@
 #include <pandabase.h>
-#include <getopt.h>
+#ifndef HAVE_GETOPT
+  #include <gnu_getopt.h>
+#else
+  #include <getopt.h>
+#endif
 #include <patchfile.h>
 #include <filename.h>
 
diff --git a/panda/src/downloadertools/multify.cxx b/panda/src/downloadertools/multify.cxx
index 4c6dc1e356..308464e59f 100644
--- a/panda/src/downloadertools/multify.cxx
+++ b/panda/src/downloadertools/multify.cxx
@@ -1,5 +1,9 @@
 #include <pandabase.h>
-#include <getopt.h>
+#ifndef HAVE_GETOPT
+  #include <gnu_getopt.h>
+#else
+  #include <getopt.h>
+#endif
 #include <multifile.h>
 #include <filename.h>