diff -Nurd -x'*~' fityk-0.3.2.orig/src/gfunc.h fityk-0.3.2/src/gfunc.h
--- fityk-0.3.2.orig/src/gfunc.h	2003-02-23 20:51:12.000000000 -0500
+++ fityk-0.3.2/src/gfunc.h	2011-10-03 16:56:49.000000000 -0400
@@ -28,7 +28,7 @@
     std::vector<int_fp> get_derivatives (const std::vector<fp>& A, 
                                          const std::vector<V_g*>& G);
     static std::vector<char> all_types();
-    static V_g* V_g::factory (Sum* sum, char type, const std::vector<Pag> &p);
+    static V_g* factory (Sum* sum, char type, const std::vector<Pag> &p);
 
 protected:
     virtual void prepare_deriv () = 0;
diff -Nurd -x'*~' fityk-0.3.2.orig/src/sum.h fityk-0.3.2/src/sum.h
--- fityk-0.3.2.orig/src/sum.h	2003-02-24 08:58:15.000000000 -0500
+++ fityk-0.3.2/src/sum.h	2011-10-03 16:57:33.000000000 -0400
@@ -84,11 +84,11 @@
     int fzg_size (One_of_fzg fzg) const;
     int add_fzg (One_of_fzg fzg, char type, const std::vector<Pag> &p,
                  const std::string &desc = "");
-    std::string Sum::info_fzg (One_of_fzg fzg, int n) const;
+    std::string info_fzg (One_of_fzg fzg, int n) const;
     std::string info_fzg_parameters(One_of_fzg fzg, int n, bool only_val) const;
     int rm_fzg (One_of_fzg fzg, int n, bool silent = false);
     int multi_rm_fzg (One_of_fzg fzg, std::vector<int> nn, bool silent = false);
-    int Sum::rm_all();
+    int rm_all();
     const V_fzg *get_fzg (One_of_fzg fzg, int n) const;
     V_fzg *get_fzg_m (One_of_fzg fzg, int n)
         { return const_cast<V_fzg*>(get_fzg (fzg, n)); }