diff -Naur aria-1.0.0.old/src/ItemCellPartial.h aria-1.0.0/src/ItemCellPartial.h
--- aria-1.0.0.old/src/ItemCellPartial.h	2006-05-02 01:14:38.000000000 -0400
+++ aria-1.0.0/src/ItemCellPartial.h	2006-05-02 01:27:26.000000000 -0400
@@ -70,7 +70,7 @@
   ItemCell *ret_Boss();
 
   void WriteSplitInfo(const string& filename);
-  ItemCell::DownloadStatusType ItemCellPartial::Download_Main();
+  ItemCell::DownloadStatusType Download_Main();
 
   SplitStatusType SplitNumberChanged(const string& filename);
 };
diff -Naur aria-1.0.0.old/src/ItemList.h aria-1.0.0/src/ItemList.h
--- aria-1.0.0.old/src/ItemList.h	2006-05-02 01:14:38.000000000 -0400
+++ aria-1.0.0/src/ItemList.h	2006-05-02 01:19:16.000000000 -0400
@@ -31,7 +31,8 @@
 #include <string>
 #include <fstream>
 //#include <map>
-#include <pair.h>
+//#include <pair.h>
+#include <bits/stl_pair.h>
 #include "aria.h"
 #include "utils.h"
 #include "ProxyList.h"
diff -Naur aria-1.0.0.old/src/RetrieveFTP.h aria-1.0.0/src/RetrieveFTP.h
--- aria-1.0.0.old/src/RetrieveFTP.h	2006-05-02 01:14:38.000000000 -0400
+++ aria-1.0.0/src/RetrieveFTP.h	2006-05-02 01:25:56.000000000 -0400
@@ -27,7 +27,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fstream>
-#include <pair.h>
+#include <bits/stl_pair.h>
 #include "aria.h"
 #include "FTPcontainer.h"
 #include "ItemCell.h"
diff -Naur aria-1.0.0.old/src/gui_download.cc aria-1.0.0/src/gui_download.cc
--- aria-1.0.0.old/src/gui_download.cc	2006-05-02 01:14:38.000000000 -0400
+++ aria-1.0.0/src/gui_download.cc	2006-05-02 01:23:11.000000000 -0400
@@ -24,7 +24,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <pair.h>
+#include <bits/stl_pair.h>
 #include <list>
 #include <algorithm>
 #include "aria.h"
diff -Naur aria-1.0.0.old/src/gui_file.cc aria-1.0.0/src/gui_file.cc
--- aria-1.0.0.old/src/gui_file.cc	2006-05-02 01:14:38.000000000 -0400
+++ aria-1.0.0/src/gui_file.cc	2006-05-02 01:22:08.000000000 -0400
@@ -19,7 +19,7 @@
 
 // $Id: gui_file.cc,v 1.45 2002/09/30 13:29:46 tujikawa Exp $
 
-#include <fstream.h>
+#include <fstream>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/time.h>
diff -Naur aria-1.0.0.old/src/gui_popup.cc aria-1.0.0/src/gui_popup.cc
--- aria-1.0.0.old/src/gui_popup.cc	2006-05-02 01:14:38.000000000 -0400
+++ aria-1.0.0/src/gui_popup.cc	2006-05-02 01:21:01.000000000 -0400
@@ -19,7 +19,7 @@
 
 // $Id: gui_popup.cc,v 1.14 2002/04/03 13:33:52 tujikawa Exp $
 
-#include <iostream.h>
+#include <iostream>
 #include "aria.h"
 #include "gui_utils.h"