--- aria2-0.9.0/src/FtpInitiateConnectionCommand.cc.orig3	2006-12-12 13:30:45.867461000 +0800
+++ aria2-0.9.0/src/FtpInitiateConnectionCommand.cc	2006-12-12 13:57:53.142538000 +0800
@@ -38,8 +38,8 @@
 #include "FtpTunnelRequestCommand.h"
 #include "DlAbortEx.h"
 #include "message.h"
-#include "prefs.h"
 #include "Util.h"
+#include "prefs.h"
 
 FtpInitiateConnectionCommand::FtpInitiateConnectionCommand(int cuid,
 							   const RequestHandle req,
--- aria2-0.9.0/src/DefaultPieceStorage.cc.orig3	2006-12-12 15:18:40.391821000 +0800
+++ aria2-0.9.0/src/DefaultPieceStorage.cc	2006-12-12 15:19:08.916897000 +0800
@@ -34,7 +34,6 @@
 /* copyright --> */
 #include "DefaultPieceStorage.h"
 #include "LogFactory.h"
-#include "prefs.h"
 #include "DirectDiskAdaptor.h"
 #include "MultiDiskAdaptor.h"
 #include "CopyDiskAdaptor.h"
@@ -42,6 +41,7 @@
 #include "MultiDiskWriter.h"
 #include "PreAllocationDiskWriter.h"
 #include "DlAbortEx.h"
+#include "prefs.h"
 
 DefaultPieceStorage::DefaultPieceStorage(BtContextHandle btContext, const Option* option):
   btContext(btContext),