diff --git a/contrib/samples/mmedia/makefile.b32 b/contrib/samples/mmedia/makefile.b32
index cf24cac6da..c04865f7b3 100644
--- a/contrib/samples/mmedia/makefile.b32
+++ b/contrib/samples/mmedia/makefile.b32
@@ -10,7 +10,7 @@
 WXDIR = $(WXWIN)
 
 TARGET=mmboard
-EXTRALIBS=$(WXDIR)\contrib\lib\mmedia.lib
+EXTRALIBS=$(WXDIR)\lib\mmedia.lib
 OBJECTS = $(TARGET).obj mmbman.obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
index 017f34f868..3d0a7f5732 100644
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -92,7 +92,9 @@ wxOutputStream& DiagramDocument::SaveObject(wxOutputStream& stream)
   char buf[400];
   (void) wxGetTempFileName("diag", buf);
 
+#if wxUSE_PROLOGIO
   diagram.SaveFile(buf);
+#endif
 
   wxTransferFileToStream(buf, stream);
 
@@ -113,7 +115,11 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
   wxTransferStreamToFile(stream, buf);
 
   diagram.DeleteAllShapes();
+
+#if wxUSE_PROLOGIO
   diagram.LoadFile(buf);
+#endif
+
   wxRemoveFile(buf);
 
   return stream;
@@ -548,6 +554,7 @@ void MyEvtHandler::OnEndSize(double x, double y)
  * Diagram
  */
  
+#if wxUSE_PROLOGIO
 bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
   wxDiagram::OnShapeSave(db, shape, expr);
@@ -568,6 +575,7 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
     delete[] label;
   return TRUE;
 }
+#endif
 
 /*
  * New shapes
diff --git a/contrib/samples/ogl/ogledit/doc.h b/contrib/samples/ogl/ogledit/doc.h
index 6817c6d3d4..d7fad379fd 100644
--- a/contrib/samples/ogl/ogledit/doc.h
+++ b/contrib/samples/ogl/ogledit/doc.h
@@ -35,8 +35,10 @@ class MyDiagram: public wxDiagram
 {
  public:
   MyDiagram(void) {}
+#if wxUSE_PROLOGIO
   bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
   bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+#endif
 };
 
 /*
diff --git a/contrib/samples/ogl/studio/dialogs.cpp b/contrib/samples/ogl/studio/dialogs.cpp
index 62b0ca2edd..a3d38727b5 100644
--- a/contrib/samples/ogl/studio/dialogs.cpp
+++ b/contrib/samples/ogl/studio/dialogs.cpp
@@ -25,6 +25,11 @@
 #endif
 
 #include <wx/resource.h>
+
+#if !wxUSE_WX_RESOURCES 
+#error "OGL studio sample requires wxUSE_WX_RESOURCES" 
+#endif // wxUSE_WX_RESOURCES 
+
 #include "dialogs.h"
 #include "doc.h"
 #include "view.h"
diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp
index bfedc4071e..bf2efb8e70 100644
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -60,6 +60,7 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
   if (file == "")
     return FALSE;
 
+#if wxUSE_PROLOGIO
   if (!m_diagram.SaveFile(file))
   {
     wxString msgTitle;
@@ -72,6 +73,7 @@ bool csDiagramDocument::OnSaveDocument(const wxString& file)
       GetDocumentWindow());
     return FALSE;
   }
+#endif
 
   Modify(FALSE);
   SetFilename(file);
@@ -90,12 +92,14 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
     msgTitle = wxString("File error");
 
   m_diagram.DeleteAllShapes();
+#if wxUSE_PROLOGIO
   if (!m_diagram.LoadFile(file))
   {
     (void)wxMessageBox("Sorry, could not open this file.", msgTitle, wxOK|wxICON_EXCLAMATION,
      GetDocumentWindow());
     return FALSE;
   }
+#endif
   SetFilename(file, TRUE);
   Modify(FALSE);
   UpdateAllViews();
diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp
index ded2eb7ba1..e331385885 100644
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.cpp
@@ -705,6 +705,7 @@ bool csEvtHandler::EditProperties()
  * Diagram
  */
  
+#if wxUSE_PROLOGIO
 bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
   wxDiagram::OnShapeSave(db, shape, expr);
@@ -723,6 +724,7 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
   
   return TRUE;
 }
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
 
diff --git a/contrib/samples/ogl/studio/shapes.h b/contrib/samples/ogl/studio/shapes.h
index 6a440cf590..8162c6ad96 100644
--- a/contrib/samples/ogl/studio/shapes.h
+++ b/contrib/samples/ogl/studio/shapes.h
@@ -37,8 +37,10 @@ DECLARE_CLASS(csDiagram)
 public:
     csDiagram(csDiagramDocument* doc) { m_doc = doc; }
     ~csDiagram();
+#if wxUSE_PROLOGIO
     bool OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
     bool OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr);
+#endif
 
     inline csDiagramDocument* GetDocument() const { return m_doc; }
     virtual void Redraw(wxDC& dc);
diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
index 674b3af141..c77d46ed0d 100644
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -25,6 +25,10 @@
 #include "wx/config.h"
 #include "wx/laywin.h"
 
+#if !wxUSE_WX_RESOURCES 
+#error "OGL studio sample requires wxUSE_WX_RESOURCES" 
+#endif // wxUSE_WX_RESOURCES 
+
 #include "studio.h"
 #include "view.h"
 #include "doc.h"
diff --git a/contrib/samples/stc/makefile.b32 b/contrib/samples/stc/makefile.b32
index ae489f3a7d..46a0651cef 100644
--- a/contrib/samples/stc/makefile.b32
+++ b/contrib/samples/stc/makefile.b32
@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)
 
 TARGET=stctest
 
-EXTRALIBS=$(WXDIR)\contrib\lib\stc.lib
+EXTRALIBS=$(WXDIR)\lib\stc.lib
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32
diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
index fac1286eac..1e3238f735 100644
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@@ -2334,7 +2334,7 @@ wxRealPoint *wxLineShape::GetNextControlPoint(wxShape *nodeObject)
     return (wxRealPoint *)node->Data();
   }
   else
-    return FALSE;
+    return NULL;
 }
 
 /*
diff --git a/samples/stc/makefile.b32 b/samples/stc/makefile.b32
index ae489f3a7d..46a0651cef 100644
--- a/samples/stc/makefile.b32
+++ b/samples/stc/makefile.b32
@@ -11,7 +11,7 @@ WXDIR = $(WXWIN)
 
 TARGET=stctest
 
-EXTRALIBS=$(WXDIR)\contrib\lib\stc.lib
+EXTRALIBS=$(WXDIR)\lib\stc.lib
 OBJECTS = $(TARGET).obj
 
 !include $(WXDIR)\src\makeprog.b32