for gcc

diff --git a/pgadmin/frm/frmImport.cpp b/pgadmin/frm/frmImport.cpp
index 3aa9094121036df5b5062d082e833304ad202e85..261b731beb93258de26210e35cdd1c745e601460 100755 (executable)
--- a/pgadmin/frm/frmImport.cpp
+++ b/pgadmin/frm/frmImport.cpp
@@ -3,10 +3,8 @@
 #include <wx/file.h>\r
 \r
 #include "pgAdmin3.h"\r
-#include "utils/sysSettings.h"\r
 #include "frm/frmImport.h"\r
-#include <wx/wfstream.h>\r
-#include <wx/zipstrm.h>\r
+#include "utils/sysSettings.h"\r
 \r
 // wizard & pages\r
 //#define frmImport              XRCCTRL(*this, "frmImport", wxWizard)\r

diff --git a/pgadmin/include/frm/frmImport.h b/pgadmin/include/frm/frmImport.h
index c839b39fb7f01ca2d172e7b79745e9a8615ce425..f1ff9ed25e5985fb2772e5fa08970b64f3c79dd8 100755 (executable)
--- a/pgadmin/include/frm/frmImport.h
+++ b/pgadmin/include/frm/frmImport.h
@@ -6,16 +6,6 @@
 #define FRMIMPORT_H\r
 \r
 #include <wx/wizard.h>\r
-\r
-#include "ctl/ctlGrid.h"\r
-#include "dlg/dlgClasses.h"\r
-#include "utils/pgcsvfile.h"\r
-#include "schema/pgDatatype.h"\r
-\r
-#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
-#include "utils/pgodbc.h"\r
-#endif\r
-\r
 #include <wx/spinctrl.h>\r
 #include <wx/archive.h>\r
 #include <wx/wfstream.h>\r
@@ -23,7 +13,13 @@
 #include <wx/zipstrm.h>\r
 #include <wx/tarstrm.h>\r
 \r
-class frmMain;\r
+#include "schema/pgObject.h"\r
+#include "ctl/ctlGrid.h"\r
+#include "utils/pgcsvfile.h"\r
+\r
+#if defined(__WXMSW__) || defined(__WITHIODBC__) || defined(__WITHUNIXODBC__)\r
+#include "utils/pgodbc.h"\r
+#endif\r
 \r
 class frmImport : public wxWizard\r
 {\r