Bug-Debian: http://bugs.debian.org/162440

--- a/ifcico/nlindex.h
+++ b/ifcico/nlindex.h
@@ -6,7 +6,7 @@
 #define INDEX "index"
 
 #ifdef HAS_NDBM_H
-#include <ndbm.h>
+#include <gdbm-ndbm.h>
 extern DBM *nldb;
 #else
 #include <dbm.h>
--- a/iflib/ref.c
+++ b/iflib/ref.c
@@ -60,7 +60,7 @@
 #include <string.h>
 #ifdef HAS_NDBM_H
 #include <fcntl.h>
-#include <ndbm.h>
+#include <gdbm-ndbm.h>
 #else
 #include <dbm.h>
 #endif
--- a/ifgate/ifdbm.c
+++ b/ifgate/ifdbm.c
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #ifdef HAS_NDBM_H
 #include <fcntl.h>
-#include <ndbm.h>
+#include <gdbm-ndbm.h>
 #else
 #include <dbm.h>
 #endif
--- a/ifgate/nlindex.c
+++ b/ifgate/nlindex.c
@@ -6,11 +6,6 @@
 #include <fcntl.h>
 #include "directory.h"
 #include <sys/stat.h>
-#ifdef HAS_NDBM_H
-#include <ndbm.h>
-#else
-#include <dbm.h>
-#endif
 #include "xutil.h"
 #include "lutil.h"
 #include "ftn.h"
--- a/ifgate/nlindex.h
+++ b/ifgate/nlindex.h
@@ -6,8 +6,10 @@
 #define INDEX "index"
 
 #ifdef HAS_NDBM_H
-#include <ndbm.h>
+#include <gdbm-ndbm.h>
 extern DBM *nldb;
+#else
+#include <dbm.h>
 #endif
 extern int openstatus;
 
--- a/ifgate/nodecheck.c
+++ b/ifgate/nodecheck.c
@@ -7,9 +7,6 @@
 #include <sys/stat.h>
 #ifdef HAS_NDBM_H
 #include <fcntl.h>
-#include <ndbm.h>
-#else
-#include <dbm.h>
 #endif
 #include "directory.h"
 
--- a/ifgate/msgidbm.c
+++ b/ifgate/msgidbm.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <ndbm.h>
+#include <gdbm-ndbm.h>
 #include <fcntl.h>
 #include "lutil.h"
 #include "xutil.h"
