1 files changed, 8 insertions, 14 deletions

diff --git a/libmsi/select.c b/libmsi/select.c
index d596d12..7fe5a16 100644
--- a/libmsi/select.c
+++ b/libmsi/select.c
@@ -20,15 +20,9 @@
 
 #include <stdarg.h>
 
-#include "windef.h"
-#include "winbase.h"
-#include "winerror.h"
 #include "debug.h"
 #include "libmsi.h"
-#include "objbase.h"
-#include "objidl.h"
 #include "msipriv.h"
-#include "winnls.h"
 
 #include "query.h"
 
@@ -67,7 +61,7 @@ static unsigned select_view_fetch_int( LibmsiView *view, unsigned row, unsigned
     return sv->table->ops->fetch_int( sv->table, row, col, val );
 }
 
-static unsigned select_view_fetch_stream( LibmsiView *view, unsigned row, unsigned col, IStream **stm)
+static unsigned select_view_fetch_stream( LibmsiView *view, unsigned row, unsigned col, GsfInput **stm)
 {
     LibmsiSelectView *sv = (LibmsiSelectView*)view;
 
@@ -214,8 +208,8 @@ static unsigned select_view_get_dimensions( LibmsiView *view, unsigned *rows, un
     return sv->table->ops->get_dimensions( sv->table, rows, NULL );
 }
 
-static unsigned select_view_get_column_info( LibmsiView *view, unsigned n, const WCHAR **name,
-                                    unsigned *type, bool *temporary, const WCHAR **table_name )
+static unsigned select_view_get_column_info( LibmsiView *view, unsigned n, const char **name,
+                                    unsigned *type, bool *temporary, const char **table_name )
 {
     LibmsiSelectView *sv = (LibmsiSelectView*)view;
 
@@ -296,14 +290,14 @@ static const LibmsiViewOps select_ops =
     NULL,
 };
 
-static unsigned select_view_add_column( LibmsiSelectView *sv, const WCHAR *name,
-                              const WCHAR *table_name )
+static unsigned select_view_add_column( LibmsiSelectView *sv, const char *name,
+                              const char *table_name )
 {
     unsigned r, n;
     LibmsiView *table;
 
-    TRACE("%p adding %s.%s\n", sv, debugstr_w( table_name ),
-          debugstr_w( name ));
+    TRACE("%p adding %s.%s\n", sv, debugstr_a( table_name ),
+          debugstr_a( name ));
 
     if( sv->view.ops != &select_ops )
         return LIBMSI_RESULT_FUNCTION_FAILED;
@@ -329,7 +323,7 @@ static unsigned select_view_add_column( LibmsiSelectView *sv, const WCHAR *name,
 
     sv->cols[sv->num_cols] = n;
     TRACE("Translating column %s from %d -> %d\n", 
-          debugstr_w( name ), sv->num_cols, n);
+          debugstr_a( name ), sv->num_cols, n);
 
     sv->num_cols++;