===================================================================
RCS file: /cvs/mandoc/compat_ohash.c,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- mandoc/compat_ohash.c	2014/06/20 02:24:40	1.4
+++ mandoc/compat_ohash.c	2020/06/15 01:37:15	1.7
@@ -1,15 +1,6 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* $Id: compat_ohash.c,v 1.7 2020/06/15 01:37:15 schwarze Exp $ */
+/* $OpenBSD: compat_ohash.c,v 1.7 2020/06/15 01:37:15 schwarze Exp $ */
 
-#ifdef HAVE_OHASH
-
-int dummy;
-
-#else
-
-/* $OpenBSD: compat_ohash.c,v 1.4 2014/06/20 02:24:40 schwarze Exp $ */
-
 /* Copyright (c) 1999, 2004 Marc Espie <espie@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -24,7 +15,9 @@ int dummy;
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
 
+#include <sys/types.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -335,5 +328,3 @@ ohash_qlookupi(struct ohash *h, const char *s, const c
 	hv = ohash_interval(s, e);
 	return ohash_lookup_interval(h, s, *e, hv);
 }
-
-#endif /*!HAVE_OHASH*/