diff --git a/src/fs_clonepath.cpp b/src/fs_clonepath.cpp
index 6fafcac7..308ba879 100644
--- a/src/fs_clonepath.cpp
+++ b/src/fs_clonepath.cpp
@@ -27,7 +27,6 @@
 #include "fs_mkdir.hpp"
 #include "fs_path.hpp"
 #include "fs_xattr.hpp"
-#include "ugid.hpp"
 
 #include "fs_close.hpp"
 #include "fs_fstat.hpp"
diff --git a/src/fs_is_rofs.hpp b/src/fs_is_rofs.hpp
index 2d3b4fa3..b8232c7a 100644
--- a/src/fs_is_rofs.hpp
+++ b/src/fs_is_rofs.hpp
@@ -24,7 +24,6 @@
 #include "fs_statvfs.hpp"
 #include "fs_unlink.hpp"
 #include "statvfs_util.hpp"
-#include "ugid.hpp"
 
 #include <fcntl.h>
 
diff --git a/src/fs_movefile_and_open.cpp b/src/fs_movefile_and_open.cpp
index 8c025cdc..75de245a 100644
--- a/src/fs_movefile_and_open.cpp
+++ b/src/fs_movefile_and_open.cpp
@@ -34,7 +34,6 @@
 #include "fs_stat.hpp"
 #include "fs_unlink.hpp"
 #include "policy.hpp"
-#include "ugid.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/fuse_access.cpp b/src/fuse_access.cpp
index 473acdfb..a98fc8bc 100644
--- a/src/fuse_access.cpp
+++ b/src/fuse_access.cpp
@@ -22,7 +22,6 @@
 #include "errno.hpp"
 #include "fs_eaccess.hpp"
 #include "fs_path.hpp"
-#include "ugid.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/fuse_chmod.cpp b/src/fuse_chmod.cpp
index 48595401..727da3cd 100644
--- a/src/fuse_chmod.cpp
+++ b/src/fuse_chmod.cpp
@@ -23,7 +23,6 @@
 #include "fs_lchmod.hpp"
 #include "fs_path.hpp"
 #include "policy_rv.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_chown.cpp b/src/fuse_chown.cpp
index b312d0f5..332df79d 100644
--- a/src/fuse_chown.cpp
+++ b/src/fuse_chown.cpp
@@ -23,7 +23,6 @@
 #include "fs_lchown.hpp"
 #include "fs_path.hpp"
 #include "policy_rv.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_getattr.cpp b/src/fuse_getattr.cpp
index 6429f676..3bebb35e 100644
--- a/src/fuse_getattr.cpp
+++ b/src/fuse_getattr.cpp
@@ -29,7 +29,6 @@
 #include "state.hpp"
 #include "str.hpp"
 #include "symlinkify.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_getxattr.cpp b/src/fuse_getxattr.cpp
index f4479226..b9fa6db1 100644
--- a/src/fuse_getxattr.cpp
+++ b/src/fuse_getxattr.cpp
@@ -25,7 +25,6 @@
 #include "fs_path.hpp"
 #include "fs_statvfs_cache.hpp"
 #include "str.hpp"
-#include "ugid.hpp"
 #include "version.hpp"
 
 #include "fuse.h"
diff --git a/src/fuse_init.cpp b/src/fuse_init.cpp
index b4246d23..18d5a63a 100644
--- a/src/fuse_init.cpp
+++ b/src/fuse_init.cpp
@@ -23,7 +23,6 @@
 #include "procfs.hpp"
 #include "state.hpp"
 #include "syslog.hpp"
-#include "ugid.hpp"
 
 #include "fs_path.hpp"
 #include "fs_exists.hpp"
diff --git a/src/fuse_ioctl.cpp b/src/fuse_ioctl.cpp
index 0411e587..701d3e7a 100644
--- a/src/fuse_ioctl.cpp
+++ b/src/fuse_ioctl.cpp
@@ -33,7 +33,6 @@
 #include "fs_path.hpp"
 #include "mergerfs_ioctl.hpp"
 #include "str.hpp"
-#include "ugid.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/fuse_link.cpp b/src/fuse_link.cpp
index cd1adb62..7cabdf78 100644
--- a/src/fuse_link.cpp
+++ b/src/fuse_link.cpp
@@ -26,7 +26,6 @@
 #include "fs_path.hpp"
 #include "fuse_getattr.hpp"
 #include "fuse_symlink.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_listxattr.cpp b/src/fuse_listxattr.cpp
index c0504c88..06d1e389 100644
--- a/src/fuse_listxattr.cpp
+++ b/src/fuse_listxattr.cpp
@@ -21,7 +21,6 @@
 #include "config.hpp"
 #include "errno.hpp"
 #include "fs_llistxattr.hpp"
-#include "ugid.hpp"
 #include "xattr.hpp"
 
 #include "fuse.h"
diff --git a/src/fuse_open.cpp b/src/fuse_open.cpp
index 72d8e46c..0bfb9842 100644
--- a/src/fuse_open.cpp
+++ b/src/fuse_open.cpp
@@ -34,7 +34,6 @@
 #include "fuse_passthrough.hpp"
 #include "procfs.hpp"
 #include "stat_util.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_passthrough.hpp b/src/fuse_passthrough.hpp
