diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
index 6e5170a8..df2ef688 100644
--- a/src/lowntfs-3g.c
+++ b/src/lowntfs-3g.c
@@ -207,9 +207,9 @@ struct open_file {
 	fuse_ino_t ino;
 	fuse_ino_t parent;
 	int state;
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 	struct fuse_file_info fi;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 } ;
 
 enum {
@@ -622,7 +622,7 @@ static void ntfs_init(void *userdata __attribute__((unused)),
 #endif /* defined(FUSE_CAP_IOCTL_DIR) */
 }
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 
 /*
  *		Define attributes for a junction or symlink
@@ -681,7 +681,7 @@ static void apply_umask(struct stat *stbuf)
 	}
 }
 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 static int ntfs_fuse_getstat(struct SECURITY_CONTEXT *scx,
 				ntfs_inode *ni, struct stat *stbuf)
@@ -696,7 +696,7 @@ static int ntfs_fuse_getstat(struct SECURITY_CONTEXT *scx,
 	if ((ni->mrec->flags & MFT_RECORD_IS_DIRECTORY)
 	    || (ni->flags & FILE_ATTR_REPARSE_POINT)) {
 		if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 			const plugin_operations_t *ops;
 			REPARSE_POINT *reparse;
 
@@ -712,7 +712,7 @@ static int ntfs_fuse_getstat(struct SECURITY_CONTEXT *scx,
 				res = 0;
 			}
 			goto ok;
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 			char *target;
 			int attr_size;
 
@@ -741,7 +741,7 @@ static int ntfs_fuse_getstat(struct SECURITY_CONTEXT *scx,
 				res = -errno;
 				goto exit;
 			}
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		} else {
 			/* Directory. */
 			stbuf->st_mode = S_IFDIR | (0777 & ~ctx->dmask);
@@ -845,9 +845,9 @@ static int ntfs_fuse_getstat(struct SECURITY_CONTEXT *scx,
 		}
 		stbuf->st_mode |= (0777 & ~ctx->fmask);
 	}
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 ok:
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	if (withusermapping) {
 		if (ntfs_get_owner_mode(scx,ni,stbuf) < 0)
 			set_fuse_error(&res);
@@ -990,7 +990,7 @@ static void ntfs_fuse_lookup(fuse_req_t req, fuse_ino_t parent,
 		fuse_reply_entry(req, &entry);
 }
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 
 /*
  *		Get the link defined by a junction or symlink
@@ -1018,7 +1018,7 @@ static int junction_readlink(ntfs_inode *ni,
 	return (res);
 }
 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 static void ntfs_fuse_readlink(fuse_req_t req, fuse_ino_t ino)
 {
@@ -1038,7 +1038,7 @@ static void ntfs_fuse_readlink(fuse_req_t req, fuse_ino_t ino)
 		 * Reparse point : analyze as a junction point
 		 */
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 
@@ -1048,7 +1048,7 @@ static void ntfs_fuse_readlink(fuse_req_t req, fuse_ino_t ino)
 			if (!buf)
 				res = -errno;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		int attr_size;
 
 		errno = 0;
@@ -1060,7 +1060,7 @@ static void ntfs_fuse_readlink(fuse_req_t req, fuse_ino_t ino)
 			if (!buf)
 				res = -errno;
 		}
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
  		goto exit;
 	}
 	/* Sanity checks. */
@@ -1448,7 +1448,7 @@ static void ntfs_fuse_open(fuse_req_t req, fuse_ino_t ino,
 		}
 #endif
 		if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 			const plugin_operations_t *ops;
 			REPARSE_POINT *reparse;
 
