diff --git a/src/common/pmemcommon.inc b/src/common/pmemcommon.inc
index 0a7f26f98bf..c9c63389d13 100644
--- a/src/common/pmemcommon.inc
+++ b/src/common/pmemcommon.inc
@@ -12,7 +12,6 @@ SOURCE +=\
 	$(COMMON)/ctl_sds.c\
 	$(COMMON)/ctl_fallocate.c\
 	$(COMMON)/ctl_cow.c\
-	$(call osdep, $(COMMON)/extent,.c)\
 	$(COMMON)/file.c\
 	$(COMMON)/file_posix.c\
 	$(COMMON)/mmap.c\
@@ -37,11 +36,13 @@ ifeq ($(OS_KERNEL_NAME),Linux)
 SOURCE +=\
 	$(PMEM2)/auto_flush_linux.c\
 	$(PMEM2)/deep_sync_linux.c\
+	$(PMEM2)/extent_linux.c\
 	$(PMEM2)/pmem2_utils_linux.c
 else
 SOURCE +=\
 	$(PMEM2)/auto_flush_none.c\
 	$(PMEM2)/deep_sync_none.c\
+	$(PMEM2)/extent_none.c\
 	$(PMEM2)/pmem2_utils_other.c
 endif
 
diff --git a/src/libpmem2/Makefile b/src/libpmem2/Makefile
index da60e89031f..160f38cbd06 100644
--- a/src/libpmem2/Makefile
+++ b/src/libpmem2/Makefile
@@ -20,7 +20,6 @@ SOURCE =\
 	memops_generic.c\
 	map.c\
 	map_posix.c\
-	$(call osdep, extent,.c)\
 	persist.c\
 	persist_posix.c\
 	pmem2.c\
@@ -33,12 +32,14 @@ ifeq ($(OS_KERNEL_NAME),Linux)
 SOURCE +=\
 	auto_flush_linux.c\
 	deep_sync_linux.c\
+	extent_linux.c\
 	pmem2_utils_linux.c
 else
 SOURCE +=\
-	pmem2_utils_other.c\
 	auto_flush_none.c\
-	deep_sync_none.c
+	deep_sync_none.c\
+	extent_none.c\
+	pmem2_utils_other.c
 endif
 
 ifeq ($(OS_DIMM),ndctl)
diff --git a/src/libpmem2/extent_freebsd.c b/src/libpmem2/extent_none.c
similarity index 75%
rename from src/libpmem2/extent_freebsd.c
rename to src/libpmem2/extent_none.c
index cec6721dc0d..37f14318b00 100644
--- a/src/libpmem2/extent_freebsd.c
+++ b/src/libpmem2/extent_none.c
@@ -2,15 +2,9 @@
 /* Copyright 2018-2020, Intel Corporation */
 
 /*
- * extent_freebsd.c - implementation of the FreeBSD fs extent query API
- * XXX THIS IS CURRENTLY A DUMMY MODULE.
+ * extent_none.c - fake implementation of the FS extent query API
  */
 
-#include <string.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-
-#include "file.h"
 #include "out.h"
 #include "extent.h"
 
diff --git a/src/test/Makefile.inc b/src/test/Makefile.inc
index 8177ae47efc..792aae0aec5 100644
--- a/src/test/Makefile.inc
+++ b/src/test/Makefile.inc
@@ -265,7 +265,6 @@ OBJS +=\
 	$(TOP)/src/nondebug/common/ctl_sds.o\
 	$(TOP)/src/nondebug/common/ctl_fallocate.o\
 	$(TOP)/src/nondebug/common/ctl_cow.o\
-	$(call osdep, $(TOP)/src/nondebug/common/extent,.o)\
 	$(TOP)/src/nondebug/common/file.o\
 	$(TOP)/src/nondebug/common/file_posix.o\
 	$(TOP)/src/nondebug/common/mmap.o\
