diff --git a/include/win32/generated_include/allocator_static-components.h b/opal/win32/generated_include/allocator_static-components.h
similarity index 100%
rename from include/win32/generated_include/allocator_static-components.h
rename to opal/win32/generated_include/allocator_static-components.h
diff --git a/include/win32/generated_include/coll-basic-version.h b/opal/win32/generated_include/coll-basic-version.h
similarity index 100%
rename from include/win32/generated_include/coll-basic-version.h
rename to opal/win32/generated_include/coll-basic-version.h
diff --git a/include/win32/generated_include/coll_static-components.h b/opal/win32/generated_include/coll_static-components.h
similarity index 100%
rename from include/win32/generated_include/coll_static-components.h
rename to opal/win32/generated_include/coll_static-components.h
diff --git a/include/win32/generated_include/config.h b/opal/win32/generated_include/config.h
similarity index 100%
rename from include/win32/generated_include/config.h
rename to opal/win32/generated_include/config.h
diff --git a/include/win32/generated_include/errmgr_static-components.h b/opal/win32/generated_include/errmgr_static-components.h
similarity index 100%
rename from include/win32/generated_include/errmgr_static-components.h
rename to opal/win32/generated_include/errmgr_static-components.h
diff --git a/include/win32/generated_include/gpr_static-components.h b/opal/win32/generated_include/gpr_static-components.h
similarity index 100%
rename from include/win32/generated_include/gpr_static-components.h
rename to opal/win32/generated_include/gpr_static-components.h
diff --git a/include/win32/generated_include/io-romio-version.h b/opal/win32/generated_include/io-romio-version.h
similarity index 100%
rename from include/win32/generated_include/io-romio-version.h
rename to opal/win32/generated_include/io-romio-version.h
diff --git a/include/win32/generated_include/iof_static-components.h b/opal/win32/generated_include/iof_static-components.h
similarity index 100%
rename from include/win32/generated_include/iof_static-components.h
rename to opal/win32/generated_include/iof_static-components.h
diff --git a/include/win32/generated_include/libltdl/ltdl.h b/opal/win32/generated_include/libltdl/ltdl.h
similarity index 100%
rename from include/win32/generated_include/libltdl/ltdl.h
rename to opal/win32/generated_include/libltdl/ltdl.h
diff --git a/include/win32/generated_include/llm-hostfile-version.h b/opal/win32/generated_include/llm-hostfile-version.h
similarity index 100%
rename from include/win32/generated_include/llm-hostfile-version.h
rename to opal/win32/generated_include/llm-hostfile-version.h
diff --git a/include/win32/generated_include/llm_static-components.h b/opal/win32/generated_include/llm_static-components.h
similarity index 100%
rename from include/win32/generated_include/llm_static-components.h
rename to opal/win32/generated_include/llm_static-components.h
diff --git a/include/win32/generated_include/ns_static-components.h b/opal/win32/generated_include/ns_static-components.h
similarity index 100%
rename from include/win32/generated_include/ns_static-components.h
rename to opal/win32/generated_include/ns_static-components.h
diff --git a/include/win32/generated_include/ompi_config.h b/opal/win32/generated_include/ompi_config.h
similarity index 100%
rename from include/win32/generated_include/ompi_config.h
rename to opal/win32/generated_include/ompi_config.h
diff --git a/include/win32/generated_include/oob_static-components.h b/opal/win32/generated_include/oob_static-components.h
similarity index 100%
rename from include/win32/generated_include/oob_static-components.h
rename to opal/win32/generated_include/oob_static-components.h
diff --git a/include/win32/generated_include/pcm_static-components.h b/opal/win32/generated_include/pcm_static-components.h
similarity index 100%
rename from include/win32/generated_include/pcm_static-components.h
rename to opal/win32/generated_include/pcm_static-components.h
diff --git a/include/win32/generated_include/pcmclient-env-version.h b/opal/win32/generated_include/pcmclient-env-version.h
similarity index 100%
rename from include/win32/generated_include/pcmclient-env-version.h
rename to opal/win32/generated_include/pcmclient-env-version.h
diff --git a/include/win32/generated_include/pcmclient-rms-version.h b/opal/win32/generated_include/pcmclient-rms-version.h
similarity index 100%
rename from include/win32/generated_include/pcmclient-rms-version.h
rename to opal/win32/generated_include/pcmclient-rms-version.h
diff --git a/include/win32/generated_include/pcmclient-seed-version.h b/opal/win32/generated_include/pcmclient-seed-version.h
similarity index 100%
rename from include/win32/generated_include/pcmclient-seed-version.h
rename to opal/win32/generated_include/pcmclient-seed-version.h
diff --git a/include/win32/generated_include/pcmclient-singleton-version.h b/opal/win32/generated_include/pcmclient-singleton-version.h
similarity index 100%
rename from include/win32/generated_include/pcmclient-singleton-version.h
rename to opal/win32/generated_include/pcmclient-singleton-version.h
diff --git a/include/win32/generated_include/pcmclient-slurm-version.h b/opal/win32/generated_include/pcmclient-slurm-version.h
similarity index 100%
rename from include/win32/generated_include/pcmclient-slurm-version.h
rename to opal/win32/generated_include/pcmclient-slurm-version.h
diff --git a/include/win32/generated_include/pcmclient_static-components.h b/opal/win32/generated_include/pcmclient_static-components.h
similarity index 100%
rename from include/win32/generated_include/pcmclient_static-components.h
rename to opal/win32/generated_include/pcmclient_static-components.h
diff --git a/include/win32/generated_include/pls-fork-version.h b/opal/win32/generated_include/pls-fork-version.h
similarity index 100%
rename from include/win32/generated_include/pls-fork-version.h
rename to opal/win32/generated_include/pls-fork-version.h
diff --git a/include/win32/generated_include/pls-proxy-version.h b/opal/win32/generated_include/pls-proxy-version.h
similarity index 100%
rename from include/win32/generated_include/pls-proxy-version.h
rename to opal/win32/generated_include/pls-proxy-version.h
diff --git a/include/win32/generated_include/pls-rsh-version.h b/opal/win32/generated_include/pls-rsh-version.h
similarity index 100%
rename from include/win32/generated_include/pls-rsh-version.h
rename to opal/win32/generated_include/pls-rsh-version.h
diff --git a/include/win32/generated_include/pls_static-components.h b/opal/win32/generated_include/pls_static-components.h
similarity index 100%
rename from include/win32/generated_include/pls_static-components.h
rename to opal/win32/generated_include/pls_static-components.h
diff --git a/include/win32/generated_include/pml_static-components.h b/opal/win32/generated_include/pml_static-components.h
similarity index 100%
rename from include/win32/generated_include/pml_static-components.h
rename to opal/win32/generated_include/pml_static-components.h
diff --git a/include/win32/generated_include/ptl-prof-version.h b/opal/win32/generated_include/ptl-prof-version.h
similarity index 100%
rename from include/win32/generated_include/ptl-prof-version.h
rename to opal/win32/generated_include/ptl-prof-version.h
diff --git a/include/win32/generated_include/ptl_static-components.h b/opal/win32/generated_include/ptl_static-components.h
similarity index 100%
rename from include/win32/generated_include/ptl_static-components.h
rename to opal/win32/generated_include/ptl_static-components.h
diff --git a/include/win32/generated_include/ras_static-components.h b/opal/win32/generated_include/ras_static-components.h
similarity index 100%
rename from include/win32/generated_include/ras_static-components.h
rename to opal/win32/generated_include/ras_static-components.h
diff --git a/include/win32/generated_include/rds_static-components.h b/opal/win32/generated_include/rds_static-components.h
similarity index 100%
rename from include/win32/generated_include/rds_static-components.h
rename to opal/win32/generated_include/rds_static-components.h
diff --git a/include/win32/generated_include/rmaps_static-components.h b/opal/win32/generated_include/rmaps_static-components.h
similarity index 100%
rename from include/win32/generated_include/rmaps_static-components.h
rename to opal/win32/generated_include/rmaps_static-components.h
diff --git a/include/win32/generated_include/rmgr_static-components.h b/opal/win32/generated_include/rmgr_static-components.h
similarity index 100%
rename from include/win32/generated_include/rmgr_static-components.h
rename to opal/win32/generated_include/rmgr_static-components.h
diff --git a/include/win32/generated_include/rml_static-components.h b/opal/win32/generated_include/rml_static-components.h
similarity index 100%
rename from include/win32/generated_include/rml_static-components.h
rename to opal/win32/generated_include/rml_static-components.h
diff --git a/include/win32/generated_include/schema_static-components.h b/opal/win32/generated_include/schema_static-components.h
similarity index 100%
rename from include/win32/generated_include/schema_static-components.h
rename to opal/win32/generated_include/schema_static-components.h
diff --git a/include/win32/generated_include/soh_static-components.h b/opal/win32/generated_include/soh_static-components.h
similarity index 100%
rename from include/win32/generated_include/soh_static-components.h
rename to opal/win32/generated_include/soh_static-components.h
diff --git a/include/win32/generated_include/topo-unity-version.h b/opal/win32/generated_include/topo-unity-version.h
similarity index 100%
rename from include/win32/generated_include/topo-unity-version.h
rename to opal/win32/generated_include/topo-unity-version.h
diff --git a/include/win32/generated_include/topo_static-components.h b/opal/win32/generated_include/topo_static-components.h
similarity index 100%
rename from include/win32/generated_include/topo_static-components.h
rename to opal/win32/generated_include/topo_static-components.h
diff --git a/include/win32/generated_source/ltdl.c b/opal/win32/generated_source/ltdl.c
similarity index 100%
rename from include/win32/generated_source/ltdl.c
rename to opal/win32/generated_source/ltdl.c
diff --git a/include/win32/ompi_declspec.h b/opal/win32/ompi_declspec.h
similarity index 100%
rename from include/win32/ompi_declspec.h
rename to opal/win32/ompi_declspec.h
diff --git a/include/win32/ompi_misc.h b/opal/win32/ompi_misc.h
similarity index 100%
rename from include/win32/ompi_misc.h
rename to opal/win32/ompi_misc.h
diff --git a/include/win32/ompi_process.c b/opal/win32/ompi_process.c
similarity index 100%
rename from include/win32/ompi_process.c
rename to opal/win32/ompi_process.c
diff --git a/include/win32/ompi_process.h b/opal/win32/ompi_process.h
similarity index 100%
rename from include/win32/ompi_process.h
rename to opal/win32/ompi_process.h
diff --git a/include/win32/ompi_time.c b/opal/win32/ompi_time.c
similarity index 100%
rename from include/win32/ompi_time.c
rename to opal/win32/ompi_time.c
diff --git a/include/win32/ompi_time.h b/opal/win32/ompi_time.h
similarity index 100%
rename from include/win32/ompi_time.h
rename to opal/win32/ompi_time.h
diff --git a/include/win32/ompi_uio.c b/opal/win32/ompi_uio.c
similarity index 100%
rename from include/win32/ompi_uio.c
rename to opal/win32/ompi_uio.c
diff --git a/include/win32/ompi_uio.h b/opal/win32/ompi_uio.h
similarity index 100%
rename from include/win32/ompi_uio.h
rename to opal/win32/ompi_uio.h
diff --git a/include/win32/ompi_util.h b/opal/win32/ompi_util.h
similarity index 100%
rename from include/win32/ompi_util.h
rename to opal/win32/ompi_util.h
diff --git a/include/win32/ompi_utsname.c b/opal/win32/ompi_utsname.c
similarity index 100%
rename from include/win32/ompi_utsname.c
rename to opal/win32/ompi_utsname.c
diff --git a/include/win32/ompi_utsname.h b/opal/win32/ompi_utsname.h
similarity index 100%
rename from include/win32/ompi_utsname.h
rename to opal/win32/ompi_utsname.h
diff --git a/include/win32/win_compat.h b/opal/win32/win_compat.h
similarity index 100%
rename from include/win32/win_compat.h
rename to opal/win32/win_compat.h