@@ -1457,9 +1457,9 @@ static void ntfs_fuse_open(fuse_req_t req, fuse_ino_t ino,
 			if (!res && fi->fh) {
 				state = CLOSE_REPARSE;
 			}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 			res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 			goto close;
 		}
 		if ((res >= 0)
@@ -1493,9 +1493,9 @@ close:
 			of->parent = 0;
 			of->ino = ino;
 			of->state = state;
-#ifdef PLUGIN_ENABLED
+#ifndef DISABLE_PLUGINS
 			memcpy(&of->fi, fi, sizeof(struct fuse_file_info));
-#endif /* PLUGIN_ENABLED */
+#endif /* DISABLE_PLUGINS */
 			of->next = ctx->open_files;
 			of->previous = (struct open_file*)NULL;
 			if (ctx->open_files)
@@ -1537,7 +1537,7 @@ static void ntfs_fuse_read(fuse_req_t req, fuse_ino_t ino, size_t size,
 		goto exit;
 	}
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 		struct open_file *of;
@@ -1547,9 +1547,9 @@ static void ntfs_fuse_read(fuse_req_t req, fuse_ino_t ino, size_t size,
 		if (res >= 0) {
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
@@ -1588,9 +1588,9 @@ static void ntfs_fuse_read(fuse_req_t req, fuse_ino_t ino, size_t size,
 	}
 ok:
 	res = total;
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 stamps :
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	ntfs_fuse_update_times(ni, NTFS_UPDATE_ATIME);
 exit:
 	if (na)
@@ -1618,7 +1618,7 @@ static void ntfs_fuse_write(fuse_req_t req, fuse_ino_t ino, const char *buf,
 		goto exit;
 	}
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 		struct open_file *of;
@@ -1629,9 +1629,9 @@ static void ntfs_fuse_write(fuse_req_t req, fuse_ino_t ino, const char *buf,
 		if (res >= 0) {
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
@@ -1650,9 +1650,9 @@ static void ntfs_fuse_write(fuse_req_t req, fuse_ino_t ino, const char *buf,
 		total  += ret;
 	}
 	res = total;
-#ifndef PLUGINS_DISABLED 
+#ifndef DISABLE_PLUGINS 
 stamps :
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	if ((res > 0)
 	    && (!ctx->dmtime
 		|| (sle64_to_cpu(ntfs_current_time())
@@ -1832,7 +1832,7 @@ static int ntfs_fuse_trunc(struct SECURITY_CONTEXT *scx, fuse_ino_t ino,
 	}
 #endif
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 
@@ -1841,9 +1841,9 @@ static int ntfs_fuse_trunc(struct SECURITY_CONTEXT *scx, fuse_ino_t ino,
 			set_archive(ni);
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 		/*
@@ -1862,9 +1862,9 @@ static int ntfs_fuse_trunc(struct SECURITY_CONTEXT *scx, fuse_ino_t ino,
 	if (oldsize != size)
 		set_archive(ni);
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 stamps :
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	ntfs_fuse_update_times(ni, NTFS_UPDATE_MCTIME);
 	res = ntfs_fuse_getstat(scx, ni, stbuf);
 	errno = (res ? -res : 0);
@@ -2798,7 +2798,7 @@ static void ntfs_fuse_release(fuse_req_t req, fuse_ino_t ino,
 		goto exit;
 	}
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 
@@ -2806,10 +2806,10 @@ static void ntfs_fuse_release(fuse_req_t req, fuse_ino_t ino,
 		if (!res) {
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 			/* Assume release() was not needed */
 		res = 0;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	na = ntfs_attr_open(ni, AT_DATA, AT_UNNAMED, 0);
@@ -2824,9 +2824,9 @@ static void ntfs_fuse_release(fuse_req_t req, fuse_ino_t ino,
 	if (of->state & CLOSE_ENCRYPTED)
 		res = ntfs_efs_fixup_attribute(NULL, na);
 #endif /* HAVE_SETXATTR */
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 stamps :
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	if (of->state & CLOSE_DMTIME)
 		ntfs_inode_update_times(ni,NTFS_UPDATE_MCTIME);
 exit:
@@ -3823,7 +3823,7 @@ out :
 #endif
 #endif /* HAVE_SETXATTR */
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 static void register_internal_reparse_plugins(void)
 {
 	static const plugin_operations_t ops = {
@@ -3835,7 +3835,7 @@ static void register_internal_reparse_plugins(void)
 	register_reparse_plugin(ctx, IO_REPARSE_TAG_SYMLINK,
 					&ops, (void*)NULL);
 }
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 static void ntfs_close(void)
 {
@@ -4447,9 +4447,9 @@ int main(int argc, char *argv[])
 		free(ctx->xattrmap_path);
 #endif /* defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS) */
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 	register_internal_reparse_plugins();
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 	se = mount_fuse(parsed_options);
 	if (!se) {
@@ -4486,9 +4486,9 @@ err_out:
 #endif /* defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS) */
 err2:
 	ntfs_close();
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 	close_reparse_plugins(ctx);
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	free(ctx);
 	free(parsed_options);
 	free(opts.options);
diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
index 68cfcb3d..fafa71d7 100644
--- a/src/ntfs-3g.c
+++ b/src/ntfs-3g.c
@@ -686,7 +686,7 @@ static void *ntfs_init(struct fuse_conn_info *conn)
 	return NULL;
 }
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 
 /*
  *		Define attributes for a junction or symlink
@@ -745,7 +745,7 @@ static void apply_umask(struct stat *stbuf)
 	}
 }
 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 static int ntfs_fuse_getattr(const char *org_path, struct stat *stbuf)
 {
@@ -786,7 +786,7 @@ static int ntfs_fuse_getattr(const char *org_path, struct stat *stbuf)
 		|| (ni->flags & FILE_ATTR_REPARSE_POINT))
 	    && !stream_name_len) {
 		if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 			const plugin_operations_t *ops;
 			REPARSE_POINT *reparse;
 
@@ -804,7 +804,7 @@ static int ntfs_fuse_getattr(const char *org_path, struct stat *stbuf)
 				goto ok;
 			}
 			goto exit;
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 			char *target;
 			int attr_size;
 
@@ -829,7 +829,7 @@ static int ntfs_fuse_getattr(const char *org_path, struct stat *stbuf)
 				res = -errno;
 				goto exit;
 			}
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		} else {
 			/* Directory. */
 			stbuf->st_mode = S_IFDIR | (0777 & ~ctx->dmask);
@@ -950,9 +950,9 @@ static int ntfs_fuse_getattr(const char *org_path, struct stat *stbuf)
 		}
 		stbuf->st_mode |= (0777 & ~ctx->fmask);
 	}
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 ok:
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	if (withusermapping) {
 		if (ntfs_get_owner_mode(&security,ni,stbuf) < 0)
 			set_fuse_error(&res);
@@ -1008,7 +1008,7 @@ exit:
 	return res;
 }
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 
 /*
  *		Get the link defined by a junction or symlink
@@ -1036,7 +1036,7 @@ static int junction_readlink(ntfs_inode *ni,
 	return (res);
 }
 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 static int ntfs_fuse_readlink(const char *org_path, char *buf, size_t buf_size)
 {
@@ -1064,7 +1064,7 @@ static int ntfs_fuse_readlink(const char *org_path, char *buf, size_t buf_size)
 		 * Reparse point : analyze as a junction point
 		 */
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		char *gotlink;
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
@@ -1078,7 +1078,7 @@ static int ntfs_fuse_readlink(const char *org_path, char *buf, size_t buf_size)
 			strncpy(buf, ntfs_bad_reparse, buf_size);
 			res = 0;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		char *target;
 		int attr_size;
 
@@ -1093,7 +1093,7 @@ static int ntfs_fuse_readlink(const char *org_path, char *buf, size_t buf_size)
 				strcpy(buf,ntfs_bad_reparse);
 			else
 				res = -errno;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	/* Sanity checks. */
@@ -1360,15 +1360,15 @@ static int ntfs_fuse_open(const char *org_path,
 		}
 #endif
 		if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 			const plugin_operations_t *ops;
 			REPARSE_POINT *reparse;
 
 			fi->fh = 0;
 			res = CALL_REPARSE_PLUGIN(ni, open, fi);
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 			res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 			goto close;
 		}
 		if ((res >= 0)
@@ -1425,7 +1425,7 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
 		goto exit;
 	}
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 
@@ -1437,9 +1437,9 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
 		if (res >= 0) {
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
@@ -1478,9 +1478,9 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
 	}
 ok:
 	res = total;
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 stamps:
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	ntfs_fuse_update_times(ni, NTFS_UPDATE_ATIME);
 exit:
 	if (na)
@@ -1513,7 +1513,7 @@ static int ntfs_fuse_write(const char *org_path, const char *buf, size_t size,
 		goto exit;
 	}
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 
@@ -1525,9 +1525,9 @@ static int ntfs_fuse_write(const char *org_path, const char *buf, size_t size,
 		if (res >= 0) {
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
@@ -1546,9 +1546,9 @@ static int ntfs_fuse_write(const char *org_path, const char *buf, size_t size,
 		total  += ret;
 	}
 	res = total;
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 stamps: 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	if ((res > 0)
 	    && (!ctx->dmtime
 		|| (sle64_to_cpu(ntfs_current_time())
@@ -1599,7 +1599,7 @@ static int ntfs_fuse_release(const char *org_path,
 		goto exit;
 	}
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 
@@ -1611,10 +1611,10 @@ static int ntfs_fuse_release(const char *org_path,
 		if (!res) {
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 			/* Assume release() was not needed */
 		res = 0;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
@@ -1629,9 +1629,9 @@ static int ntfs_fuse_release(const char *org_path,
 	if (fi->fh & CLOSE_ENCRYPTED)
 		res = ntfs_efs_fixup_attribute(NULL, na);
 #endif /* HAVE_SETXATTR */
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 stamps:
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	if (fi->fh & CLOSE_DMTIME)
 		ntfs_inode_update_times(ni,NTFS_UPDATE_MCTIME);
 exit:
@@ -1681,7 +1681,7 @@ static int ntfs_fuse_trunc(const char *org_path, off_t size,
 	}
 
 	if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 		const plugin_operations_t *ops;
 		REPARSE_POINT *reparse;
 
@@ -1694,9 +1694,9 @@ static int ntfs_fuse_trunc(const char *org_path, off_t size,
 			set_archive(ni);
 			goto stamps;
 		}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 		res = -EOPNOTSUPP;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		goto exit;
 	}
 	na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
@@ -1732,9 +1732,9 @@ static int ntfs_fuse_trunc(const char *org_path, off_t size,
 	if (oldsize != size)
 		set_archive(ni);
 
-#ifndef PLUGINS_DISABLED	
+#ifndef DISABLE_PLUGINS	
 stamps:
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	ntfs_fuse_update_times(ni, NTFS_UPDATE_MCTIME);
 	errno = 0;
 exit:
@@ -3620,7 +3620,7 @@ exit:
 #endif
 #endif /* HAVE_SETXATTR */
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 static void register_internal_reparse_plugins(void)
 {
 	static const plugin_operations_t ops = {
@@ -3632,7 +3632,7 @@ static void register_internal_reparse_plugins(void)
 	register_reparse_plugin(ctx, IO_REPARSE_TAG_SYMLINK,
 					&ops, (void*)NULL);
 }
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 static void ntfs_close(void)
 {
@@ -4249,9 +4249,9 @@ int main(int argc, char *argv[])
 		free(ctx->xattrmap_path);
 #endif /* defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS) */
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 	register_internal_reparse_plugins();
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 	fh = mount_fuse(parsed_options);
 	if (!fh) {
@@ -4290,9 +4290,9 @@ err_out:
 #endif /* defined(HAVE_SETXATTR) && defined(XATTR_MAPPINGS) */
 err2:
 	ntfs_close();
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 	close_reparse_plugins(ctx);
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	free(ctx);
 	free(parsed_options);
 	free(opts.options);
diff --git a/src/ntfs-3g_common.c b/src/ntfs-3g_common.c
index 5889d1bd..708b177e 100644
--- a/src/ntfs-3g_common.c
+++ b/src/ntfs-3g_common.c
@@ -759,7 +759,7 @@ exit :
 
 #endif /* HAVE_SETXATTR */
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 
 int register_reparse_plugin(ntfs_fuse_context_t *ctx, le32 tag,
 				const plugin_operations_t *ops, void *handle)
@@ -865,7 +865,7 @@ void close_reparse_plugins(ntfs_fuse_context_t *ctx)
 	}
 }
 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 #ifdef HAVE_SETXATTR
 
@@ -890,7 +890,7 @@ BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx __attribute__((unused)),
 	else {
 			/* Reparse point depends on kind, see plugin */
 		if (ni->flags & FILE_ATTR_REPARSE_POINT) {
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 			struct stat stbuf;
 			REPARSE_POINT *reparse;
 			const plugin_operations_t *ops;
@@ -905,9 +905,9 @@ BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx __attribute__((unused)),
 				}
 				free(reparse);
 			}
-#else /* PLUGINS_DISABLED */
+#else /* DISABLE_PLUGINS */
 			res = FALSE; /* mountpoints, symlinks, ... */
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 		} else {
 				/* Metadata */
 			if (ni->mft_no < FILE_first_user)
diff --git a/src/ntfs-3g_common.h b/src/ntfs-3g_common.h
index 65fbae61..e2d8790d 100644
--- a/src/ntfs-3g_common.h
+++ b/src/ntfs-3g_common.h
@@ -114,7 +114,7 @@ typedef enum {
 	ERR_PLUGIN = 1
 } single_log_t;
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 
 typedef struct plugin_list {
 	struct plugin_list *next;
@@ -123,7 +123,7 @@ typedef struct plugin_list {
 	le32 tag;
 } plugin_list_t;
 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 typedef struct {
 	ntfs_volume *vol;
@@ -163,9 +163,9 @@ typedef struct {
 	single_log_t errors_logged;
 	char *usermap_path;
 	char *abs_mnt_point;
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 	plugin_list_t *plugins;
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 	struct PERMISSIONS_CACHE *seccache;
 	struct SECURITY_CONTEXT security;
 	struct open_file *open_files; /* only defined in lowntfs-3g */
@@ -202,7 +202,7 @@ int ntfs_fuse_listxattr_common(ntfs_inode *ni, ntfs_attr_search_ctx *actx,
  			char *list, size_t size, BOOL prefixing);
 BOOL user_xattrs_allowed(ntfs_fuse_context_t *ctx, ntfs_inode *ni);
 
-#ifndef PLUGINS_DISABLED
+#ifndef DISABLE_PLUGINS
 
 void close_reparse_plugins(ntfs_fuse_context_t *ctx);
 const struct plugin_operations *select_reparse_plugin(ntfs_fuse_context_t *ctx,
@@ -210,6 +210,6 @@ const struct plugin_operations *select_reparse_plugin(ntfs_fuse_context_t *ctx,
 int register_reparse_plugin(ntfs_fuse_context_t *ctx, le32 tag,
                                 const plugin_operations_t *ops, void *handle);
 
-#endif /* PLUGINS_DISABLED */
+#endif /* DISABLE_PLUGINS */
 
 #endif /* _NTFS_3G_COMMON_H */