diff --git a/include/ntfs/types.h b/include/ntfs/types.h
index f8f937c8..5a7bc85e 100644
--- a/include/ntfs/types.h
+++ b/include/ntfs/types.h
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_STDINT_H
+#if HAVE_STDINT_H || !HAVE_CONFIG_H
 #include <stdint.h>
 #endif
 #include <sys/types.h>
diff --git a/ntfsprogs/ntfsrm.c b/ntfsprogs/ntfsrm.c
index e6889880..142a0333 100644
--- a/ntfsprogs/ntfsrm.c
+++ b/ntfsprogs/ntfsrm.c
@@ -547,8 +547,9 @@ static int ntfs_bmp_set_range (struct ntfs_bmp *bmp, VCN vcn, s64 length, int va
 
 	printf (GREEN "Modified: inode %lld, ", bmp->attr->ni->mft_no);
 	switch (bmp->attr->type) {
-		case AT_BITMAP: printf ("$BITMAP"); break;
-		case AT_DATA:   printf ("$DATA");   break;
+		case AT_BITMAP: printf("$BITMAP");	break;
+		case AT_DATA:   printf("$DATA");	break;
+		default:	printf("???");		break;
 	}
 	printf (" vcn %lld-%lld\n" END, vcn>>12, (vcn+length-1)>>12);