diff --git a/reactos/ntoskrnl/cm/registry.c b/reactos/ntoskrnl/cm/registry.c
index 228f23bc20f..3a4b3a4089d 100644
--- a/reactos/ntoskrnl/cm/registry.c
+++ b/reactos/ntoskrnl/cm/registry.c
@@ -1,4 +1,4 @@
-/* $Id: registry.c,v 1.108 2003/09/25 20:03:11 ekohl Exp $
+/* $Id: registry.c,v 1.109 2003/10/07 14:08:43 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -279,6 +279,8 @@ CmInitializeRegistry(VOID)
   CmiKeyType->DuplicationNotify = NULL;
   RtlInitUnicodeString(&CmiKeyType->TypeName, L"Key");
 
+  ObpCreateTypeObject (CmiKeyType);
+
   /* Initialize the hive list */
   InitializeListHead(&CmiHiveListHead);
   ExInitializeResourceLite(&CmiHiveListLock);
diff --git a/reactos/ntoskrnl/ex/win32k.c b/reactos/ntoskrnl/ex/win32k.c
index 0bfbbb9574d..9a5ef35cd22 100644
--- a/reactos/ntoskrnl/ex/win32k.c
+++ b/reactos/ntoskrnl/ex/win32k.c
@@ -27,6 +27,7 @@
 #include <limits.h>
 #include <ddk/ntddk.h>
 #include <internal/ex.h>
+#include <internal/ob.h>
 #include <wchar.h>
 
 #define NDEBUG
@@ -288,6 +289,8 @@ ExpWin32kInit(VOID)
   ExWindowStationObjectType->DuplicationNotify = NULL;
   RtlInitUnicodeStringFromLiteral(&ExWindowStationObjectType->TypeName, L"WindowStation");
 
+  ObpCreateTypeObject(ExWindowStationObjectType);
+
   /* Create desktop object type */
   ExDesktopObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE));
   if (ExDesktopObjectType == NULL)
@@ -315,6 +318,8 @@ ExpWin32kInit(VOID)
   ExDesktopObjectType->Create = ExpDesktopObjectCreate;
   ExDesktopObjectType->DuplicationNotify = NULL;
   RtlInitUnicodeStringFromLiteral(&ExDesktopObjectType->TypeName, L"Desktop");
+
+  ObpCreateTypeObject(ExDesktopObjectType);
 }
 
 /* EOF */
diff --git a/reactos/ntoskrnl/io/driver.c b/reactos/ntoskrnl/io/driver.c
index e2d2c8df4dd..da04ead4c73 100644
--- a/reactos/ntoskrnl/io/driver.c
+++ b/reactos/ntoskrnl/io/driver.c
@@ -1,4 +1,4 @@
-/* $Id: driver.c,v 1.21 2003/10/06 18:49:50 navaraf Exp $
+/* $Id: driver.c,v 1.22 2003/10/07 13:58:53 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -109,6 +109,8 @@ IopInitDriverImplementation(VOID)
   IoDriverObjectType->Create = IopCreateDriver;
   IoDriverObjectType->DuplicationNotify = NULL;
   RtlInitUnicodeStringFromLiteral(&IoDriverObjectType->TypeName, L"Driver");
+
+  ObpCreateTypeObject(IoDriverObjectType);
 }
 
 /**********************************************************************
diff --git a/reactos/ntoskrnl/io/iomgr.c b/reactos/ntoskrnl/io/iomgr.c
index de16699d656..db0f04937ba 100644
--- a/reactos/ntoskrnl/io/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr.c
@@ -1,4 +1,4 @@
-/* $Id: iomgr.c,v 1.38 2003/09/29 20:43:07 navaraf Exp $
+/* $Id: iomgr.c,v 1.39 2003/10/07 13:58:53 ekohl Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -234,6 +234,8 @@ VOID IoInit (VOID)
   
   RtlInitUnicodeStringFromLiteral(&IoDeviceObjectType->TypeName, L"Device");
 
+  ObpCreateTypeObject(IoDeviceObjectType);
+
   /*
    * Register iomgr types: FileObjectType
    * (alias DriverObjectType)
@@ -261,6 +263,8 @@ VOID IoInit (VOID)
   
   RtlInitUnicodeStringFromLiteral(&IoFileObjectType->TypeName, L"File");
 
+  ObpCreateTypeObject(IoFileObjectType);
+
   /*
    * Create the '\Driver' object directory
    */
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index e577b72ef01..79678f4418c 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: section.c,v 1.128 2003/09/25 20:05:44 ekohl Exp $
+/* $Id: section.c,v 1.129 2003/10/07 14:00:10 ekohl Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/section.c
@@ -2164,6 +2164,12 @@ MmInitSectionImplementation(VOID)
    MmSectionObjectType->Create = MmpCreateSection;
    MmSectionObjectType->DuplicationNotify = NULL;
    
+   /*
+    * NOTE: Do not register the section object type here because
+    * the object manager it not initialized yet!
+    * The section object type will be created in ObInit().
+    */
+
    return(STATUS_SUCCESS);
 }
 