index e9c88bac..685e9bb4 100644
--- a/src/fuse_passthrough.hpp
+++ b/src/fuse_passthrough.hpp
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "ugid.hpp"
-
 #include "fuse.h"
 
 // Becoming root is required due to current security policies within
diff --git a/src/fuse_readdir_cor.cpp b/src/fuse_readdir_cor.cpp
index 1842ca9b..e4f60eca 100644
--- a/src/fuse_readdir_cor.cpp
+++ b/src/fuse_readdir_cor.cpp
@@ -23,7 +23,6 @@
 #include "config.hpp"
 #include "dirinfo.hpp"
 #include "error.hpp"
-#include "ugid.hpp"
 
 
 FUSE::ReadDirCOR::ReadDirCOR(unsigned concurrency_,
diff --git a/src/fuse_readdir_seq.cpp b/src/fuse_readdir_seq.cpp
index d7483db5..11663d2d 100644
--- a/src/fuse_readdir_seq.cpp
+++ b/src/fuse_readdir_seq.cpp
@@ -22,7 +22,6 @@
 
 #include "config.hpp"
 #include "supported_getdents64.hpp"
-#include "ugid.hpp"
 
 #ifdef MERGERFS_SUPPORTED_GETDENTS64
 #include "fuse_readdir_seq_getdents.icpp"
diff --git a/src/fuse_readlink.cpp b/src/fuse_readlink.cpp
index a4b603d7..fd3bdf50 100644
--- a/src/fuse_readlink.cpp
+++ b/src/fuse_readlink.cpp
@@ -24,7 +24,6 @@
 #include "fs_path.hpp"
 #include "fs_readlink.hpp"
 #include "symlinkify.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_removexattr.cpp b/src/fuse_removexattr.cpp
index fb12d4d1..a40f0059 100644
--- a/src/fuse_removexattr.cpp
+++ b/src/fuse_removexattr.cpp
@@ -23,7 +23,6 @@
 #include "fs_lremovexattr.hpp"
 #include "fs_path.hpp"
 #include "policy_rv.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_rename.cpp b/src/fuse_rename.cpp
index 8d7be162..36bc1e8e 100644
--- a/src/fuse_rename.cpp
+++ b/src/fuse_rename.cpp
@@ -30,7 +30,6 @@
 #include "fs_symlink.hpp"
 #include "fs_unlink.hpp"
 #include "fuse_symlink.hpp"
-#include "ugid.hpp"
 
 #include <algorithm>
 #include <iostream>
diff --git a/src/fuse_rmdir.cpp b/src/fuse_rmdir.cpp
index b8d05fa9..e2dad055 100644
--- a/src/fuse_rmdir.cpp
+++ b/src/fuse_rmdir.cpp
@@ -24,7 +24,6 @@
 #include "fs_path.hpp"
 #include "fs_rmdir.hpp"
 #include "fs_unlink.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_setxattr.cpp b/src/fuse_setxattr.cpp
index fcfa4222..63fc9f48 100644
--- a/src/fuse_setxattr.cpp
+++ b/src/fuse_setxattr.cpp
@@ -27,7 +27,6 @@
 #include "num.hpp"
 #include "policy_rv.hpp"
 #include "str.hpp"
-#include "ugid.hpp"
 #include "syslog.hpp"
 
 #include "fuse.h"
diff --git a/src/fuse_statfs.cpp b/src/fuse_statfs.cpp
index 46df10ba..68f0194d 100644
--- a/src/fuse_statfs.cpp
+++ b/src/fuse_statfs.cpp
@@ -24,7 +24,6 @@
 #include "fs_path.hpp"
 #include "fs_lstatvfs.hpp"
 #include "statvfs_util.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_truncate.cpp b/src/fuse_truncate.cpp
index 5b4e84e0..ca9a9e07 100644
--- a/src/fuse_truncate.cpp
+++ b/src/fuse_truncate.cpp
@@ -23,7 +23,6 @@
 #include "fs_path.hpp"
 #include "fs_truncate.hpp"
 #include "policy_rv.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_unlink.cpp b/src/fuse_unlink.cpp
index a09773fe..8f72e1a4 100644
--- a/src/fuse_unlink.cpp
+++ b/src/fuse_unlink.cpp
@@ -23,7 +23,6 @@
 #include "error.hpp"
 #include "fs_path.hpp"
 #include "fs_unlink.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/fuse_utimens.cpp b/src/fuse_utimens.cpp
index 63fdf5ba..48b8f8fc 100644
--- a/src/fuse_utimens.cpp
+++ b/src/fuse_utimens.cpp
@@ -23,7 +23,6 @@
 #include "fs_lutimens.hpp"
 #include "fs_path.hpp"
 #include "policy_rv.hpp"
-#include "ugid.hpp"
 
 #include "fuse.h"
 
diff --git a/src/policy_ff.cpp b/src/policy_ff.cpp
index 3c026d00..11369da6 100644
--- a/src/policy_ff.cpp
+++ b/src/policy_ff.cpp
@@ -18,8 +18,6 @@
 
 #include "policy_ff.hpp"
 
-#include "ugid.hpp"
-
 #include "errno.hpp"
 #include "fs_exists.hpp"
 #include "fs_info.hpp"