diff --git a/Configure.py b/Configure.py
index cb48773b3..3839d65f5 100644
--- a/Configure.py
+++ b/Configure.py
@@ -485,16 +485,17 @@ DEFAULT_DEPENDENCIES = [
     GitRepository('https://github.com/carla-simulator/recastnavigation.git', tag_or_branch = 'carla')),
 ]
 
+# @TODO: Use these instead of full boost.
 BOOST_DEPENDENCIES_EXPERIMENTAL = [
   Dependency(
-  'boost-asio',
-  GitRepository('https://github.com/boostorg/asio.git')),
+    'boost-asio',
+    GitRepository('https://github.com/boostorg/asio.git')),
   Dependency(
-  'boost-python',
-  GitRepository('https://github.com/boostorg/python.git')),
+    'boost-python',
+    GitRepository('https://github.com/boostorg/python.git')),
   Dependency(
-  'boost-gil',
-  GitRepository('https://github.com/boostorg/gil.git')),
+    'boost-gil',
+    GitRepository('https://github.com/boostorg/gil.git')),
 ]
 
 CHRONO_DEPENDENCIES = [
diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
index 23b8feac0..da84f6380 100644
--- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
+++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Carla.Build.cs
@@ -154,7 +154,7 @@ public class Carla :
         var LibraryPrefix = IsWindows ? "" : "lib";
         var LibrarySuffix = IsWindows ? ".lib" : ".a";
 
-        var LibCarlaInstallPath = CarlaInstallPath;
+        var LibCarlaInstallPath = Path.Combine(CarlaInstallPath, "LibCarla");
         var DependenciesInstallPath = CarlaDependenciesPath;
 
         Func<string, string> GetLibraryName = name =>
@@ -232,22 +232,12 @@ public class Carla :
             GetIncludePath("zlib"),
         });
 
-        PrivateIncludePaths.Add(LibCarlaIncludePath);
-        PrivateIncludePaths.AddRange(new string[]
-        {
-            GetIncludePath("boost"),
-            GetIncludePath("rpclib"),
-            GetIncludePath("xercesc"),
-            GetIncludePath("sumo"),
-            GetIncludePath("zlib"),
-        });
-
-        PrivateDefinitions.Add("BOOST_DISABLE_ABI_HEADERS");
-        PrivateDefinitions.Add("BOOST_TYPE_INDEX_FORCE_NO_RTTI_COMPATIBILITY");
-        PrivateDefinitions.Add("ASIO_NO_EXCEPTIONS");
-        PrivateDefinitions.Add("BOOST_NO_EXCEPTIONS");
-        PrivateDefinitions.Add("LIBCARLA_NO_EXCEPTIONS");
-        PrivateDefinitions.Add("PUGIXML_NO_EXCEPTIONS");
+        PublicDefinitions.Add("ASIO_NO_EXCEPTIONS");
+        PublicDefinitions.Add("BOOST_NO_EXCEPTIONS");
+        PublicDefinitions.Add("LIBCARLA_NO_EXCEPTIONS");
+        PublicDefinitions.Add("PUGIXML_NO_EXCEPTIONS");
+        PublicDefinitions.Add("BOOST_DISABLE_ABI_HEADERS");
+        PublicDefinitions.Add("BOOST_TYPE_INDEX_FORCE_NO_RTTI_COMPATIBILITY");
     }
 
 #if false
diff --git a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs
index 061d1c1cf..cd9f3a9b2 100644
--- a/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs
+++ b/Unreal/CarlaUE4/Plugins/CarlaTools/Source/CarlaTools/CarlaTools.Build.cs
@@ -164,7 +164,7 @@ public class CarlaTools :
         var LibraryPrefix = IsWindows ? "" : "lib";
         var LibrarySuffix = IsWindows ? ".lib" : ".a";
 
-        var LibCarlaInstallPath = CarlaInstallPath;
+        var LibCarlaInstallPath = Path.Combine(CarlaInstallPath, "LibCarla");
         var DependenciesInstallPath = CarlaDependenciesPath;
 
         Func<string, string> GetLibraryName = name =>