diff --git a/MagickCore/magick.c b/MagickCore/magick.c
index cf7da48..35cafd0 100644
--- a/MagickCore/magick.c
+++ b/MagickCore/magick.c
@@ -65,6 +65,7 @@
 #include "MagickCore/module.h"
 #include "MagickCore/module-private.h"
 #include "MagickCore/nt-base-private.h"
+#include "MagickCore/option-private.h"
 #include "MagickCore/random-private.h"
 #include "MagickCore/registry.h"
 #include "MagickCore/registry-private.h"
@@ -1340,6 +1341,7 @@
 #if defined(MAGICKCORE_X11_DELEGATE)
   (void) XComponentGenesis();
 #endif
+  (void) CommandComponentGenesis();
   (void) RegistryComponentGenesis();
   instantiate_magickcore=MagickTrue;
   UnlockMagickMutex();
@@ -1373,6 +1375,7 @@
       return;
     }
   RegistryComponentTerminus();
+  CommandComponentTerminus();
 #if defined(MAGICKCORE_X11_DELEGATE)
   XComponentTerminus();
 #endif