diff --git a/src/modules/image/Makefile.in b/src/modules/image/Makefile.in
deleted file mode 100644
index c04a34c52ed7fc4f19dfd766c3613a5a4b86693d..0000000000000000000000000000000000000000
--- a/src/modules/image/Makefile.in
+++ /dev/null
@@ -1,79 +0,0 @@
-SRCDIR=@srcdir@
-VPATH=@srcdir@:@srcdir@/../..:../..
-PREFLAGS=-I$(SRCDIR) -I$(SRCDIR)/../.. -I../..
-CFLAGS=$(PREFLAGS) $(OTHERFLAGS) @DEFS@
-
-FILES=image.o font.o quant.o lzw.o togif.o
-
-image.a: $(FILES)
-	-rm -f image.a
-	ar cq image.a $(FILES)
-	-@RANLIB@ image.a
-
-clean:
-	-rm -f *.o *.a
-
-pike: image.a
-	cd ../..; make
-
-pure: image.a
-	cd ../..; make pure
-
-
-depend:
-	gcc -MM $(PREFLAGS) $(SRCDIR)/*.c | $(FIXDEP) $(SRCDIR)
-
-# Depencies begin here
-font.o: font.c \
- global.h machine.h \
- config.h \
- port.h \
- stralloc.h \
- macros.h \
- object.h \
- svalue.h \
- constants.h \
- hashtable.h \
- las.h \
- dynamic_buffer.h \
- program.h \
- interpret.h \
- array.h \
- image.h
-image.o: image.c \
- stralloc.h \
- types.h machine.h \
- global.h \
- config.h \
- port.h \
- macros.h \
- object.h \
- svalue.h \
- constants.h \
- hashtable.h \
- las.h \
- dynamic_buffer.h \
- program.h \
- interpret.h \
- array.h \
- error.h \
- image.h
-lzw.o: lzw.c \
- lzw.h
-quant.o: quant.c \
- types.h machine.h \
- image.h \
- error.h \
- svalue.h \
- global.h \
- config.h \
- port.h
-togif.o: togif.c \
- stralloc.h \
- types.h machine.h \
- global.h \
- config.h \
- port.h \
- dynamic_buffer.h \
- image.h \
- lzw.h
diff --git a/src/modules/image/configure.in b/src/modules/image/configure.in
index fcaf3dc941872fc1d3b6e6dcf073c93c80f4911a..8f7f9ec818fe0e7cd7f92c75cfc79993cffaab65 100644
--- a/src/modules/image/configure.in
+++ b/src/modules/image/configure.in
@@ -3,6 +3,8 @@ AC_INIT(image.c)
 AC_PROG_CC
 AC_PROG_RANLIB
 
+AC_CHECK_HEADER(sys/fcntl.h fcntl.h)
+
 AC_SUBST(RANLIB)
 
 AC_OUTPUT(Makefile,echo FOO >stamp-h )
diff --git a/src/modules/image/font.c b/src/modules/image/font.c
index 489403dda4413f8e473b1abc16cdcba324291b5c..0152fa2cf5a3608be27cadfc82bd4b16f5b3e768 100644
--- a/src/modules/image/font.c
+++ b/src/modules/image/font.c
@@ -3,9 +3,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef _AIX
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#else
+#endif
+
+#ifdef HAVE_SYS_FCNTL_H
 #include <sys/fcntl.h>
 #endif