diff --git a/llvm/lib/ObjCopy/CMakeLists.txt b/llvm/lib/ObjCopy/CMakeLists.txt
--- a/llvm/lib/ObjCopy/CMakeLists.txt
+++ b/llvm/lib/ObjCopy/CMakeLists.txt
@@ -1,3 +1,34 @@
+source_group("Header Files" REGULAR_EXPRESSION
+  .*[.]h
+)
+source_group("Header Files\\COFF" REGULAR_EXPRESSION
+  COFF/.*[.]h
+)
+source_group("Header Files\\ELF" REGULAR_EXPRESSION
+  ELF/.*[.]h
+)
+source_group("Header Files\\MachO" REGULAR_EXPRESSION
+  MachO/.*[.]h
+)
+source_group("Header Files\\wasm" REGULAR_EXPRESSION
+  wasm/.*[.]h
+)
+source_group("Source Files" REGULAR_EXPRESSION
+  .*[.]cpp
+)
+source_group("Source Files\\COFF" REGULAR_EXPRESSION  
+  COFF/.*[.]cpp
+)
+source_group("Source Files\\ELF" REGULAR_EXPRESSION
+  ELF/.*[.]cpp
+)
+source_group("Source Files\\MachO" REGULAR_EXPRESSION
+  MachO/.*[.]cpp
+)
+source_group("Source Files\\wasm" REGULAR_EXPRESSION
+  wasm/.*[.]cpp
+)
+
 add_llvm_component_library(LLVMObjCopy
   Archive.cpp
   ObjCopy.cpp
@@ -19,8 +50,16 @@
   wasm/WasmObjcopy.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object
-
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/COFF
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/ELF
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/MachO
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/ObjCopy/wasm
+  COFF
+  ELF
+  MachO
+  wasm
+  
   DEPENDS
   intrinsics_gen