diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp
index 8534732e7b..77b09b154b 100644
--- a/src/common/dcbase.cpp
+++ b/src/common/dcbase.cpp
@@ -290,7 +290,11 @@ void wxDCBase::DoDrawSpline( wxList *points )
 
     wx_spline_add_point(x1, y1);
 
-    while ((node = node->GetNext()))
+    while ((node = node->GetNext())
+#if !wxUSE_STL
+           != NULL
+#endif // !wxUSE_STL
+          )
     {
         p = (wxPoint *)node->GetData();
         x1 = x2;
diff --git a/src/html/htmlpars.cpp b/src/html/htmlpars.cpp
index bb209217f7..3a409efb3b 100644
--- a/src/html/htmlpars.cpp
+++ b/src/html/htmlpars.cpp
@@ -375,7 +375,12 @@ void wxHtmlParser::PopTagHandler()
     wxList::compatibility_iterator first;
 
     if ( !m_HandlersStack ||
-         !(first = m_HandlersStack->GetFirst()) )
+#if wxUSE_STL
+         !(first = m_HandlersStack->GetFirst())
+#else // !wxUSE_STL
+         ((first = m_HandlersStack->GetFirst()) == NULL)
+#endif // wxUSE_STL/!wxUSE_STL
+        )
     {
         wxLogWarning(_("Warning: attempt to remove HTML tag handler from empty stack."));
         return;