diff --git a/src/drivers/usr/CMakeLists.txt b/src/drivers/usr/CMakeLists.txt
index 0aac35719..04fb251c2 100644
--- a/src/drivers/usr/CMakeLists.txt
+++ b/src/drivers/usr/CMakeLists.txt
@@ -5,18 +5,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 SET(ROBOT_NAME "usr")
 
 # Official-only USR interface.
-SET(ROBOT_INTERFACE LEGACY WELCOME
-                    usr_trb1
-                    usr_sc
-                    usr_ls1
-                    usr_ls2
-                    usr_mpa1
-                    usr_mpa11
-                    usr_mpa12
-                    usr_36GP
-                    usr_rs
-                    usr_lp1
-                    )
+SET(ROBOT_INTERFACE LEGACY WELCOME)
 
 SET(ROBOT_SOURCES
   src/usr.cpp
diff --git a/src/drivers/usr/src/pit.cpp b/src/drivers/usr/src/pit.cpp
index 3ba9f3a0d..35206f8c2 100644
--- a/src/drivers/usr/src/pit.cpp
+++ b/src/drivers/usr/src/pit.cpp
@@ -19,7 +19,7 @@
 
 
 #include "pit.h"
-#include "xmldefs.h"
+#include "globaldefs.h"
 
 const float Pit::SPEED_LIMIT_MARGIN = 0.5;		// [m/s] savety margin to avoid pit speeding.
 
diff --git a/src/drivers/usr/src/raceline.h b/src/drivers/usr/src/raceline.h
index a8c334bd1..33c3caa23 100644
--- a/src/drivers/usr/src/raceline.h
+++ b/src/drivers/usr/src/raceline.h
@@ -22,7 +22,7 @@
 
 #include "linalg.h"
 #include "mod.h"
-#include "xmldefs.h"
+#include "globaldefs.h"
 
 enum { LINE_MID=0, LINE_RL };
 enum { mode_normal=1, mode_correcting, mode_avoiding, mode_pitting };
diff --git a/src/drivers/usr/src/strategy.cpp b/src/drivers/usr/src/strategy.cpp
index 3cd855558..8ed866d39 100644
--- a/src/drivers/usr/src/strategy.cpp
+++ b/src/drivers/usr/src/strategy.cpp
@@ -23,7 +23,7 @@
 
 
 #include "strategy.h"
-#include "xmldefs.h"
+#include "globaldefs.h"
 
 const float SimpleStrategy::MAX_FUEL_PER_METER = 0.0008f;	// [kg/m] fuel consumtion.