#define DEBUG_SUBSYSTEM S_MGS
#define D_MGS D_CONFIG
-#include <uapi/linux/lustre_ioctl.h>
+#include <uapi/linux/lustre/lustre_ioctl.h>
#include <lustre_swab.h>
-#include <lustre/lustre_barrier_user.h>
+#include <uapi/linux/lustre/lustre_barrier_user.h>
#include "mgs_internal.h"