-obdclass-all-objs += acl.o idmap.o
-obdclass-all-objs += md_local_object.o
-
-obdclass-objs := $(obdclass-linux-objs) $(obdclass-all-objs)
+obdclass-all-objs += linkea.o
+obdclass-all-objs += kernelcomm.o jobid.o
+obdclass-all-objs += integrity.o obd_cksum.o
+obdclass-all-objs += lu_tgt_descs.o
+
+@SERVER_TRUE@obdclass-all-objs += acl.o
+@SERVER_TRUE@obdclass-all-objs += idmap.o
+@SERVER_TRUE@obdclass-all-objs += upcall_cache.o
+@SERVER_TRUE@obdclass-all-objs += lprocfs_jobstats.o
+@SERVER_TRUE@obdclass-all-objs += lprocfs_status_server.o
+@SERVER_TRUE@obdclass-all-objs += lu_ucred.o
+@SERVER_TRUE@obdclass-all-objs += md_attrs.o
+@SERVER_TRUE@obdclass-all-objs += obd_mount_server.o
+@SERVER_TRUE@obdclass-all-objs += obdo_server.o
+@SERVER_TRUE@obdclass-all-objs += scrub.o
+
+obdclass-objs := $(obdclass-all-objs)