diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index f361c3fcb..5078b5c8a 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -138,8 +138,7 @@ liblxc_so_SOURCES += ../include/getline.c ../include/getline.h
 endif
 endif
 
-AM_CFLAGS=-I$(top_srcdir)/src \
-	-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
+AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
 	-DLXCPATH=\"$(LXCPATH)\" \
 	-DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
 	-DLXCINITDIR=\"$(LXCINITDIR)\" \
@@ -152,7 +151,10 @@ AM_CFLAGS=-I$(top_srcdir)/src \
 	-DLXC_USERNIC_CONF=\"$(LXC_USERNIC_CONF)\" \
 	-DDEFAULT_CGROUP_PATTERN=\"$(DEFAULT_CGROUP_PATTERN)\" \
 	-DRUNTIME_PATH=\"$(RUNTIME_PATH)\" \
-	-DSBINDIR=\"$(SBINDIR)\"
+	-DSBINDIR=\"$(SBINDIR)\" \
+	-I $(top_srcdir)/src \
+	-I $(top_srcdir)/src/lxc \
+	-I $(top_srcdir)/src/lxc/bdev
 
 if ENABLE_APPARMOR
 AM_CFLAGS += -DHAVE_APPARMOR
diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index c493d5802..6b2ac7ee1 100644
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -39,12 +39,12 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
+#include "bdev.h"
 #include "error.h"
 #include "commands.h"
 #include "list.h"
 #include "conf.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "start.h"
diff --git a/src/lxc/cgfsng.c b/src/lxc/cgfsng.c
index 16a945756..27c272103 100644
--- a/src/lxc/cgfsng.c
+++ b/src/lxc/cgfsng.c
@@ -43,11 +43,11 @@
 #include <dirent.h>
 #include <grp.h>
 
+#include "bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "utils.h"
 #include "commands.h"
-#include "bdev/bdev.h"
 
 lxc_log_define(lxc_cgfsng, lxc);
 
diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index c387b00ce..4da891de9 100644
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -41,12 +41,12 @@
 #include <net/if.h>
 #include <poll.h>
 
+#include "bdev.h"
 #include "error.h"
 #include "commands.h"
 #include "list.h"
 #include "conf.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "start.h"
diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 1e330ac9d..9fea9934a 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -66,6 +66,7 @@
 #include <net/if.h>
 #include <libgen.h>
 
+#include "bdev.h"
 #include "network.h"
 #include "error.h"
 #include "af_unix.h"
@@ -74,9 +75,8 @@
 #include "conf.h"
 #include "log.h"
 #include "caps.h"       /* for lxc_caps_last_cap() */
-#include "bdev/bdev.h"
-#include "bdev/lxcaufs.h"
-#include "bdev/lxcoverlay.h"
+#include "lxcaufs.h"
+#include "lxcoverlay.h"
 #include "cgroup.h"
 #include "lxclock.h"
 #include "namespace.h"
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 645cac02d..db89caaff 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -40,10 +40,10 @@
 #include <dirent.h>
 #include <syslog.h>
 
+#include "bdev.h"
 #include "parse.h"
 #include "config.h"
 #include "confile.h"
-#include "bdev/bdev.h"
 #include "utils.h"
 #include "log.h"
 #include "conf.h"
diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index bf9a87ada..65998ed2b 100644
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -35,7 +35,7 @@
 
 #include "config.h"
 
-#include "bdev/bdev.h"
+#include "bdev.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "commands.h"
diff --git a/src/lxc/lxc_copy.c b/src/lxc/lxc_copy.c
index 69de7d515..9f653e319 100644
--- a/src/lxc/lxc_copy.c
+++ b/src/lxc/lxc_copy.c
@@ -37,6 +37,7 @@
 #include <lxc/lxccontainer.h>
 
 #include "attach.h"
+#include "bdev.h"
 #include "log.h"
 #include "confile.h"
 #include "arguments.h"
@@ -44,7 +45,6 @@
 #include "conf.h"
 #include "state.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 
 #ifndef HAVE_GETSUBOPT
 #include <../include/getsubopt.h>
diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
index 5fd5a2966..4b0e9d70f 100644
--- a/src/lxc/lxc_create.c
+++ b/src/lxc/lxc_create.c
@@ -27,10 +27,10 @@
 #include <sys/types.h>
 
 #include "arguments.h"
+#include "bdev.h"
 #include "log.h"
 #include "lxc.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 
 lxc_log_define(lxc_create_ui, lxc);
 
diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
index 147101eb4..8f44891b5 100644
--- a/src/lxc/lxc_snapshot.c
+++ b/src/lxc/lxc_snapshot.c
@@ -27,9 +27,9 @@
 
 #include <lxc/lxccontainer.h>
 
+#include "bdev.h"
 #include "lxc.h"
 #include "log.h"
-#include "bdev/bdev.h"
 #include "arguments.h"
 #include "utils.h"
 
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 8ea0005be..24ded6f3d 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -39,9 +39,9 @@
 #include <sys/wait.h>
 
 #include "attach.h"
-#include "bdev/bdev.h"
-#include "bdev/lxcoverlay.h"
-#include "bdev/lxcbtrfs.h"
+#include "bdev.h"
+#include "lxcoverlay.h"
+#include "lxcbtrfs.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "config.h"
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 1ba0f9bd7..1ce9903ed 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -55,6 +55,7 @@
 #endif
 
 #include "af_unix.h"
+#include "bdev.h"
 #include "caps.h"
 #include "cgroup.h"
 #include "commands.h"
@@ -71,7 +72,6 @@
 #include "start.h"
 #include "sync.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 #include "lsm/lsm.h"
 
 lxc_log_define(lxc_start, lxc);