166 files changed, 90 insertions, 69 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 4f33dcaa10d..b44b6db8804 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -112,6 +112,7 @@ add_subdirectory(nodes)
 add_subdirectory(modifiers)
 add_subdirectory(gpencil_modifiers)
 add_subdirectory(shader_fx)
+add_subdirectory(io)
 add_subdirectory(makesdna)
 add_subdirectory(makesrna)
 
@@ -135,29 +136,14 @@ if(WITH_IMAGE_CINEON)
   add_subdirectory(imbuf/intern/cineon)
 endif()
 
-if(WITH_CODEC_AVI)
-  add_subdirectory(avi)
-endif()
-
 if(WITH_PYTHON)
   add_subdirectory(python)
 endif()
 
-if(WITH_OPENCOLLADA)
-  add_subdirectory(collada)
-endif()
-
 if(WITH_FREESTYLE)
   add_subdirectory(freestyle)
 endif()
 
-if(WITH_ALEMBIC)
-  add_subdirectory(alembic)
-endif()
-
 if(WIN32)
   add_subdirectory(blendthumb)
 endif()
-if(WITH_USD)
-  add_subdirectory(usd)
-endif()
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 87ac82aaa55..58f05f65bef 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -487,7 +487,7 @@ endif()
 
 if(WITH_CODEC_AVI)
   list(APPEND INC
-    ../avi
+    ../io/avi
   )
   add_definitions(-DWITH_AVI)
 endif()
@@ -608,7 +608,7 @@ endif()
 
 if(WITH_ALEMBIC)
   list(APPEND INC
-    ../alembic
+    ../io/alembic
   )
   add_definitions(-DWITH_ALEMBIC)
 endif()
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index 1520c7b82b8..450d3fc2371 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -87,7 +87,7 @@ endif()
 
 if(WITH_ALEMBIC)
   list(APPEND INC
-    ../alembic
+    ../io/alembic
   )
   add_definitions(-DWITH_ALEMBIC)
 endif()
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index 5afe348158f..39548449a86 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -17,16 +17,16 @@
 
 set(INC
   ../include
-  ../../alembic
   ../../blenkernel
   ../../blenlib
   ../../blentranslation
   ../../bmesh
-  ../../collada
   ../../depsgraph
+  ../../io/alembic
+  ../../io/collada
+  ../../io/usd
   ../../makesdna
   ../../makesrna
-  ../../usd
   ../../windowmanager
   ../../../../intern/guardedalloc
 )
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index 3f51504d6ac..15fee4db73f 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -48,7 +48,7 @@
 #  include "WM_api.h"
 #  include "WM_types.h"
 
