diff --git a/lib/stat-size.h b/lib/stat-size.h
index 8930bb5c5..cc8ec121a 100644
--- a/lib/stat-size.h
+++ b/lib/stat-size.h
@@ -81,12 +81,6 @@
   /* HP-UX counts st_blocks in 1024-byte units.
      This loses when mixing HP-UX and BSD file systems with NFS.  */
 #define ST_NBLOCKSIZE 1024
-#else /* !hpux */
-#if defined _CRAY
-#define ST_NBLOCKS(statbuf) \
-  (S_ISREG ((statbuf).st_mode) || S_ISDIR ((statbuf).st_mode) \
-   ? (statbuf).st_blocks * ST_BLKSIZE (statbuf) / ST_NBLOCKSIZE : 0)
-#endif
 #endif
 #endif
 
diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c
index ae83b329f..cf0513070 100644
--- a/src/filemanager/mountlist.c
+++ b/src/filemanager/mountlist.c
@@ -1430,14 +1430,9 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
         /* Empirically, the block counts on most SVR3 and SVR3-derived
            systems seem to always be in terms of 512-byte blocks,
            no matter what value f_bsize has.  */
-#if defined _CRAY
-        fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize);
-#else
         fsp->fsu_blocksize = 512;
 #endif
 
-#endif
-
 #if (defined STAT_STATVFS64 || defined STAT_STATFS3_OSF1 \
      || defined STAT_STATFS2_FRSIZE || defined STAT_STATFS2_BSIZE \
      || defined STAT_STATFS2_FSIZE || defined STAT_STATFS4)
diff --git a/src/vfs/smbfs/helpers/include/includes.h b/src/vfs/smbfs/helpers/include/includes.h
index 9cce9309d..b7bb9bce6 100644
--- a/src/vfs/smbfs/helpers/include/includes.h
+++ b/src/vfs/smbfs/helpers/include/includes.h
@@ -189,7 +189,7 @@
 #include <sys/fs/s5param.h>
 #endif
 
-#if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY)
+#ifdef HAVE_SYS_FILSYS_H
 #include <sys/filsys.h>
 #endif