diff --git a/UnitTests/nxwm/nxwm_main.cxx b/UnitTests/nxwm/nxwm_main.cxx
index ba47da251..07fa8f464 100644
--- a/UnitTests/nxwm/nxwm_main.cxx
+++ b/UnitTests/nxwm/nxwm_main.cxx
@@ -38,7 +38,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <nuttx/config.h>
-#include <nuttx/arch.h>
 
 #include <cstdio>
 #include <cstdlib>
@@ -48,6 +47,10 @@
 #  include "platform/configdata.hr"
 #endif
 
+#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE)
+#  include "platform/cxxinitialize.h"
+#endif
+
 #include "ctaskbar.hxx"
 #include "cstartwindow.hxx"