diff --git a/libntfs/Makefile.am b/libntfs/Makefile.am
index dac13aec..9fa298cf 100644
--- a/libntfs/Makefile.am
+++ b/libntfs/Makefile.am
@@ -27,11 +27,18 @@
 
 LTVERSION = 4:0:0
 
+# Later gcc require -fms-extensions to work.
+if GCC_NEEDS_MS_EXTENSIONS
+GCCflag = -fms-extensions
+else
+GCCflag =
+endif
+
 # Need this to enable 64-bit (device) file access functions and parameters.
 if DEBUG
-AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -DDEBUG
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -DDEBUG $(GCCflag)
 else
-AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall $(GCCflag)
 endif
 
 linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -43,6 +50,7 @@ libntfs_la_SOURCES =	\
 	bootsect.c	\
 	compat.c	\
 	debug.c		\
+	device.c	\
 	dir.c		\
 	disk_io.c	\
 	inode.c		\