diff --git a/linux/avb/global_definitions.h b/linux/avb/global_definitions.h
index 58988b1e..da520146 100644
--- a/linux/avb/global_definitions.h
+++ b/linux/avb/global_definitions.h
@@ -16,9 +16,9 @@
 #include "jack/jslist.h"
 
 
-#include "Open-AVB/daemons/mrpd/mrpd.h"
-#include "Open-AVB/daemons/mrpd/mrp.h"
-#include "Open-AVB/daemons/mrpd/msrp.h" // spurious dep daemons/mrpd/msrp.h:50:#define MSRP_LISTENER_ASKFAILED
+#include "OpenAvnu/daemons/mrpd/mrpd.h"
+#include "OpenAvnu/daemons/mrpd/mrp.h"
+#include "OpenAvnu/daemons/mrpd/msrp.h" // spurious dep daemons/mrpd/msrp.h:50:#define MSRP_LISTENER_ASKFAILED
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/wscript b/wscript
index 8cbf6519..fb18e67e 100644
--- a/wscript
+++ b/wscript
@@ -804,7 +804,7 @@ def build_drivers(bld):
 
 
     avb_src = [
-        'common/JackAVBDriver.cpp',
+        'linux/avb/JackAVBDriver.cpp',
         'linux/avb/avb_1722avtp.c',
         'linux/avb/avb_sockets.c',
         'linux/avb/listener_mediaclock.c',