-#  include "../../collada/collada.h"
+#  include "collada.h"
 
 #  include "io_collada.h"
 
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt
index 7aab644fc12..cad0be659ec 100644
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -143,7 +143,7 @@ endif()
 
 if(WITH_CODEC_AVI)
   list(APPEND INC
-    ../avi
+    ../io/avi
   )
   list(APPEND LIB
     bf_avi
diff --git a/source/blender/io/CMakeLists.txt b/source/blender/io/CMakeLists.txt
new file mode 100644
index 00000000000..bc2f8d628e2
--- /dev/null
+++ b/source/blender/io/CMakeLists.txt
@@ -0,0 +1,35 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2020, Blender Foundation
+# All rights reserved.
+# ***** END GPL LICENSE BLOCK *****
+
+if(WITH_ALEMBIC)
+  add_subdirectory(alembic)
+endif()
+
+if(WITH_CODEC_AVI)
+  add_subdirectory(avi)
+endif()
+
+if(WITH_OPENCOLLADA)
+  add_subdirectory(collada)
+endif()
+
+if(WITH_USD)
+  add_subdirectory(usd)
+endif()
diff --git a/source/blender/alembic/ABC_alembic.h b/source/blender/io/alembic/ABC_alembic.h
index 878dbfc2a53..878dbfc2a53 100644
--- a/source/blender/alembic/ABC_alembic.h
+++ b/source/blender/io/alembic/ABC_alembic.h
diff --git a/source/blender/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt
index 8bb7051982a..cbcdfaf4b77 100644
--- a/source/blender/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -20,17 +20,17 @@
 
 set(INC
   .
-  ../blenkernel
-  ../blenlib
-  ../blenloader
-  ../bmesh
-  ../depsgraph
-  ../editors/include
-  ../makesdna
-  ../makesrna
-  ../windowmanager
-  ../../../intern/guardedalloc
-  ../../../intern/utfconv
+  ../../blenkernel
+  ../../blenlib
+  ../../blenloader
+  ../../bmesh
+  ../../depsgraph
+  ../../editors/include
+  ../../makesdna
+  ../../makesrna
+  ../../windowmanager
+  ../../../../intern/guardedalloc
+  ../../../../intern/utfconv
 )
 
 set(INC_SYS
diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/io/alembic/intern/abc_customdata.cc
index c5f60ac3e29..c5f60ac3e29 100644
--- a/source/blender/alembic/intern/abc_customdata.cc
+++ b/source/blender/io/alembic/intern/abc_customdata.cc
diff --git a/source/blender/alembic/intern/abc_customdata.h b/source/blender/io/alembic/intern/abc_customdata.h
index 6107e230627..6107e230627 100644
--- a/source/blender/alembic/intern/abc_customdata.h
+++ b/source/blender/io/alembic/intern/abc_customdata.h
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/io/alembic/intern/abc_exporter.cc
index a58b0a29e5e..a58b0a29e5e 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/io/alembic/intern/abc_exporter.cc
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/io/alembic/intern/abc_exporter.h
index 398004d2ec5..398004d2ec5 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/io/alembic/intern/abc_exporter.h
diff --git a/source/blender/alembic/intern/abc_reader_archive.cc b/source/blender/io/alembic/intern/abc_reader_archive.cc
index 6ad44553701..6ad44553701 100644
--- a/source/blender/alembic/intern/abc_reader_archive.cc
+++ b/source/blender/io/alembic/intern/abc_reader_archive.cc
diff --git a/source/blender/alembic/intern/abc_reader_archive.h b/source/blender/io/alembic/intern/abc_reader_archive.h
index bdb53bd0b8c..bdb53bd0b8c 100644
--- a/source/blender/alembic/intern/abc_reader_archive.h
+++ b/source/blender/io/alembic/intern/abc_reader_archive.h
diff --git a/source/blender/alembic/intern/abc_reader_camera.cc b/source/blender/io/alembic/intern/abc_reader_camera.cc
index ab506f32cbe..ab506f32cbe 100644
--- a/source/blender/alembic/intern/abc_reader_camera.cc
+++ b/source/blender/io/alembic/intern/abc_reader_camera.cc
diff --git a/source/blender/alembic/intern/abc_reader_camera.h b/source/blender/io/alembic/intern/abc_reader_camera.h
index 1d9763b0454..1d9763b0454 100644
--- a/source/blender/alembic/intern/abc_reader_camera.h
+++ b/source/blender/io/alembic/intern/abc_reader_camera.h
diff --git a/source/blender/alembic/intern/abc_reader_curves.cc b/source/blender/io/alembic/intern/abc_reader_curves.cc
index 1be164c7c94..1be164c7c94 100644
--- a/source/blender/alembic/intern/abc_reader_curves.cc
+++ b/source/blender/io/alembic/intern/abc_reader_curves.cc
diff --git a/source/blender/alembic/intern/abc_reader_curves.h b/source/blender/io/alembic/intern/abc_reader_curves.h
index 1e4f28edc51..1e4f28edc51 100644
--- a/source/blender/alembic/intern/abc_reader_curves.h
+++ b/source/blender/io/alembic/intern/abc_reader_curves.h
diff --git a/source/blender/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc
index a4e412695c3..a4e412695c3 100644
--- a/source/blender/alembic/intern/abc_reader_mesh.cc
+++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc
diff --git a/source/blender/alembic/intern/abc_reader_mesh.h b/source/blender/io/alembic/intern/abc_reader_mesh.h
index bc95c7ec134..bc95c7ec134 100644
--- a/source/blender/alembic/intern/abc_reader_mesh.h
+++ b/source/blender/io/alembic/intern/abc_reader_mesh.h
diff --git a/source/blender/alembic/intern/abc_reader_nurbs.cc b/source/blender/io/alembic/intern/abc_reader_nurbs.cc
index 0ada10baba5..0ada10baba5 100644
--- a/source/blender/alembic/intern/abc_reader_nurbs.cc
+++ b/source/blender/io/alembic/intern/abc_reader_nurbs.cc
diff --git a/source/blender/alembic/intern/abc_reader_nurbs.h b/source/blender/io/alembic/intern/abc_reader_nurbs.h
index f4284c136fb..f4284c136fb 100644
--- a/source/blender/alembic/intern/abc_reader_nurbs.h
+++ b/source/blender/io/alembic/intern/abc_reader_nurbs.h
diff --git a/source/blender/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc
index 3e7f87d78cc..3e7f87d78cc 100644
--- a/source/blender/alembic/intern/abc_reader_object.cc
+++ b/source/blender/io/alembic/intern/abc_reader_object.cc
diff --git a/source/blender/alembic/intern/abc_reader_object.h b/source/blender/io/alembic/intern/abc_reader_object.h
index 94923df2df9..94923df2df9 100644
--- a/source/blender/alembic/intern/abc_reader_object.h
+++ b/source/blender/io/alembic/intern/abc_reader_object.h
diff --git a/source/blender/alembic/intern/abc_reader_points.cc b/source/blender/io/alembic/intern/abc_reader_points.cc
index e4dc345f868..e4dc345f868 100644
--- a/source/blender/alembic/intern/abc_reader_points.cc
+++ b/source/blender/io/alembic/intern/abc_reader_points.cc
diff --git a/source/blender/alembic/intern/abc_reader_points.h b/source/blender/io/alembic/intern/abc_reader_points.h
index 31ad6c4589b..31ad6c4589b 100644
--- a/source/blender/alembic/intern/abc_reader_points.h
+++ b/source/blender/io/alembic/intern/abc_reader_points.h
diff --git a/source/blender/alembic/intern/abc_reader_transform.cc b/source/blender/io/alembic/intern/abc_reader_transform.cc
index ce569a9ccb5..ce569a9ccb5 100644
--- a/source/blender/alembic/intern/abc_reader_transform.cc
+++ b/source/blender/io/alembic/intern/abc_reader_transform.cc
diff --git a/source/blender/alembic/intern/abc_reader_transform.h b/source/blender/io/alembic/intern/abc_reader_transform.h
index 6b4d23c1884..6b4d23c1884 100644
--- a/source/blender/alembic/intern/abc_reader_transform.h
+++ b/source/blender/io/alembic/intern/abc_reader_transform.h
diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/io/alembic/intern/abc_util.cc
index b26ef8b3b76..b26ef8b3b76 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/io/alembic/intern/abc_util.cc
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/io/alembic/intern/abc_util.h
index 0b3462c2132..0b3462c2132 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/io/alembic/intern/abc_util.h
diff --git a/source/blender/alembic/intern/abc_writer_archive.cc b/source/blender/io/alembic/intern/abc_writer_archive.cc
index af18d480a18..af18d480a18 100644
--- a/source/blender/alembic/intern/abc_writer_archive.cc
+++ b/source/blender/io/alembic/intern/abc_writer_archive.cc
diff --git a/source/blender/alembic/intern/abc_writer_archive.h b/source/blender/io/alembic/intern/abc_writer_archive.h
index e261e60990a..e261e60990a 100644
--- a/source/blender/alembic/intern/abc_writer_archive.h
+++ b/source/blender/io/alembic/intern/abc_writer_archive.h
diff --git a/source/blender/alembic/intern/abc_writer_camera.cc b/source/blender/io/alembic/intern/abc_writer_camera.cc
index e705e5ba911..e705e5ba911 100644
--- a/source/blender/alembic/intern/abc_writer_camera.cc
+++ b/source/blender/io/alembic/intern/abc_writer_camera.cc
diff --git a/source/blender/alembic/intern/abc_writer_camera.h b/source/blender/io/alembic/intern/abc_writer_camera.h
index 3b515911a48..3b515911a48 100644
--- a/source/blender/alembic/intern/abc_writer_camera.h
+++ b/source/blender/io/alembic/intern/abc_writer_camera.h
diff --git a/source/blender/alembic/intern/abc_writer_curves.cc b/source/blender/io/alembic/intern/abc_writer_curves.cc
index 3ab9b365a72..3ab9b365a72 100644
--- a/source/blender/alembic/intern/abc_writer_curves.cc
+++ b/source/blender/io/alembic/intern/abc_writer_curves.cc
diff --git a/source/blender/alembic/intern/abc_writer_curves.h b/source/blender/io/alembic/intern/abc_writer_curves.h
index d6d8c0a7f11..d6d8c0a7f11 100644
--- a/source/blender/alembic/intern/abc_writer_curves.h
+++ b/source/blender/io/alembic/intern/abc_writer_curves.h
diff --git a/source/blender/alembic/intern/abc_writer_hair.cc b/source/blender/io/alembic/intern/abc_writer_hair.cc
index bbba03ed7f4..bbba03ed7f4 100644
--- a/source/blender/alembic/intern/abc_writer_hair.cc
+++ b/source/blender/io/alembic/intern/abc_writer_hair.cc
diff --git a/source/blender/alembic/intern/abc_writer_hair.h b/source/blender/io/alembic/intern/abc_writer_hair.h
index 67d1b7b3d23..67d1b7b3d23 100644
--- a/source/blender/alembic/intern/abc_writer_hair.h
+++ b/source/blender/io/alembic/intern/abc_writer_hair.h
diff --git a/source/blender/alembic/intern/abc_writer_mball.cc b/source/blender/io/alembic/intern/abc_writer_mball.cc
index cc0775bd537..cc0775bd537 100644
--- a/source/blender/alembic/intern/abc_writer_mball.cc
+++ b/source/blender/io/alembic/intern/abc_writer_mball.cc
diff --git a/source/blender/alembic/intern/abc_writer_mball.h b/source/blender/io/alembic/intern/abc_writer_mball.h
index c752472c86d..c752472c86d 100644
--- a/source/blender/alembic/intern/abc_writer_mball.h
+++ b/source/blender/io/alembic/intern/abc_writer_mball.h
diff --git a/source/blender/alembic/intern/abc_writer_mesh.cc b/source/blender/io/alembic/intern/abc_writer_mesh.cc
index b55d2473f99..b55d2473f99 100644
--- a/source/blender/alembic/intern/abc_writer_mesh.cc
+++ b/source/blender/io/alembic/intern/abc_writer_mesh.cc
diff --git a/source/blender/alembic/intern/abc_writer_mesh.h b/source/blender/io/alembic/intern/abc_writer_mesh.h
index 9152a370e4f..9152a370e4f 100644
--- a/source/blender/alembic/intern/abc_writer_mesh.h
+++ b/source/blender/io/alembic/intern/abc_writer_mesh.h
diff --git a/source/blender/alembic/intern/abc_writer_nurbs.cc b/source/blender/io/alembic/intern/abc_writer_nurbs.cc
index 9796eaf54c3..9796eaf54c3 100644
--- a/source/blender/alembic/intern/abc_writer_nurbs.cc
+++ b/source/blender/io/alembic/intern/abc_writer_nurbs.cc
diff --git a/source/blender/alembic/intern/abc_writer_nurbs.h b/source/blender/io/alembic/intern/abc_writer_nurbs.h
index c6a3c399b66..c6a3c399b66 100644
--- a/source/blender/alembic/intern/abc_writer_nurbs.h
+++ b/source/blender/io/alembic/intern/abc_writer_nurbs.h
diff --git a/source/blender/alembic/intern/abc_writer_object.cc b/source/blender/io/alembic/intern/abc_writer_object.cc
index 75dc93bd08e..75dc93bd08e 100644
--- a/source/blender/alembic/intern/abc_writer_object.cc
+++ b/source/blender/io/alembic/intern/abc_writer_object.cc
diff --git a/source/blender/alembic/intern/abc_writer_object.h b/source/blender/io/alembic/intern/abc_writer_object.h
index c3511566372..c3511566372 100644
--- a/source/blender/alembic/intern/abc_writer_object.h
+++ b/source/blender/io/alembic/intern/abc_writer_object.h
diff --git a/source/blender/alembic/intern/abc_writer_points.cc b/source/blender/io/alembic/intern/abc_writer_points.cc
index cc4abe8ec4b..cc4abe8ec4b 100644
--- a/source/blender/alembic/intern/abc_writer_points.cc
+++ b/source/blender/io/alembic/intern/abc_writer_points.cc
diff --git a/source/blender/alembic/intern/abc_writer_points.h b/source/blender/io/alembic/intern/abc_writer_points.h
index 77dd10c4b26..77dd10c4b26 100644
--- a/source/blender/alembic/intern/abc_writer_points.h
+++ b/source/blender/io/alembic/intern/abc_writer_points.h
diff --git a/source/blender/alembic/intern/abc_writer_transform.cc b/source/blender/io/alembic/intern/abc_writer_transform.cc
index d7bcc46d96f..d7bcc46d96f 100644
--- a/source/blender/alembic/intern/abc_writer_transform.cc
+++ b/source/blender/io/alembic/intern/abc_writer_transform.cc
diff --git a/source/blender/alembic/intern/abc_writer_transform.h b/source/blender/io/alembic/intern/abc_writer_transform.h
index 4397b220761..4397b220761 100644
--- a/source/blender/alembic/intern/abc_writer_transform.h
+++ b/source/blender/io/alembic/intern/abc_writer_transform.h
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc
index c6f9e284d53..c6f9e284d53 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
diff --git a/source/blender/avi/AVI_avi.h b/source/blender/io/avi/AVI_avi.h
index 4f3aa720da3..4f3aa720da3 100644
--- a/source/blender/avi/AVI_avi.h
+++ b/source/blender/io/avi/AVI_avi.h
diff --git a/source/blender/avi/CMakeLists.txt b/source/blender/io/avi/CMakeLists.txt
index eafb299944d..76c90353673 100644
--- a/source/blender/avi/CMakeLists.txt
+++ b/source/blender/io/avi/CMakeLists.txt
@@ -20,9 +20,9 @@
 
 set(INC
   .
-  ../blenlib
-  ../imbuf
-  ../../../intern/guardedalloc
+  ../../blenlib
+  ../../imbuf
+  ../../../../intern/guardedalloc
 )
 
 set(INC_SYS
diff --git a/source/blender/avi/intern/avi.c b/source/blender/io/avi/intern/avi.c
index 22eb0be0cc0..22eb0be0cc0 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/io/avi/intern/avi.c
diff --git a/source/blender/avi/intern/avi_codecs.c b/source/blender/io/avi/intern/avi_codecs.c
index 15f498ac653..15f498ac653 100644
--- a/source/blender/avi/intern/avi_codecs.c
+++ b/source/blender/io/avi/intern/avi_codecs.c
diff --git a/source/blender/avi/intern/avi_endian.c b/source/blender/io/avi/intern/avi_endian.c
index 56474e9e329..56474e9e329 100644
--- a/source/blender/avi/intern/avi_endian.c
+++ b/source/blender/io/avi/intern/avi_endian.c
diff --git a/source/blender/avi/intern/avi_endian.h b/source/blender/io/avi/intern/avi_endian.h
index d1253f488e7..d1253f488e7 100644
--- a/source/blender/avi/intern/avi_endian.h
+++ b/source/blender/io/avi/intern/avi_endian.h
diff --git a/source/blender/avi/intern/avi_intern.h b/source/blender/io/avi/intern/avi_intern.h
index 6ce91ce7f70..6ce91ce7f70 100644
--- a/source/blender/avi/intern/avi_intern.h
+++ b/source/blender/io/avi/intern/avi_intern.h
diff --git a/source/blender/avi/intern/avi_mjpeg.c b/source/blender/io/avi/intern/avi_mjpeg.c
index d4c7378964e..d4c7378964e 100644
--- a/source/blender/avi/intern/avi_mjpeg.c
+++ b/source/blender/io/avi/intern/avi_mjpeg.c
diff --git a/source/blender/avi/intern/avi_mjpeg.h b/source/blender/io/avi/intern/avi_mjpeg.h
index 30e46bf1d0c..30e46bf1d0c 100644
--- a/source/blender/avi/intern/avi_mjpeg.h
+++ b/source/blender/io/avi/intern/avi_mjpeg.h
diff --git a/source/blender/avi/intern/avi_options.c b/source/blender/io/avi/intern/avi_options.c
index 65db8c19397..65db8c19397 100644
--- a/source/blender/avi/intern/avi_options.c
+++ b/source/blender/io/avi/intern/avi_options.c
diff --git a/source/blender/avi/intern/avi_rgb.c b/source/blender/io/avi/intern/avi_rgb.c
index d449556e79b..d449556e79b 100644
--- a/source/blender/avi/intern/avi_rgb.c
+++ b/source/blender/io/avi/intern/avi_rgb.c
diff --git a/source/blender/avi/intern/avi_rgb.h b/source/blender/io/avi/intern/avi_rgb.h
index 7c8ce590d27..7c8ce590d27 100644
--- a/source/blender/avi/intern/avi_rgb.h
+++ b/source/blender/io/avi/intern/avi_rgb.h
diff --git a/source/blender/avi/intern/avi_rgb32.c b/source/blender/io/avi/intern/avi_rgb32.c
index 3efa4814c70..3efa4814c70 100644
--- a/source/blender/avi/intern/avi_rgb32.c
+++ b/source/blender/io/avi/intern/avi_rgb32.c
diff --git a/source/blender/avi/intern/avi_rgb32.h b/source/blender/io/avi/intern/avi_rgb32.h
index eb4b9ca4e21..eb4b9ca4e21 100644
--- a/source/blender/avi/intern/avi_rgb32.h
+++ b/source/blender/io/avi/intern/avi_rgb32.h
diff --git a/source/blender/collada/AnimationClipExporter.cpp b/source/blender/io/collada/AnimationClipExporter.cpp
index 5868c24e6cd..5868c24e6cd 100644
--- a/source/blender/collada/AnimationClipExporter.cpp
+++ b/source/blender/io/collada/AnimationClipExporter.cpp
diff --git a/source/blender/collada/AnimationClipExporter.h b/source/blender/io/collada/AnimationClipExporter.h
index 25c69fe6b93..25c69fe6b93 100644
--- a/source/blender/collada/AnimationClipExporter.h
+++ b/source/blender/io/collada/AnimationClipExporter.h
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/io/collada/AnimationExporter.cpp
index cd4319e3101..cd4319e3101 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/io/collada/AnimationExporter.cpp
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h
index 64751ec5327..64751ec5327 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/io/collada/AnimationExporter.h
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp
index 715cd9e1a12..715cd9e1a12 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/io/collada/AnimationImporter.cpp
diff --git a/source/blender/collada/AnimationImporter.h b/source/blender/io/collada/AnimationImporter.h
index 0043dad7116..0043dad7116 100644
--- a/source/blender/collada/AnimationImporter.h
+++ b/source/blender/io/collada/AnimationImporter.h
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp
index 84979cc4ca4..84979cc4ca4 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/io/collada/ArmatureExporter.cpp
diff --git a/source/blender/collada/ArmatureExporter.h b/source/blender/io/collada/ArmatureExporter.h
index da6d6f79ef5..da6d6f79ef5 100644
--- a/source/blender/collada/ArmatureExporter.h
+++ b/source/blender/io/collada/ArmatureExporter.h
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp
index b8c534f97dd..b8c534f97dd 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/io/collada/ArmatureImporter.cpp
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/io/collada/ArmatureImporter.h
index da92c04e5dc..da92c04e5dc 100644
--- a/source/blender/collada/ArmatureImporter.h
+++ b/source/blender/io/collada/ArmatureImporter.h
diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/io/collada/BCAnimationCurve.cpp
index 36800d611d2..36800d611d2 100644
--- a/source/blender/collada/BCAnimationCurve.cpp
+++ b/source/blender/io/collada/BCAnimationCurve.cpp
diff --git a/source/blender/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h
index 7b523ac53ca..7b523ac53ca 100644
--- a/source/blender/collada/BCAnimationCurve.h
+++ b/source/blender/io/collada/BCAnimationCurve.h
diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp
index e6996e95a5b..e6996e95a5b 100644
--- a/source/blender/collada/BCAnimationSampler.cpp
+++ b/source/blender/io/collada/BCAnimationSampler.cpp
diff --git a/source/blender/collada/BCAnimationSampler.h b/source/blender/io/collada/BCAnimationSampler.h
index 96138d0cbca..96138d0cbca 100644
--- a/source/blender/collada/BCAnimationSampler.h
+++ b/source/blender/io/collada/BCAnimationSampler.h
diff --git a/source/blender/collada/BCMath.cpp b/source/blender/io/collada/BCMath.cpp
index ec9977c1469..ec9977c1469 100644
--- a/source/blender/collada/BCMath.cpp
+++ b/source/blender/io/collada/BCMath.cpp
diff --git a/source/blender/collada/BCMath.h b/source/blender/io/collada/BCMath.h
index 9ecea85b08c..9ecea85b08c 100644
--- a/source/blender/collada/BCMath.h
+++ b/source/blender/io/collada/BCMath.h
diff --git a/source/blender/collada/BCSampleData.cpp b/source/blender/io/collada/BCSampleData.cpp
index 7e23a2de00f..7e23a2de00f 100644
--- a/source/blender/collada/BCSampleData.cpp
+++ b/source/blender/io/collada/BCSampleData.cpp
diff --git a/source/blender/collada/BCSampleData.h b/source/blender/io/collada/BCSampleData.h
index 07ecb544c71..07ecb544c71 100644
--- a/source/blender/collada/BCSampleData.h
+++ b/source/blender/io/collada/BCSampleData.h
diff --git a/source/blender/collada/BlenderContext.cpp b/source/blender/io/collada/BlenderContext.cpp
index a9783a9b9c4..a9783a9b9c4 100644
--- a/source/blender/collada/BlenderContext.cpp
+++ b/source/blender/io/collada/BlenderContext.cpp
diff --git a/source/blender/collada/BlenderContext.h b/source/blender/io/collada/BlenderContext.h
index 50781e8eede..50781e8eede 100644
--- a/source/blender/collada/BlenderContext.h
+++ b/source/blender/io/collada/BlenderContext.h
diff --git a/source/blender/collada/BlenderTypes.h b/source/blender/io/collada/BlenderTypes.h
index 0e024be2374..0e024be2374 100644
--- a/source/blender/collada/BlenderTypes.h
+++ b/source/blender/io/collada/BlenderTypes.h
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt
index 6f1c6922d63..8ffce9e3e7e 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -33,19 +33,19 @@ endif()
 
 set(INC
   .
-  ../blenkernel
-  ../blenlib
-  ../blentranslation
-  ../depsgraph
-  ../editors/include
-  ../imbuf
-  ../makesdna
-  ../makesrna
-  ../windowmanager
-  ../../../intern/guardedalloc
-  ../ikplugin
-  ../../../intern/iksolver/extern
-  ../bmesh
+  ../../blenkernel
+  ../../blenlib
+  ../../blentranslation
+  ../../depsgraph
+  ../../editors/include
+  ../../imbuf
+  ../../makesdna
+  ../../makesrna
+  ../../windowmanager
+  ../../../../intern/guardedalloc
+  ../../ikplugin
+  ../../../../intern/iksolver/extern
+  ../../bmesh
 )
 
 set(INC_SYS
diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/io/collada/CameraExporter.cpp
index 74862c44270..74862c44270 100644
--- a/source/blender/collada/CameraExporter.cpp
+++ b/source/blender/io/collada/CameraExporter.cpp
diff --git a/source/blender/collada/CameraExporter.h b/source/blender/io/collada/CameraExporter.h
index 04bcc4a5dad..04bcc4a5dad 100644
--- a/source/blender/collada/CameraExporter.h
+++ b/source/blender/io/collada/CameraExporter.h
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/io/collada/ControllerExporter.cpp
index 0119aba7dfd..0119aba7dfd 100644
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/io/collada/ControllerExporter.cpp
diff --git a/source/blender/collada/ControllerExporter.h b/source/blender/io/collada/ControllerExporter.h
index ce2ed9fe453..ce2ed9fe453 100644
--- a/source/blender/collada/ControllerExporter.h
+++ b/source/blender/io/collada/ControllerExporter.h
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp
index 24a960ab287..24a960ab287 100644
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/io/collada/DocumentExporter.cpp
diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/io/collada/DocumentExporter.h
index 70722ae601e..70722ae601e 100644
--- a/source/blender/collada/DocumentExporter.h
+++ b/source/blender/io/collada/DocumentExporter.h
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp
index 9b66ff429e1..9b66ff429e1 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/io/collada/DocumentImporter.cpp
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/io/collada/DocumentImporter.h
index e47c844f7c6..e47c844f7c6 100644
--- a/source/blender/collada/DocumentImporter.h
+++ b/source/blender/io/collada/DocumentImporter.h
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/io/collada/EffectExporter.cpp
index a1174fdff56..a1174fdff56 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/io/collada/EffectExporter.cpp
diff --git a/source/blender/collada/EffectExporter.h b/source/blender/io/collada/EffectExporter.h
index 57df844233c..57df844233c 100644
--- a/source/blender/collada/EffectExporter.h
+++ b/source/blender/io/collada/EffectExporter.h
diff --git a/source/blender/collada/ErrorHandler.cpp b/source/blender/io/collada/ErrorHandler.cpp
index 286bcbfb759..286bcbfb759 100644
--- a/source/blender/collada/ErrorHandler.cpp
+++ b/source/blender/io/collada/ErrorHandler.cpp
diff --git a/source/blender/collada/ErrorHandler.h b/source/blender/io/collada/ErrorHandler.h
index f040855244d..f040855244d 100644
--- a/source/blender/collada/ErrorHandler.h
+++ b/source/blender/io/collada/ErrorHandler.h
diff --git a/source/blender/collada/ExportSettings.cpp b/source/blender/io/collada/ExportSettings.cpp
index da3c0de0fdf..da3c0de0fdf 100644
--- a/source/blender/collada/ExportSettings.cpp
+++ b/source/blender/io/collada/ExportSettings.cpp
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/io/collada/ExportSettings.h
index 1e158418120..1e158418120 100644
--- a/source/blender/collada/ExportSettings.h
+++ b/source/blender/io/collada/ExportSettings.h
diff --git a/source/blender/collada/ExtraHandler.cpp b/source/blender/io/collada/ExtraHandler.cpp
index 4875ee72b0f..4875ee72b0f 100644
--- a/source/blender/collada/ExtraHandler.cpp
+++ b/source/blender/io/collada/ExtraHandler.cpp
diff --git a/source/blender/collada/ExtraHandler.h b/source/blender/io/collada/ExtraHandler.h
index 021eb8e9663..021eb8e9663 100644
--- a/source/blender/collada/ExtraHandler.h
+++ b/source/blender/io/collada/ExtraHandler.h
diff --git a/source/blender/collada/ExtraTags.cpp b/source/blender/io/collada/ExtraTags.cpp
index 496ba3891f7..496ba3891f7 100644
--- a/source/blender/collada/ExtraTags.cpp
+++ b/source/blender/io/collada/ExtraTags.cpp
diff --git a/source/blender/collada/ExtraTags.h b/source/blender/io/collada/ExtraTags.h
index 9191182c757..9191182c757 100644
--- a/source/blender/collada/ExtraTags.h
+++ b/source/blender/io/collada/ExtraTags.h
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp
index 640bf3c0633..640bf3c0633 100644
--- a/source/blender/collada/GeometryExporter.cpp
+++ b/source/blender/io/collada/GeometryExporter.cpp
diff --git a/source/blender/collada/GeometryExporter.h b/source/blender/io/collada/GeometryExporter.h
index 8c7a38fc407..8c7a38fc407 100644
--- a/source/blender/collada/GeometryExporter.h
+++ b/source/blender/io/collada/GeometryExporter.h
diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/io/collada/ImageExporter.cpp
index 6e31e17fb26..6e31e17fb26 100644
--- a/source/blender/collada/ImageExporter.cpp
+++ b/source/blender/io/collada/ImageExporter.cpp
diff --git a/source/blender/collada/ImageExporter.h b/source/blender/io/collada/ImageExporter.h
index b72d2709382..b72d2709382 100644
--- a/source/blender/collada/ImageExporter.h
+++ b/source/blender/io/collada/ImageExporter.h
diff --git a/source/blender/collada/ImportSettings.cpp b/source/blender/io/collada/ImportSettings.cpp
index 049ee1d0975..049ee1d0975 100644
--- a/source/blender/collada/ImportSettings.cpp
+++ b/source/blender/io/collada/ImportSettings.cpp
diff --git a/source/blender/collada/ImportSettings.h b/source/blender/io/collada/ImportSettings.h
index 608d8bff882..608d8bff882 100644
--- a/source/blender/collada/ImportSettings.h
+++ b/source/blender/io/collada/ImportSettings.h
diff --git a/source/blender/collada/InstanceWriter.cpp b/source/blender/io/collada/InstanceWriter.cpp
index c9390d23fe7..c9390d23fe7 100644
--- a/source/blender/collada/InstanceWriter.cpp
+++ b/source/blender/io/collada/InstanceWriter.cpp
diff --git a/source/blender/collada/InstanceWriter.h b/source/blender/io/collada/InstanceWriter.h
index cfec1cf7006..cfec1cf7006 100644
--- a/source/blender/collada/InstanceWriter.h
+++ b/source/blender/io/collada/InstanceWriter.h
diff --git a/source/blender/collada/LightExporter.cpp b/source/blender/io/collada/LightExporter.cpp
index 463981ceefa..463981ceefa 100644
--- a/source/blender/collada/LightExporter.cpp
+++ b/source/blender/io/collada/LightExporter.cpp
diff --git a/source/blender/collada/LightExporter.h b/source/blender/io/collada/LightExporter.h
index 045ccfe1ce8..045ccfe1ce8 100644
--- a/source/blender/collada/LightExporter.h
+++ b/source/blender/io/collada/LightExporter.h
diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/io/collada/MaterialExporter.cpp
index 488d1833e48..488d1833e48 100644
--- a/source/blender/collada/MaterialExporter.cpp
+++ b/source/blender/io/collada/MaterialExporter.cpp
diff --git a/source/blender/collada/MaterialExporter.h b/source/blender/io/collada/MaterialExporter.h
index be0d939b68a..be0d939b68a 100644
--- a/source/blender/collada/MaterialExporter.h
+++ b/source/blender/io/collada/MaterialExporter.h
diff --git a/source/blender/collada/Materials.cpp b/source/blender/io/collada/Materials.cpp
index 06f54884668..06f54884668 100644
--- a/source/blender/collada/Materials.cpp
+++ b/source/blender/io/collada/Materials.cpp
diff --git a/source/blender/collada/Materials.h b/source/blender/io/collada/Materials.h
index 0a4f2ee61a5..0a4f2ee61a5 100644
--- a/source/blender/collada/Materials.h
+++ b/source/blender/io/collada/Materials.h
diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp
index bc6dd4202b1..bc6dd4202b1 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/io/collada/MeshImporter.cpp
diff --git a/source/blender/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h
index 9517587013d..9517587013d 100644
--- a/source/blender/collada/MeshImporter.h
+++ b/source/blender/io/collada/MeshImporter.h
diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/io/collada/SceneExporter.cpp
index 42901bd2a4a..42901bd2a4a 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/io/collada/SceneExporter.cpp
diff --git a/source/blender/collada/SceneExporter.h b/source/blender/io/collada/SceneExporter.h
index a61d045ad5d..a61d045ad5d 100644
--- a/source/blender/collada/SceneExporter.h
+++ b/source/blender/io/collada/SceneExporter.h
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp
index d8804a1e831..d8804a1e831 100644
--- a/source/blender/collada/SkinInfo.cpp
+++ b/source/blender/io/collada/SkinInfo.cpp
diff --git a/source/blender/collada/SkinInfo.h b/source/blender/io/collada/SkinInfo.h
index 255d6d9b1f3..255d6d9b1f3 100644
--- a/source/blender/collada/SkinInfo.h
+++ b/source/blender/io/collada/SkinInfo.h
diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/io/collada/TransformReader.cpp
index 8ee31f80405..8ee31f80405 100644
--- a/source/blender/collada/TransformReader.cpp
+++ b/source/blender/io/collada/TransformReader.cpp
diff --git a/source/blender/collada/TransformReader.h b/source/blender/io/collada/TransformReader.h
index 2cf3ee795ae..2cf3ee795ae 100644
--- a/source/blender/collada/TransformReader.h
+++ b/source/blender/io/collada/TransformReader.h
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/io/collada/TransformWriter.cpp
index 0a66db72cb9..0a66db72cb9 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/io/collada/TransformWriter.cpp
diff --git a/source/blender/collada/TransformWriter.h b/source/blender/io/collada/TransformWriter.h
index d2e4b369cdc..d2e4b369cdc 100644
--- a/source/blender/collada/TransformWriter.h
+++ b/source/blender/io/collada/TransformWriter.h
diff --git a/source/blender/collada/collada.cpp b/source/blender/io/collada/collada.cpp
index ea5600aa850..ea5600aa850 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/io/collada/collada.cpp
diff --git a/source/blender/collada/collada.h b/source/blender/io/collada/collada.h
index 72753e170a3..72753e170a3 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/io/collada/collada.h
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/io/collada/collada_internal.cpp
index 7e834045795..7e834045795 100644
--- a/source/blender/collada/collada_internal.cpp
+++ b/source/blender/io/collada/collada_internal.cpp
diff --git a/source/blender/collada/collada_internal.h b/source/blender/io/collada/collada_internal.h
index 297ea9c0bbb..297ea9c0bbb 100644
--- a/source/blender/collada/collada_internal.h
+++ b/source/blender/io/collada/collada_internal.h
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp
index 26b392af0a1..26b392af0a1 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/io/collada/collada_utils.cpp
diff --git a/source/blender/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h
index 5c5e1415422..5c5e1415422 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/io/collada/collada_utils.h
diff --git a/source/blender/collada/version.conf b/source/blender/io/collada/version.conf
index d39af7a53df..d39af7a53df 100644
--- a/source/blender/collada/version.conf
+++ b/source/blender/io/collada/version.conf
diff --git a/source/blender/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt
index d85b3cfe4e5..732a638a255 100644
--- a/source/blender/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -32,17 +32,17 @@ add_definitions(-DPXR_STATIC)
 
 set(INC
   .
-  ../blenkernel
-  ../blenlib
-  ../blenloader
-  ../bmesh
-  ../depsgraph
-  ../editors/include
-  ../makesdna
-  ../makesrna
-  ../windowmanager
-  ../../../intern/guardedalloc
-  ../../../intern/utfconv
+  ../../blenkernel
+  ../../blenlib
+  ../../blenloader
+  ../../bmesh
+  ../../depsgraph
+  ../../editors/include
+  ../../makesdna
+  ../../makesrna
+  ../../windowmanager
+  ../../../../intern/guardedalloc
+  ../../../../intern/utfconv
 )
 
 set(INC_SYS
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
index a8ed2c5f2a5..a8ed2c5f2a5 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
index 8bca2ddd447..8bca2ddd447 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h
diff --git a/source/blender/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index 83e11cd7bf3..83e11cd7bf3 100644
--- a/source/blender/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
diff --git a/source/blender/usd/intern/usd_exporter_context.h b/source/blender/io/usd/intern/usd_exporter_context.h
index 4ae415b3d34..4ae415b3d34 100644
--- a/source/blender/usd/intern/usd_exporter_context.h
+++ b/source/blender/io/usd/intern/usd_exporter_context.h
diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
index fd888f39adc..fd888f39adc 100644
--- a/source/blender/usd/intern/usd_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h
index 90c82c6e551..90c82c6e551 100644
--- a/source/blender/usd/intern/usd_hierarchy_iterator.h
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.h
diff --git a/source/blender/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc
index 4d0b4364fb5..4d0b4364fb5 100644
--- a/source/blender/usd/intern/usd_writer_abstract.cc
+++ b/source/blender/io/usd/intern/usd_writer_abstract.cc
diff --git a/source/blender/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h
index 835d3a42c80..835d3a42c80 100644
--- a/source/blender/usd/intern/usd_writer_abstract.h
+++ b/source/blender/io/usd/intern/usd_writer_abstract.h
diff --git a/source/blender/usd/intern/usd_writer_camera.cc b/source/blender/io/usd/intern/usd_writer_camera.cc
index 9b85d69559c..9b85d69559c 100644
--- a/source/blender/usd/intern/usd_writer_camera.cc
+++ b/source/blender/io/usd/intern/usd_writer_camera.cc
diff --git a/source/blender/usd/intern/usd_writer_camera.h b/source/blender/io/usd/intern/usd_writer_camera.h
index 971264ef11e..971264ef11e 100644
--- a/source/blender/usd/intern/usd_writer_camera.h
+++ b/source/blender/io/usd/intern/usd_writer_camera.h
diff --git a/source/blender/usd/intern/usd_writer_hair.cc b/source/blender/io/usd/intern/usd_writer_hair.cc
index 9251425c0b8..9251425c0b8 100644
--- a/source/blender/usd/intern/usd_writer_hair.cc
+++ b/source/blender/io/usd/intern/usd_writer_hair.cc
diff --git a/source/blender/usd/intern/usd_writer_hair.h b/source/blender/io/usd/intern/usd_writer_hair.h
index 1e882fa1654..1e882fa1654 100644
--- a/source/blender/usd/intern/usd_writer_hair.h
+++ b/source/blender/io/usd/intern/usd_writer_hair.h
diff --git a/source/blender/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc
index e13e2c58a79..e13e2c58a79 100644
--- a/source/blender/usd/intern/usd_writer_light.cc
+++ b/source/blender/io/usd/intern/usd_writer_light.cc
diff --git a/source/blender/usd/intern/usd_writer_light.h b/source/blender/io/usd/intern/usd_writer_light.h
index 349c034b6bc..349c034b6bc 100644
--- a/source/blender/usd/intern/usd_writer_light.h
+++ b/source/blender/io/usd/intern/usd_writer_light.h
diff --git a/source/blender/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc
index 74005afaf31..74005afaf31 100644
--- a/source/blender/usd/intern/usd_writer_mesh.cc
+++ b/source/blender/io/usd/intern/usd_writer_mesh.cc
diff --git a/source/blender/usd/intern/usd_writer_mesh.h b/source/blender/io/usd/intern/usd_writer_mesh.h
index 4175e2b7e27..4175e2b7e27 100644
--- a/source/blender/usd/intern/usd_writer_mesh.h
+++ b/source/blender/io/usd/intern/usd_writer_mesh.h
diff --git a/source/blender/usd/intern/usd_writer_metaball.cc b/source/blender/io/usd/intern/usd_writer_metaball.cc
index 25b216d20f3..25b216d20f3 100644
--- a/source/blender/usd/intern/usd_writer_metaball.cc
+++ b/source/blender/io/usd/intern/usd_writer_metaball.cc
diff --git a/source/blender/usd/intern/usd_writer_metaball.h b/source/blender/io/usd/intern/usd_writer_metaball.h
index 1a86daae2ae..1a86daae2ae 100644
--- a/source/blender/usd/intern/usd_writer_metaball.h
+++ b/source/blender/io/usd/intern/usd_writer_metaball.h
diff --git a/source/blender/usd/intern/usd_writer_transform.cc b/source/blender/io/usd/intern/usd_writer_transform.cc
index 321b516221a..321b516221a 100644
--- a/source/blender/usd/intern/usd_writer_transform.cc
+++ b/source/blender/io/usd/intern/usd_writer_transform.cc
diff --git a/source/blender/usd/intern/usd_writer_transform.h b/source/blender/io/usd/intern/usd_writer_transform.h
index 52c4a657f33..52c4a657f33 100644
--- a/source/blender/usd/intern/usd_writer_transform.h
+++ b/source/blender/io/usd/intern/usd_writer_transform.h
diff --git a/source/blender/usd/usd.h b/source/blender/io/usd/usd.h
index 8a5575d53cf..8a5575d53cf 100644
--- a/source/blender/usd/usd.h
+++ b/source/blender/io/usd/usd.h
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index b2f1f6c651d..a813fe12c02 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -287,7 +287,7 @@ endif()
 
 if(WITH_ALEMBIC)
   list(APPEND INC
-    ../../alembic
+    ../../io/alembic
   )
   add_definitions(-DWITH_ALEMBIC)
 endif()
diff --git a/source/blender/makesrna/intern/rna_cachefile.c b/source/blender/makesrna/intern/rna_cachefile.c
index 189a4a7de86..7b4b7c11c17 100644
--- a/source/blender/makesrna/intern/rna_cachefile.c
+++ b/source/blender/makesrna/intern/rna_cachefile.c
@@ -42,7 +42,7 @@
 #  include "WM_types.h"
 
 #  ifdef WITH_ALEMBIC
-#    include "../../../alembic/ABC_alembic.h"
+#    include "ABC_alembic.h"
 #  endif
 
 static void rna_CacheFile_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index ee697955ad4..1b5077899f5 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -38,7 +38,7 @@
 #include "rna_internal.h" /* own include */
 
 #ifdef WITH_ALEMBIC
-#  include "../../alembic/ABC_alembic.h"
+#  include "ABC_alembic.h"
 #endif
 
 const EnumPropertyItem rna_enum_abc_compression_items[] = {
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 3e340461673..48acbdc17f3 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -116,7 +116,7 @@ set(LIB
 if(WITH_ALEMBIC)
   add_definitions(-DWITH_ALEMBIC)
   list(APPEND INC
-    ../alembic
+    ../io/alembic
   )
   list(APPEND LIB
     bf_alembic
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 983ea02423f..0b05a0dfcfe 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -305,14 +305,14 @@ endif()
 if(WITH_ALEMBIC)
   add_definitions(-DWITH_ALEMBIC)
   list(APPEND INC
-    ../../alembic
+    ../../io/alembic
   )
 endif()
 
 if(WITH_USD)
   add_definitions(-DWITH_USD)
   list(APPEND INC
-    ../../usd
+    ../../io/usd
   )
 endif()
 
diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt
index f8b2c373029..6ba1c4465d9 100644
--- a/tests/gtests/alembic/CMakeLists.txt
+++ b/tests/gtests/alembic/CMakeLists.txt
@@ -23,7 +23,7 @@ set(INC
   ..
   ../../../source/blender/blenlib
   ../../../source/blender/blenkernel
-  ../../../source/blender/alembic
+  ../../../source/blender/io/alembic
   ../../../source/blender/makesdna
   ../../../source/blender/depsgraph
   ${ALEMBIC_INCLUDE_DIRS}
diff --git a/tests/gtests/usd/CMakeLists.txt b/tests/gtests/usd/CMakeLists.txt
index df4c865e976..56759f4ccea 100644
--- a/tests/gtests/usd/CMakeLists.txt
+++ b/tests/gtests/usd/CMakeLists.txt
@@ -35,7 +35,7 @@ set(INC
   ..
   ../../../source/blender/blenlib
   ../../../source/blender/blenkernel
-  ../../../source/blender/usd
+  ../../../source/blender/io/usd
   ../../../source/blender/makesdna
   ../../../source/blender/depsgraph
   ${USD_INCLUDE_DIRS}