diff --git a/[refs] b/[refs]
index 82b4517e40cc..37e1d078be43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae49ec9258b1ba0456f5d2e9024d0e4742a0188b
+refs/heads/master: b453917ac45d6077955c096d8d5503754b0c13b4
diff --git a/trunk/include/pcmcia/cs.h b/trunk/include/pcmcia/cs.h
index 87a260e3699e..7b67ca9771ce 100644
--- a/trunk/include/pcmcia/cs.h
+++ b/trunk/include/pcmcia/cs.h
@@ -373,8 +373,6 @@ struct pcmcia_socket;
 
 int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, conf_reg_t *reg);
 int pcmcia_get_configuration_info(struct pcmcia_device *p_dev, config_info_t *config);
-int pcmcia_get_first_window(window_handle_t *win, win_req_t *req);
-int pcmcia_get_next_window(window_handle_t *win, win_req_t *req);
 int pcmcia_get_status(struct pcmcia_device *p_dev, cs_status_t *status);
 int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
 int pcmcia_map_mem_page(window_handle_t win, memreq_t *req);
diff --git a/trunk/include/pcmcia/cs_types.h b/trunk/include/pcmcia/cs_types.h
index 6f80b35a863e..f402a0f435b4 100644
--- a/trunk/include/pcmcia/cs_types.h
+++ b/trunk/include/pcmcia/cs_types.h
@@ -34,9 +34,6 @@ typedef u_int	event_t;
 typedef u_char	cisdata_t;
 typedef u_short	page_t;
 
-struct pcmcia_device;
-typedef struct pcmcia_device *client_handle_t;
-
 struct window_t;
 typedef struct window_t *window_handle_t;