diff --git a/Makefile.am b/Makefile.am
index d369576..b08b0ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,13 +23,10 @@ ntpd_SOURCES += ntp_msg.c
 ntpd_SOURCES += ntpd.c
 ntpd_SOURCES += ntpd.h
 ntpd_SOURCES += parse.y
-if !HAVE_ADJFREQ
-ntpd_SOURCES += bsd-adjfreq.c
-endif
 if HAVE_SENSORS
 ntpd_SOURCES += sensors.c
 else
-ntpd_SOURCES += fake-sensors.c
+ntpd_SOURCES += compat/fake-sensors.c
 endif
 ntpd_SOURCES += server.c
 ntpd_SOURCES += util.c
@@ -52,7 +49,6 @@ libcompat_la_CFLAGS = $(CFLAGS) $(USER_CFLAGS)
 libcompat_la_SOURCES =
 libcompat_la_LIBADD = $(PLATFORM_LDADD)
 
-
 if !HAVE_SETPROCTITLE
 libcompat_la_SOURCES += compat/setproctitle.c
 endif
@@ -94,6 +90,10 @@ libcompat_la_SOURCES += compat/imsg.c
 libcompat_la_SOURCES += compat/imsg-buffer.c
 endif
 
+if !HAVE_ADJFREQ
+libcompat_la_SOURCES += compat/bsd-adjfreq.c
+endif
+
 if !HAVE_CLOCK_GETRES
 libcompat_la_SOURCES += compat/clock_getres.c
 endif
diff --git a/bsd-adjfreq.c b/compat/bsd-adjfreq.c
similarity index 100%
rename from bsd-adjfreq.c
rename to compat/bsd-adjfreq.c
diff --git a/fake-sensors.c b/compat/fake-sensors.c
similarity index 100%
rename from fake-sensors.c
rename to compat/fake-sensors.c