diff --git a/reactos/ntoskrnl/nt/evtpair.c b/reactos/ntoskrnl/nt/evtpair.c
index 5eed79b39ad..3cc47ebd8a7 100644
--- a/reactos/ntoskrnl/nt/evtpair.c
+++ b/reactos/ntoskrnl/nt/evtpair.c
@@ -1,4 +1,4 @@
-/* $Id: evtpair.c,v 1.17 2003/09/25 20:06:32 ekohl Exp $
+/* $Id: evtpair.c,v 1.18 2003/10/07 14:00:45 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -18,6 +18,7 @@
 #define NTOS_MODE_KERNEL
 #include <ntos.h>
 #include <ntos/synch.h>
+#include <internal/ob.h>
 #include <internal/ps.h>
 #include <limits.h>
 
@@ -89,6 +90,7 @@ VOID NtInitializeEventPairImplementation(VOID)
    ExEventPairObjectType->DuplicationNotify = NULL;
 
    KeInitializeSpinLock(&ExThreadEventPairSpinLock);
+   ObpCreateTypeObject(ExEventPairObjectType);
 }
 
 
diff --git a/reactos/ntoskrnl/nt/mutant.c b/reactos/ntoskrnl/nt/mutant.c
index 0c7b3b5ca46..3e08d72784c 100644
--- a/reactos/ntoskrnl/nt/mutant.c
+++ b/reactos/ntoskrnl/nt/mutant.c
@@ -32,6 +32,7 @@
 #define NTOS_MODE_KERNEL
 #include <ntos.h>
 #include <ntos/synch.h>
+#include <internal/ob.h>
 
 #define NDEBUG
 #include <internal/debug.h>
@@ -102,6 +103,8 @@ NtInitializeMutantImplementation(VOID)
   ExMutantObjectType->OkayToClose = NULL;
   ExMutantObjectType->Create = NtpCreateMutant;
   ExMutantObjectType->DuplicationNotify = NULL;
+
+  ObpCreateTypeObject(ExMutantObjectType);
 }
 
 
diff --git a/reactos/ntoskrnl/nt/ntevent.c b/reactos/ntoskrnl/nt/ntevent.c
index 51aa1ec4a59..47ad43bea7e 100644
--- a/reactos/ntoskrnl/nt/ntevent.c
+++ b/reactos/ntoskrnl/nt/ntevent.c
@@ -31,6 +31,7 @@
 #define NTOS_MODE_KERNEL
 #include <ntos.h>
 #include <internal/id.h>
+#include <internal/ob.h>
 #include <ntos/synch.h>
 #include <internal/pool.h>
 #include <internal/safe.h>
@@ -94,6 +95,8 @@ NtInitializeEventImplementation(VOID)
    ExEventObjectType->OkayToClose = NULL;
    ExEventObjectType->Create = NtpCreateEvent;
    ExEventObjectType->DuplicationNotify = NULL;
+
+   ObpCreateTypeObject(ExEventObjectType);
 }
 
 
diff --git a/reactos/ntoskrnl/nt/ntsem.c b/reactos/ntoskrnl/nt/ntsem.c
index 58a4ab3d8ac..61d4133d086 100644
--- a/reactos/ntoskrnl/nt/ntsem.c
+++ b/reactos/ntoskrnl/nt/ntsem.c
@@ -1,4 +1,4 @@
-/* $Id: ntsem.c,v 1.19 2003/09/25 20:06:32 ekohl Exp $
+/* $Id: ntsem.c,v 1.20 2003/10/07 14:00:45 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -15,6 +15,7 @@
 #define NTOS_MODE_KERNEL
 #include <ntos.h>
 #include <ntos/synch.h>
+#include <internal/ob.h>
 #include <internal/pool.h>
 #include <internal/ps.h>
 
@@ -74,6 +75,8 @@ VOID NtInitializeSemaphoreImplementation(VOID)
    ExSemaphoreType->OkayToClose = NULL;
    ExSemaphoreType->Create = NtpCreateSemaphore;
    ExSemaphoreType->DuplicationNotify = NULL;
+
+   ObpCreateTypeObject(ExSemaphoreType);
 }
 
 NTSTATUS STDCALL
diff --git a/reactos/ntoskrnl/nt/nttimer.c b/reactos/ntoskrnl/nt/nttimer.c
index c7d8a6deaed..c73ac875e94 100644
--- a/reactos/ntoskrnl/nt/nttimer.c
+++ b/reactos/ntoskrnl/nt/nttimer.c
@@ -1,4 +1,4 @@
-/* $Id: nttimer.c,v 1.20 2003/09/25 20:06:32 ekohl Exp $
+/* $Id: nttimer.c,v 1.21 2003/10/07 14:00:45 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -15,6 +15,7 @@
 #include <ntos.h>
 #include <ntos/synch.h>
 #include <internal/ke.h>
+#include <internal/ob.h>
 #include <limits.h>
 #include <internal/pool.h>
 #include <internal/safe.h>
@@ -141,6 +142,8 @@ VOID NtInitializeTimerImplementation(VOID)
    ExTimerType->OkayToClose = NULL;
    ExTimerType->Create = NtpCreateTimer;
    ExTimerType->DuplicationNotify = NULL;
+
+   ObpCreateTypeObject(ExTimerType);
 }
 
 
diff --git a/reactos/ntoskrnl/nt/profile.c b/reactos/ntoskrnl/nt/profile.c
index 5b17cabebc5..9dd25f17c05 100644
--- a/reactos/ntoskrnl/nt/profile.c
+++ b/reactos/ntoskrnl/nt/profile.c
@@ -30,6 +30,7 @@
 #define NTOS_MODE_KERNEL
 #include <ntos.h>
 #include <internal/mm.h>
+#include <internal/ob.h>
 #include <internal/ps.h>
 #include <internal/pool.h>
 #include <limits.h>
@@ -394,6 +395,8 @@ NtInitializeProfileImplementation(VOID)
   ExProfileObjectType->QueryName = NULL;
   ExProfileObjectType->OkayToClose = NULL;
   ExProfileObjectType->Create = NULL;
+
+  ObpCreateTypeObject(ExProfileObjectType);
 }
 
 NTSTATUS STDCALL 
diff --git a/reactos/ntoskrnl/ob/namespc.c b/reactos/ntoskrnl/ob/namespc.c
index 820356fccba..bb5dc61c700 100644
--- a/reactos/ntoskrnl/ob/namespc.c
+++ b/reactos/ntoskrnl/ob/namespc.c
@@ -1,4 +1,4 @@
-/* $Id: namespc.c,v 1.40 2003/09/25 20:07:46 ekohl Exp $
+/* $Id: namespc.c,v 1.41 2003/10/07 14:01:15 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -432,6 +432,9 @@ ObInit(VOID)
 
   /* Create 'symbolic link' object type */
   ObInitSymbolicLinkImplementation();
