diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 2bfb0a2a52038ae603c9dfba0f43c54d170bb5e7..99352cc19c4c6b2056ce4712f79e4f83a97d871c 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -5,11 +5,12 @@
   b. palmer, bpalmer@crimelabs.net 1-17-2001
 
  */
+#include "postgres_fe.h"
 
-#include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "libpq-fe.h"