diff --git a/ChangeLog b/ChangeLog
index a3fe191b..e17012a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+06/01/2004 - 1.8.xx - WIP
+	- Compile fixes for DJGPP. (Chrisophe Grenier, me)
+	- Add compatibility for building on FreeBSD. (Christophe Grenier)
+
 06/01/2004 - 1.8.1 - Important bug fix and various enhancements.
 	- Add new API function attrib.[hc]:ntfs_attr_map_whole_runlist().
 	- Add new API function runlist.[hc]:ntfs_rl_pread().
diff --git a/config.h.in b/config.h.in
index 9252b29b..2c599863 100644
--- a/config.h.in
+++ b/config.h.in
@@ -24,6 +24,9 @@
 /* Define to 1 if you have the `fdatasync' function. */
 #undef HAVE_FDATASYNC
 
+/* Define to 1 if you have the <features.h> header file. */
+#undef HAVE_FEATURES_H
+
 /* Define to 1 if you have the `getmntent' function. */
 #undef HAVE_GETMNTENT
 
@@ -146,12 +149,18 @@
    `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
 #undef HAVE_ST_BLOCKS
 
+/* Define to 1 if you have the <sys/endian.h> header file. */
+#undef HAVE_SYS_ENDIAN_H
+
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
 /* Define to 1 if you have the <sys/mount.h> header file. */
 #undef HAVE_SYS_MOUNT_H
 
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
diff --git a/configure b/configure
index 920b2a2b..41ac93b1 100755
--- a/configure
+++ b/configure
@@ -8459,14 +8459,18 @@ fi
 
 
 
+
+
+
 
 
 
 
 for ac_header in fcntl.h libintl.h limits.h locale.h mntent.h stddef.h \
 	stdint.h stdlib.h stdio.h stdarg.h string.h strings.h errno.h time.h \
-	endian.h byteswap.h sys/ioctl.h sys/mount.h unistd.h utime.h wchar.h \
-	getopt.h sys/stat.h sys/types.h linux/major.h linux/fd.h
+	unistd.h utime.h wchar.h getopt.h features.h endian.h byteswap.h \
+	sys/endian.h sys/param.h sys/ioctl.h sys/mount.h sys/stat.h \
+	sys/types.h linux/major.h linux/fd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/configure.ac b/configure.ac
index fdeea028..f8883be5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,8 +167,9 @@ AC_SUBST(AUTODIRS)
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h libintl.h limits.h locale.h mntent.h stddef.h \
 	stdint.h stdlib.h stdio.h stdarg.h string.h strings.h errno.h time.h \
-	endian.h byteswap.h sys/ioctl.h sys/mount.h unistd.h utime.h wchar.h \
-	getopt.h sys/stat.h sys/types.h linux/major.h linux/fd.h])
+	unistd.h utime.h wchar.h getopt.h features.h endian.h byteswap.h \
+	sys/endian.h sys/param.h sys/ioctl.h sys/mount.h sys/stat.h \
+	sys/types.h linux/major.h linux/fd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
diff --git a/include/endians.h b/include/endians.h
index d7d0133f..4a5c2a24 100644
--- a/include/endians.h
+++ b/include/endians.h
@@ -36,6 +36,22 @@
 #ifdef HAVE_ENDIAN_H
 #	include <endian.h>
 #endif
+#ifdef HAVE_SYS_ENDIAN_H
+#	include <sys/endian.h>
+#endif
+#ifndef __BYTE_ORDER
+#	ifdef _BYTE_ORDER
+#		define __BYTE_ORDER _BYTE_ORDER
+#		define __LITTLE_ENDIAN _LITTLE_ENDIAN
+#		define __BIG_ENDIAN _BIG_ENDIAN
+#	else
+#		ifdef BYTE_ORDER
+#			define __BYTE_ORDER BYTE_ORDER
+#			define __LITTLE_ENDIAN LITTLE_ENDIAN
+#			define __BIG_ENDIAN BIG_ENDIAN
+#		endif
+#	endif
+#endif
 #ifdef HAVE_BYTESWAP_H
 #	include <byteswap.h>
 #endif
diff --git a/include/volume.h b/include/volume.h
index ee5e2d17..4d8c042b 100644
--- a/include/volume.h
+++ b/include/volume.h
@@ -25,6 +25,9 @@
 #include "config.h"
 
 #include <stdio.h>
+#ifdef HAVE_SYS_PARAM_H
+#	include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_MOUNT_H
 #	include <sys/mount.h>
 #endif
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index 9dd1e873..682257eb 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -23,7 +23,9 @@
 
 #include "config.h"
 
-#include <features.h>
+#ifdef HAVE_FEATURES_H
+#	include <features.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ntfsprogs/utils.c b/ntfsprogs/utils.c
index 7ee3addd..6b6b7fc8 100644
--- a/ntfsprogs/utils.c
+++ b/ntfsprogs/utils.c
@@ -31,7 +31,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <locale.h>
-#include <libintl.h>
+#ifdef HAVE_LIBINTL_H
+#	include <libintl.h>
+#endif
 #include <stdlib.h>
 #include <limits.h>