diff --git a/include/Makefile.in b/include/Makefile.in
index 62904d8d2a0..848837f84fc 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -685,6 +685,7 @@ SOURCES = \
 	shlobj.h \
 	shlwapi.h \
 	shobjidl.idl \
+	shobjidl_core.idl \
 	shtypes.idl \
 	sipbase.h \
 	slerror.h \
diff --git a/include/shlguid.h b/include/shlguid.h
index c6878c36864..8d68700accf 100644
--- a/include/shlguid.h
+++ b/include/shlguid.h
@@ -19,8 +19,6 @@
 #ifndef __WINE_SHLGUID_H
 #define __WINE_SHLGUID_H
 
-DEFINE_OLEGUID(CLSID_ShellDesktop,      0x00021400, 0, 0);
-
 DEFINE_OLEGUID(CATID_BrowsableShellExt, 0x00021490, 0, 0);
 DEFINE_OLEGUID(CATID_BrowseInPlace,     0x00021491, 0, 0);
 DEFINE_OLEGUID(CATID_DeskBand,          0x00021492, 0, 0);
@@ -124,13 +122,11 @@ DEFINE_GUID(IID_IInputObjectSite,   0xF1DB8392, 0x7331, 0x11D0, 0x8C, 0x99, 0x00
 /****************************************************************************
  * the next IID's are the namespace elements of the pidls
  */
-DEFINE_GUID(CLSID_NetworkPlaces, 0x208D2C60, 0x3AEA, 0x1069, 0xA2, 0xD7, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_NetworkDomain, 0x46e06680, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49);
 DEFINE_GUID(CLSID_NetworkServer, 0xc0542a90, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49);
 DEFINE_GUID(CLSID_NetworkShare, 0x54a754c0, 0x4bf0, 0x11d1, 0x83, 0xee, 0x00, 0xa0, 0xc9, 0x0d, 0xc8, 0x49);
 DEFINE_GUID(CLSID_MyComputer, 0x20D04FE0, 0x3AEA, 0x1069, 0xA2, 0xD8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_Internet, 0x871C5380, 0x42A0, 0x1069, 0xA2, 0xEA, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
-DEFINE_GUID(CLSID_ShellFSFolder, 0xF3364BA0, 0x65B9, 0x11CE, 0xA9, 0xBA, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37);
 DEFINE_GUID(CLSID_RecycleBin, 0x645FF040, 0x5081, 0x101B, 0x9F, 0x08, 0x00, 0xAA, 0x00, 0x2F, 0x95, 0x4E);
 DEFINE_GUID(CLSID_ControlPanel, 0x21EC2020, 0x3AEA, 0x1069, 0xA2, 0xDD, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
 DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D);
@@ -145,7 +141,6 @@ DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00,
 
 DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4);
 
-DEFINE_GUID(CLSID_ShellItem,      0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e);
 DEFINE_GUID(CLSID_NewMenu,        0xd969a300, 0xe7ff, 0x11d0, 0xa9, 0x3b, 0x0, 0xa0, 0xc9, 0xf, 0x27, 0x19);
 
 #define PSGUID_SHELLDETAILS     {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0}
diff --git a/include/shobjidl.idl b/include/shobjidl.idl
index 065e0c8c528..a5b27ec1003 100644
--- a/include/shobjidl.idl
+++ b/include/shobjidl.idl
@@ -33,6 +33,7 @@ import "wtypes.idl";
 import "propsys.idl";
 import "objectarray.idl";
 /* FIXME: import "structuredquery.idl"; */
+import "shobjidl_core.idl";
 
 cpp_quote("/* FIXME: #include <sherrors.h> */")
 
diff --git a/include/shobjidl_core.idl b/include/shobjidl_core.idl
new file mode 100644
index 00000000000..dd64204682e
--- /dev/null
+++ b/include/shobjidl_core.idl
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2022 Alex Henrie
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+[
+    uuid(56f9f44f-f74c-4e38-99bc-9f3ebd3d696a)
+]
+library ShellCoreObjects
+{
+    [
+        uuid(208d2c60-3aea-1069-a2d7-08002b30309d)
+    ]
+    coclass NetworkPlaces
+    {
+        interface IShellFolder2;
+    }
+
+    [
+        uuid(00021400-0000-0000-c000-000000000046)
+    ]
+    coclass ShellDesktop
+    {
+        interface IShellFolder2;
+    }
+
+    [
+        uuid(f3364ba0-65b9-11ce-a9ba-00aa004ae837)
+    ]
+    coclass ShellFSFolder
+    {
+        interface IShellFolder2;
+    }
+
+    [
+        uuid(9ac9fbe1-e0a2-4ad6-b4ee-e212013ea917)
+    ]
+    coclass ShellItem
+    {
+        interface IShellItem2;
+    }
+}