@@ -287,13 +286,17 @@ OBJS +=\
 	$(TOP)/src/nondebug/libpmem2/source_posix.o
 
 ifeq ($(OS_KERNEL_NAME),Linux)
-OBJS += $(TOP)/src/nondebug/libpmem2/pmem2_utils_linux.o\
+OBJS +=\
 	$(TOP)/src/nondebug/libpmem2/auto_flush_linux.o\
-	$(TOP)/src/nondebug/libpmem2/deep_sync_linux.o
+	$(TOP)/src/nondebug/libpmem2/deep_sync_linux.o\
+	$(TOP)/src/nondebug/libpmem2/extent_linux.o\
+	$(TOP)/src/nondebug/libpmem2/pmem2_utils_linux.o
 else
-OBJS += $(TOP)/src/nondebug/libpmem2/pmem2_utils_other.o\
+OBJS +=\
 	$(TOP)/src/nondebug/libpmem2/auto_flush_none.o\
-	$(TOP)/src/nondebug/libpmem2/deep_sync_none.o
+	$(TOP)/src/nondebug/libpmem2/deep_sync_none.o\
+	$(TOP)/src/nondebug/libpmem2/extent_none.o\
+	$(TOP)/src/nondebug/libpmem2/pmem2_utils_other.o
 endif
 
 ifeq ($(OS_DIMM),ndctl)
@@ -313,7 +316,6 @@ OBJS +=\
 	$(TOP)/src/debug/common/ctl_sds.o\
 	$(TOP)/src/debug/common/ctl_fallocate.o\
 	$(TOP)/src/debug/common/ctl_cow.o\
-	$(call osdep, $(TOP)/src/debug/common/extent,.o)\
 	$(TOP)/src/debug/common/file.o\
 	$(TOP)/src/debug/common/file_posix.o\
 	$(TOP)/src/debug/common/mmap.o\
@@ -333,13 +335,17 @@ OBJS +=\
 	$(TOP)/src/debug/libpmem2/usc_$(OS_DIMM).o
 
 ifeq ($(OS_KERNEL_NAME),Linux)
-OBJS += $(TOP)/src/debug/libpmem2/pmem2_utils_linux.o\
+OBJS +=\
 	$(TOP)/src/debug/libpmem2/auto_flush_linux.o\
-	$(TOP)/src/debug/libpmem2/deep_sync_linux.o
+	$(TOP)/src/debug/libpmem2/deep_sync_linux.o\
+	$(TOP)/src/debug/libpmem2/extent_linux.o\
+	$(TOP)/src/debug/libpmem2/pmem2_utils_linux.o
 else
-OBJS += $(TOP)/src/debug/libpmem2/pmem2_utils_other.o\
+OBJS +=\
 	$(TOP)/src/debug/libpmem2/auto_flush_none.o\
-	$(TOP)/src/debug/libpmem2/deep_sync_none.o
+	$(TOP)/src/debug/libpmem2/deep_sync_none.o\
+	$(TOP)/src/debug/libpmem2/extent_none.o\
+	$(TOP)/src/debug/libpmem2/pmem2_utils_other.o
 endif
 
 ifeq ($(OS_DIMM),ndctl)
diff --git a/src/test/tools/extents/Makefile b/src/test/tools/extents/Makefile
index 914b553955c..6770f6f5ad9 100644
--- a/src/test/tools/extents/Makefile
+++ b/src/test/tools/extents/Makefile
@@ -16,10 +16,15 @@ vpath %.c $(TOP)/src/libpmem2
 
 TARGET = extents
 OBJS = extents.o\
-	$(call osdep, extent,.o)\
 	pmem2_utils_linux.o\
 	pmem2_utils.o
 
+ifeq ($(OS_KERNEL_NAME),Linux)
+OBJS += extent_linux.o
+else
+OBJS += extent_none.o
+endif
+
 LIBPMEMCORE=y
 
 include $(TOP)/src/tools/Makefile.inc