diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index 4c9b725072..644050bb53 100644
--- a/include/wx/cairo.h
+++ b/include/wx/cairo.h
@@ -25,16 +25,16 @@
 class wxCairoLibrary
 {
 public:
-    wxCairoLibrary();
-    ~wxCairoLibrary();
-
     static wxCairoLibrary* Get();
     static void CleanUp();
 
+private:
+    wxCairoLibrary();
+    ~wxCairoLibrary();
+    
     bool IsOk();
     void InitializeMethods();
 
-private:
     bool              m_ok;
     wxDynamicLibrary *m_cairo_lib;
     wxDynamicLibrary *m_pango_cairo_lib;
diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index a9328718d0..811a73cd3c 100644
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -44,7 +44,7 @@ wxCairoLibrary::wxCairoLibrary()
     if (!m_ok) return;
 
     m_pango_cairo_lib = new wxDynamicLibrary( wxT("libpangocairo-1.0.so.0") );
-    m_ok = m_cairo_lib->IsLoaded();
+    m_ok = m_pango_cairo_lib->IsLoaded();
     if (!m_ok) return;
 
     InitializeMethods();
@@ -150,7 +150,7 @@ public:
     void OnExit();
 
 private:
-    DECLARE_DYNAMIC_CLASS(wxGtkPrintModule)
+    DECLARE_DYNAMIC_CLASS(wxCairoPrintModule)
 };
 
 bool wxCairoModule::OnInit()