diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 5e34e7089c..4037833a48 100644
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -22,7 +22,9 @@
       defined(__VISAGECPP__) || \
       defined(__MWERKS__)
 
-    #if !defined(NOPCH)
+    // If user did not request NOCPH and we're not building using configure
+    // then assume user wants precompiled headers.
+    #if !defined(NOPCH) && !defined(__WX_SETUP_H__)
         #define WX_PRECOMP
     #endif
 #endif