+
+  /* Create 'section' object type */
+  ObpCreateTypeObject(MmSectionObjectType);
 }
 
 
diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index 0bc52a1bc50..dfc7143b03b 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.117 2003/10/04 18:19:17 navaraf Exp $
+/* $Id: process.c,v 1.118 2003/10/07 14:01:57 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -263,6 +263,8 @@ PsInitProcessManagment(VOID)
    
    RtlInitUnicodeStringFromLiteral(&PsProcessType->TypeName, L"Process");
    
+   ObpCreateTypeObject(PsProcessType);
+
    InitializeListHead(&PsProcessListHead);
    KeInitializeSpinLock(&PsProcessListLock);
    
diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index 080edc654f5..947cfbb00e4 100644
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.118 2003/09/30 22:36:29 gvg Exp $
+/* $Id: thread.c,v 1.119 2003/10/07 14:01:57 ekohl Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -462,8 +462,6 @@ PsInitThreadManagment(VOID)
    
    PsThreadType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE));
    
-   RtlInitUnicodeStringFromLiteral(&PsThreadType->TypeName, L"Thread");
-   
    PsThreadType->Tag = TAG('T', 'H', 'R', 'T');
    PsThreadType->TotalObjects = 0;
    PsThreadType->TotalHandles = 0;
@@ -483,6 +481,10 @@ PsInitThreadManagment(VOID)
    PsThreadType->Create = NULL;
    PsThreadType->DuplicationNotify = NULL;
    
+   RtlInitUnicodeStringFromLiteral(&PsThreadType->TypeName, L"Thread");
+   
+   ObpCreateTypeObject(PsThreadType);
+
    PsInitializeThread(NULL,&FirstThread,&FirstThreadHandle,
 		      THREAD_ALL_ACCESS,NULL, TRUE);
    FirstThread->Tcb.State = THREAD_STATE_RUNNING;
diff --git a/reactos/ntoskrnl/se/token.c b/reactos/ntoskrnl/se/token.c
index 15486f68d15..11925fafe21 100644
--- a/reactos/ntoskrnl/se/token.c
+++ b/reactos/ntoskrnl/se/token.c
@@ -1,4 +1,4 @@
-/* $Id: token.c,v 1.27 2003/09/25 20:09:11 ekohl Exp $
+/* $Id: token.c,v 1.28 2003/10/07 14:04:52 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -14,6 +14,7 @@
 #include <limits.h>
 #define NTOS_MODE_KERNEL
 #include <ntos.h>
+#include <internal/ob.h>
 #include <internal/ps.h>
 #include <internal/se.h>
 #include <internal/safe.h>
@@ -480,6 +481,7 @@ SepInitializeTokenImplementation(VOID)
 
   RtlCreateUnicodeString(&SepTokenObjectType->TypeName,
 			 L"Token");
+  ObpCreateTypeObject (SepTokenObjectType);
 }