diff --git a/include/wx/webrequest.h b/include/wx/webrequest.h
index 75eb170d7a..68b785b9e9 100644
--- a/include/wx/webrequest.h
+++ b/include/wx/webrequest.h
@@ -12,28 +12,11 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_WEBREQUEST
-
-#include "wx/event.h"
-#include "wx/object.h"
 #include "wx/secretstore.h"
-#include "wx/stream.h"
-#include "wx/versioninfo.h"
-
-class wxWebResponse;
-class wxWebSession;
-class wxWebSessionFactory;
-
-class wxWebAuthChallengeImpl;
-class wxWebRequestImpl;
-class wxWebResponseImpl;
-class wxWebSessionImpl;
-
-typedef wxObjectDataPtr<wxWebAuthChallengeImpl> wxWebAuthChallengeImplPtr;
-typedef wxObjectDataPtr<wxWebRequestImpl> wxWebRequestImplPtr;
-typedef wxObjectDataPtr<wxWebResponseImpl> wxWebResponseImplPtr;
-typedef wxObjectDataPtr<wxWebSessionImpl> wxWebSessionImplPtr;
 
+// Note that this class is intentionally defined outside of wxUSE_WEBREQUEST
+// test as it's also used in wxCredentialEntryDialog and can be made available
+// even if wxWebRequest itself is disabled.
 class wxWebCredentials
 {
 public:
@@ -51,6 +34,27 @@ private:
     wxSecretValue m_password;
 };
 
+#if wxUSE_WEBREQUEST
+
+#include "wx/event.h"
+#include "wx/object.h"
+#include "wx/stream.h"
+#include "wx/versioninfo.h"
+
+class wxWebResponse;
+class wxWebSession;
+class wxWebSessionFactory;
+
+class wxWebAuthChallengeImpl;
+class wxWebRequestImpl;
+class wxWebResponseImpl;
+class wxWebSessionImpl;
+
+typedef wxObjectDataPtr<wxWebAuthChallengeImpl> wxWebAuthChallengeImplPtr;
+typedef wxObjectDataPtr<wxWebRequestImpl> wxWebRequestImplPtr;
+typedef wxObjectDataPtr<wxWebResponseImpl> wxWebResponseImplPtr;
+typedef wxObjectDataPtr<wxWebSessionImpl> wxWebSessionImplPtr;
+
 class WXDLLIMPEXP_NET wxWebAuthChallenge
 {
 public: