diff --git a/gtkwindow.inc b/gtkwindow.inc
index 34866d4..d70a974 100644
--- a/gtkwindow.inc
+++ b/gtkwindow.inc
@@ -8,7 +8,7 @@
 ; 
 ; This library is distributed in the hope that it will be useful, 
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of 
-; MERCHANTABILITY or FITNESS A PARTICULAR PURPOSE. See the GNU 
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
 ; Lesser General Public License for more details. 
 ; 
 ; You should have received a copy of the GNU Lesser General Public 
@@ -22,25 +22,11 @@
 ; GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  
  
-%ifndef __GTK_WINDOW_H__ 
-%define __GTK_WINDOW_H__ 
  
  
-%if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION) 
-%error "Only "gtk/gtk.inc" can be included directly." 
-%endif 
- 
-%include "gtk/gtkapplication.inc" 
-%include "gtk/gtkaccelgroup.inc" 
-%include "gtk/gtkbin.inc" 
  
  
-%define GTK_TYPE_WINDOW (gtk_window_get_type ()) 
-%define GTK_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow)) 
-%define GTK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass)) 
-%define GTK_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW)) 
-%define GTK_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW)) 
-%define GTK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass)) 
+ 
  
 struc GtkWindowPrivate 
 endstruc 
@@ -57,6 +43,7 @@ endstruc
  
  
  
+/** 
 ; GtkWindowClass: 
 ; @parent_class: The parent class. 
 ; @set_focus: Sets child as the focus widget for the window. 
@@ -68,14 +55,17 @@ endstruc
 ; keybinding signal. Since: 3.14 
  
  
+/*< public >*/ 
  
  
 ; G_SIGNAL_ACTION signals for keybindings  
  
  
+/*< private >*/ 
  
 ; Padding for future expansion  
  
+/** 
 ; GtkWindowType: 
 ; @GTK_WINDOW_TOPLEVEL: A regular window, such as a dialog. 
 ; @GTK_WINDOW_POPUP: A special window such as a tooltip. 
@@ -97,6 +87,7 @@ endstruc
 GTK_WINDOW_TOPLEVEL	 EQU	 0 
 GTK_WINDOW_POPUP	 EQU	 1 
  
+/** 
 ; GtkWindowPosition: 
 ; @GTK_WIN_POS_NONE: No influence is made on placement. 
 ; @GTK_WIN_POS_CENTER: Windows should be placed in the center of the screen. 
@@ -116,8 +107,6 @@ GTK_WIN_POS_CENTER_ALWAYS	 EQU	 3
 GTK_WIN_POS_CENTER_ON_PARENT	 EQU	 4 
  
  
-const gchar ; gtk_window_get_title (GtkWindow *window); 
-const gchar ; gtk_window_get_role (GtkWindow *window); 
  
  
  
@@ -127,8 +116,6 @@ const gchar ; gtk_window_get_role (GtkWindow *window);
  
  
  
-const gchar ; gtk_window_get_icon_name (GtkWindow *window); 
-const gchar ; gtk_window_get_default_icon_name (void); 
  
  
 ; If window is set modal, input will be grabbed when show and released when hide  
@@ -156,4 +143,4 @@ const gchar ; gtk_window_get_default_icon_name (void);
  
  
  
-#endif ; __GTK_WINDOW_H__  
+TOKEN_ENDIF #endif ; __GTK_WINDOW_H__  
diff --git a/gtkwindow.tokenized b/gtkwindow.tokenized
new file mode 100644
index 0000000..9b6d75e
--- /dev/null
+++ b/gtkwindow.tokenized
@@ -0,0 +1,502 @@
+TOKEN_CSTART /* GTK - The GIMP Toolkit 
+TOKEN_CMID * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald 
+TOKEN_CMID * 
+TOKEN_CMID * This library is free software; you can redistribute it and/or 
+TOKEN_CMID * modify it under the terms of the GNU Lesser General Public 
+TOKEN_CMID * License as published by the Free Software Foundation; either 
+TOKEN_CMID * version 2 of the License, or (at your option) any later version. 
+TOKEN_CMID * 
+TOKEN_CMID * This library is distributed in the hope that it will be useful, 
+TOKEN_CMID * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+TOKEN_CMID * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 
+TOKEN_CMID * Lesser General Public License for more details. 
+TOKEN_CMID * 
+TOKEN_CMID * You should have received a copy of the GNU Lesser General Public 
+TOKEN_CMID * License along with this library. If not, see <http://www.gnu.org/licenses/>. 
+TOKEN_CEND */ 
+
+TOKEN_CSTART /* 
+TOKEN_CMID * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS 
+TOKEN_CMID * file for a list of people on the GTK+ Team. See the ChangeLog 
+TOKEN_CMID * files for a list of changes. These files are distributed with 
+TOKEN_CMID * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+TOKEN_CEND */ 
+
+TOKEN_IFNDEF #ifndef __GTK_WINDOW_H__ 
+TOKEN_DEFINE #define __GTK_WINDOW_H__ 
+
+
+TOKEN_IF #if TOKEN_NOT_DEFINED !defined (__GTK_H_INSIDE__) && TOKEN_NOT_DEFINED !defined (GTK_COMPILATION) 
+TOKEN_ERROR #error "Only <gtk/gtk.h> can be included directly." 
+TOKEN_ENDIF #endif 
+
+TOKEN_INCLUDE #include <gtk/gtkapplication.h> 
+TOKEN_INCLUDE #include <gtk/gtkaccelgroup.h> 
+TOKEN_INCLUDE #include <gtk/gtkbin.h> 
+
+G_BEGIN_DECLS 
+
+TOKEN_DEFINE #define GTK_TYPE_WINDOW (gtk_window_get_type ()) 
+TOKEN_DEFINE #define GTK_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_WINDOW, GtkWindow)) 
+TOKEN_DEFINE #define GTK_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WINDOW, GtkWindowClass)) 
+TOKEN_DEFINE #define GTK_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_WINDOW)) 
+TOKEN_DEFINE #define GTK_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WINDOW)) 
+TOKEN_DEFINE #define GTK_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WINDOW, GtkWindowClass)) 
+
+TOKEN_TYPEDEF typedef TOKEN_STRUCT struct _GtkWindowPrivate GtkWindowPrivate; 
+TOKEN_TYPEDEF typedef TOKEN_STRUCT struct _GtkWindowClass GtkWindowClass; 
+TOKEN_TYPEDEF typedef TOKEN_STRUCT struct _GtkWindowGeometryInfo GtkWindowGeometryInfo; 
+TOKEN_TYPEDEF typedef TOKEN_STRUCT struct _GtkWindowGroup GtkWindowGroup; 
+TOKEN_TYPEDEF typedef TOKEN_STRUCT struct _GtkWindowGroupClass GtkWindowGroupClass; 
+TOKEN_TYPEDEF typedef TOKEN_STRUCT struct _GtkWindowGroupPrivate GtkWindowGroupPrivate; 
+
+TOKEN_STRUCT struct _GtkWindow 
+TOKEN_LBRACE { 
+GtkBin bin; 
+
+GtkWindowPrivate *priv; 
+TOKEN_ENDBRACE }; 
+
+TOKEN_CSTART /** 
+TOKEN_CMID * GtkWindowClass: 
+TOKEN_CMID * @parent_class: The parent class. 
+TOKEN_CMID * @set_focus: Sets child as the focus widget for the window. 
+TOKEN_CMID * @activate_focus: Activates the current focused widget within the window. 
+TOKEN_CMID * @activate_default: Activates the default widget for the window. 
+TOKEN_CMID * @keys_changed: Signal gets emitted when the set of accelerators or 
+TOKEN_CMID * mnemonics that are associated with window changes. 
+TOKEN_CMID * @enable_debugging: Class handler for the #GtkWindow::enable-debugging 
+TOKEN_CMID * keybinding signal. Since: 3.14 
+TOKEN_CEND */ 
+TOKEN_STRUCT struct _GtkWindowClass 
+TOKEN_LBRACE { 
+GtkBinClass parent_class; 
+
+TOKEN_CSTART /*< public TOKEN_CEND >*/ 
+
+TOKEN_VOID void (* set_focus) (GtkWindow *window, 
+GtkWidget *focus); 
+
+TOKEN_CSTART /* G_SIGNAL_ACTION signals for keybindings TOKEN_CEND */ 
+
+TOKEN_VOID void (* activate_focus) (GtkWindow *window); 
+TOKEN_VOID void (* activate_default) (GtkWindow *window); 
+TOKEN_VOID void (* keys_changed) (GtkWindow *window); 
+gboolean (* enable_debugging) (GtkWindow *window, 
+gboolean toggle); 
+
+TOKEN_CSTART /*< private TOKEN_CEND >*/ 
+
+TOKEN_CSTART /* Padding for future expansion TOKEN_CEND */ 
+TOKEN_VOID void (*_gtk_reserved1) (void); 
+TOKEN_VOID void (*_gtk_reserved2) (void); 
+TOKEN_VOID void (*_gtk_reserved3) (void); 
+TOKEN_ENDBRACE }; 
+
+TOKEN_CSTART /** 
+TOKEN_CMID * GtkWindowType: 
+TOKEN_CMID * @GTK_WINDOW_TOPLEVEL: A regular window, such as a dialog. 
+TOKEN_CMID * @GTK_WINDOW_POPUP: A special window such as a tooltip. 
+TOKEN_CMID * 
+TOKEN_CMID * A #GtkWindow can be one of these types. Most things you’d consider a 
+TOKEN_CMID * “window” should have type #GTK_WINDOW_TOPLEVEL; windows with this type 
+TOKEN_CMID * are managed by the window manager and have a frame by default (call 
+TOKEN_CMID * gtk_window_set_decorated() to toggle the frame). Windows with type 
+TOKEN_CMID * #GTK_WINDOW_POPUP are ignored by the window manager; window manager 
+TOKEN_CMID * keybindings won’t work on them, the window manager won’t decorate the 
+TOKEN_CMID * window with a frame, many GTK+ features that rely on the window 
+TOKEN_CMID * manager will not work (e.g. resize grips and 
+TOKEN_CMID * maximization/minimization). #GTK_WINDOW_POPUP is used to implement 
+TOKEN_CMID * widgets such as #GtkMenu or tooltips that you normally don’t think of 
+TOKEN_CMID * as windows per se. Nearly all windows should be #GTK_WINDOW_TOPLEVEL. 
+TOKEN_CMID * In particular, do not use #GTK_WINDOW_POPUP just to turn off 
+TOKEN_CMID * the window borders; use gtk_window_set_decorated() for that. 
+TOKEN_CEND */ 
+TOKEN_TYPEDEF typedef TOKEN_ENUM enum 
+TOKEN_LBRACE { 
+GTK_WINDOW_TOPLEVEL, 
+GTK_WINDOW_POPUP 
+TOKEN_RBRACE } GtkWindowType; 
+
+TOKEN_CSTART /** 
+TOKEN_CMID * GtkWindowPosition: 
+TOKEN_CMID * @GTK_WIN_POS_NONE: No influence is made on placement. 
+TOKEN_CMID * @GTK_WIN_POS_CENTER: Windows should be placed in the center of the screen. 
+TOKEN_CMID * @GTK_WIN_POS_MOUSE: Windows should be placed at the current mouse position. 
+TOKEN_CMID * @GTK_WIN_POS_CENTER_ALWAYS: Keep window centered as it changes size, etc. 
+TOKEN_CMID * @GTK_WIN_POS_CENTER_ON_PARENT: Center the window on its transient 
+TOKEN_CMID * parent (see gtk_window_set_transient_for()). 
+TOKEN_CMID * 
+TOKEN_CMID * Window placement can be influenced using this enumeration. Note that 
+TOKEN_CMID * using #GTK_WIN_POS_CENTER_ALWAYS is almost always a bad idea. 
+TOKEN_CMID * It won’t necessarily work well with all window managers or on all windowing systems. 
+TOKEN_CEND */ 
+TOKEN_TYPEDEF typedef TOKEN_ENUM enum 
+TOKEN_LBRACE { 
+GTK_WIN_POS_NONE, 
+GTK_WIN_POS_CENTER, 
+GTK_WIN_POS_MOUSE, 
+GTK_WIN_POS_CENTER_ALWAYS, 
+GTK_WIN_POS_CENTER_ON_PARENT 
+TOKEN_RBRACE } GtkWindowPosition; 
+
+
+GDK_AVAILABLE_IN_ALL 
+GType gtk_window_get_type (void) G_GNUC_CONST; 
+GDK_AVAILABLE_IN_ALL 
+GtkWidget* gtk_window_new (GtkWindowType type); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_title (GtkWindow *window, 
+TOKEN_CONST const gchar *title); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_CONST const gchar TOKEN_MULT * gtk_window_get_title (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_wmclass (GtkWindow *window, 
+TOKEN_CONST const gchar *wmclass_name, 
+TOKEN_CONST const gchar *wmclass_class); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_role (GtkWindow *window, 
+TOKEN_CONST const gchar *role); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_startup_id (GtkWindow *window, 
+TOKEN_CONST const gchar *startup_id); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_CONST const gchar TOKEN_MULT * gtk_window_get_role (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_add_accel_group (GtkWindow *window, 
+GtkAccelGroup *accel_group); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_remove_accel_group (GtkWindow *window, 
+GtkAccelGroup *accel_group); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_position (GtkWindow *window, 
+GtkWindowPosition position); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_activate_focus (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_focus (GtkWindow *window, 
+GtkWidget *focus); 
+GDK_AVAILABLE_IN_ALL 
+GtkWidget *gtk_window_get_focus (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_default (GtkWindow *window, 
+GtkWidget *default_widget); 
+GDK_AVAILABLE_IN_ALL 
+GtkWidget *gtk_window_get_default_widget (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_activate_default (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_transient_for (GtkWindow *window, 
+GtkWindow *parent); 
+GDK_AVAILABLE_IN_ALL 
+GtkWindow *gtk_window_get_transient_for (GtkWindow *window); 
+GDK_AVAILABLE_IN_3_4 
+TOKEN_VOID void gtk_window_set_attached_to (GtkWindow *window, 
+GtkWidget *attach_widget); 
+GDK_AVAILABLE_IN_3_4 
+GtkWidget *gtk_window_get_attached_to (GtkWindow *window); 
+GDK_DEPRECATED_IN_3_8_FOR(gtk_widget_set_opacity) 
+TOKEN_VOID void gtk_window_set_opacity (GtkWindow *window, 
+gdouble opacity); 
+GDK_DEPRECATED_IN_3_8_FOR(gtk_widget_get_opacity) 
+gdouble gtk_window_get_opacity (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_type_hint (GtkWindow *window, 
+GdkWindowTypeHint hint); 
+GDK_AVAILABLE_IN_ALL 
+GdkWindowTypeHint gtk_window_get_type_hint (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_skip_taskbar_hint (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_skip_taskbar_hint (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_skip_pager_hint (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_skip_pager_hint (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_urgency_hint (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_urgency_hint (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_accept_focus (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_accept_focus (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_focus_on_map (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_focus_on_map (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_destroy_with_parent (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_destroy_with_parent (GtkWindow *window); 
+GDK_AVAILABLE_IN_3_4 
+TOKEN_VOID void gtk_window_set_hide_titlebar_when_maximized (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_3_4 
+gboolean gtk_window_get_hide_titlebar_when_maximized (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_mnemonics_visible (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_mnemonics_visible (GtkWindow *window); 
+GDK_AVAILABLE_IN_3_2 
+TOKEN_VOID void gtk_window_set_focus_visible (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_3_2 
+gboolean gtk_window_get_focus_visible (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_resizable (GtkWindow *window, 
+gboolean resizable); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_resizable (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_gravity (GtkWindow *window, 
+GdkGravity gravity); 
+GDK_AVAILABLE_IN_ALL 
+GdkGravity gtk_window_get_gravity (GtkWindow *window); 
+
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_geometry_hints (GtkWindow *window, 
+GtkWidget *geometry_widget, 
+GdkGeometry *geometry, 
+GdkWindowHints geom_mask); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_screen (GtkWindow *window, 
+GdkScreen *screen); 
+GDK_AVAILABLE_IN_ALL 
+GdkScreen* gtk_window_get_screen (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_is_active (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_has_toplevel_focus (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_decorated (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_decorated (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_deletable (GtkWindow *window, 
+gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_deletable (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_icon_list (GtkWindow *window, 
+GList *list); 
+GDK_AVAILABLE_IN_ALL 
+GList* gtk_window_get_icon_list (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_icon (GtkWindow *window, 
+GdkPixbuf *icon); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_icon_name (GtkWindow *window, 
+TOKEN_CONST const gchar *name); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_set_icon_from_file (GtkWindow *window, 
+TOKEN_CONST const gchar *filename, 
+GError **err); 
+GDK_AVAILABLE_IN_ALL 
+GdkPixbuf* gtk_window_get_icon (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_CONST const gchar TOKEN_MULT * gtk_window_get_icon_name (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_default_icon_list (GList *list); 
+GDK_AVAILABLE_IN_ALL 
+GList* gtk_window_get_default_icon_list (void); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_default_icon (GdkPixbuf *icon); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_default_icon_name (const gchar *name); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_CONST const gchar TOKEN_MULT * gtk_window_get_default_icon_name (void); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_set_default_icon_from_file (const gchar *filename, 
+GError **err); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_auto_startup_notification (gboolean setting); 
+
+TOKEN_CSTART /* If window is set modal, input will be grabbed when show and released when hide TOKEN_CEND */ 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_modal (GtkWindow *window, 
+gboolean modal); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_get_modal (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+GList* gtk_window_list_toplevels (void); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_has_user_ref_count (GtkWindow *window, 
+gboolean setting); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_add_mnemonic (GtkWindow *window, 
+guint keyval, 
+GtkWidget *target); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_remove_mnemonic (GtkWindow *window, 
+guint keyval, 
+GtkWidget *target); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_mnemonic_activate (GtkWindow *window, 
+guint keyval, 
+GdkModifierType modifier); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_mnemonic_modifier (GtkWindow *window, 
+GdkModifierType modifier); 
+GDK_AVAILABLE_IN_ALL 
+GdkModifierType gtk_window_get_mnemonic_modifier (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_activate_key (GtkWindow *window, 
+GdkEventKey *event); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_propagate_key_event (GtkWindow *window, 
+GdkEventKey *event); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_present (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_present_with_time (GtkWindow *window, 
+guint32 timestamp); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_iconify (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_deiconify (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_stick (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_unstick (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_maximize (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_unmaximize (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_fullscreen (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_unfullscreen (GtkWindow *window); 
+GDK_AVAILABLE_IN_3_18 
+TOKEN_VOID void gtk_window_fullscreen_on_monitor(GtkWindow *window, 
+GdkScreen *screen, 
+gint monitor); 
+GDK_AVAILABLE_IN_3_10 
+TOKEN_VOID void gtk_window_close (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_keep_above (GtkWindow *window, gboolean setting); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_keep_below (GtkWindow *window, gboolean setting); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_begin_resize_drag (GtkWindow *window, 
+GdkWindowEdge edge, 
+gint button, 
+gint root_x, 
+gint root_y, 
+guint32 timestamp); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_begin_move_drag (GtkWindow *window, 
+gint button, 
+gint root_x, 
+gint root_y, 
+guint32 timestamp); 
+
+TOKEN_CSTART /* Set initial default size of the window (does not constrain user 
+TOKEN_CMID * resize operations) 
+TOKEN_CEND */ 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_default_size (GtkWindow *window, 
+gint width, 
+gint height); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_get_default_size (GtkWindow *window, 
+gint *width, 
+gint *height); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_resize (GtkWindow *window, 
+gint width, 
+gint height); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_get_size (GtkWindow *window, 
+gint *width, 
+gint *height); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_move (GtkWindow *window, 
+gint x, 
+gint y); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_get_position (GtkWindow *window, 
+gint *root_x, 
+gint *root_y); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_parse_geometry (GtkWindow *window, 
+TOKEN_CONST const gchar *geometry); 
+
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_default_geometry (GtkWindow *window, 
+gint width, 
+gint height); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_resize_to_geometry (GtkWindow *window, 
+gint width, 
+gint height); 
+
+GDK_AVAILABLE_IN_ALL 
+GtkWindowGroup *gtk_window_get_group (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+gboolean gtk_window_has_group (GtkWindow *window); 
+
+TOKEN_CSTART /* Ignore this unless you are writing a GUI builder TOKEN_CEND */ 
+GDK_DEPRECATED_IN_3_10 
+TOKEN_VOID void gtk_window_reshow_with_initial_size (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_ALL 
+GtkWindowType gtk_window_get_window_type (GtkWindow *window); 
+
+
+GDK_AVAILABLE_IN_ALL 
+GtkApplication *gtk_window_get_application (GtkWindow *window); 
+GDK_AVAILABLE_IN_ALL 
+TOKEN_VOID void gtk_window_set_application (GtkWindow *window, 
+GtkApplication *application); 
+
+
+TOKEN_CSTART /* Window grips 
+TOKEN_CEND */ 
+GDK_DEPRECATED_IN_3_14 
+TOKEN_VOID void gtk_window_set_has_resize_grip (GtkWindow *window, 
+gboolean value); 
+GDK_DEPRECATED_IN_3_14 
+gboolean gtk_window_get_has_resize_grip (GtkWindow *window); 
+GDK_DEPRECATED_IN_3_14 
+gboolean gtk_window_resize_grip_is_visible (GtkWindow *window); 
+GDK_DEPRECATED_IN_3_14 
+gboolean gtk_window_get_resize_grip_area (GtkWindow *window, 
+GdkRectangle *rect); 
+
+GDK_AVAILABLE_IN_3_10 
+TOKEN_VOID void gtk_window_set_titlebar (GtkWindow *window, 
+GtkWidget *titlebar); 
+GDK_AVAILABLE_IN_3_16 
+GtkWidget *gtk_window_get_titlebar (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_3_12 
+gboolean gtk_window_is_maximized (GtkWindow *window); 
+
+GDK_AVAILABLE_IN_3_14 
+TOKEN_VOID void gtk_window_set_interactive_debugging (gboolean enable); 
+
+G_END_DECLS 
+
+TOKEN_ENDIF #endif TOKEN_CSTART /* __GTK_WINDOW_H__ TOKEN_CEND */ 
diff --git a/h2inc.py b/h2inc.py
index d04ee39..1282c0b 100644
--- a/h2inc.py
+++ b/h2inc.py
@@ -85,7 +85,7 @@ class H2INC:
         for lines in fh:
             self.tupfile.append(lines)
         fh.close()
-        resultfile = parse.parseheader(self.tupfile)
+        resultfile = parse.parseheader(self.tupfile, inputfile)
         print(resultfile)
         for l in resultfile:
             for w in l:
@@ -93,8 +93,8 @@ class H2INC:
             outfile += "\n"
         outputfile = os.path.splitext(inputfile)[0]+'.inc'
         outputfile = str(outputfile).replace(self.sourcedir, self.destdir)
-        print(outputfile)
-        print(os.path.dirname(outputfile))
+        #print(outputfile)
+        #print(os.path.dirname(outputfile))
         self.write_file(outputfile,outfile)
         
     def write_file(self, fn, data):
diff --git a/parser.py b/parser.py
index 16199bd..d524332 100644
--- a/parser.py
+++ b/parser.py
@@ -2,17 +2,18 @@
 Contains class PARSER
 '''
 from itertools import count
+import os
 
 #Element type definitions. Used in the parse process.
 ELEMENT_TYPE_PREPROCESS = 1
 ELEMENT_TYPE_REGULAR = 2
 
 TOKENS = ['TOKEN_CSTART','TOKEN_CMID','TOKEN_CEND','TOKEN_RPAREN',
-        'TOKEN_LPAREN','TOKEN_ENDLINE','TOKEN_RETVAL','TOKEN_PREPROCESS',
+        'TOKEN_LPAREN','TOKEN_ENDLINE','TOKEN_RETVAL','TOKEN_TYPEDEF',
         'TOKEN_ID','TOKEN_PLUS','TOKEN_MINUS','TOKEN_DIV','TOKEN_MULT',
         'TOKEN_ASSIGN','TOKEN_EQUAL','TOKEN_LBRACE','TOKEN_RBRACE',
         'TOKEN_COMMA','TOKEN_SEMICOLON','TOKEN_LANGLE','TOKEN_RANGLE',
-        'TOKEN_POINTER', 'TOKEN_STRUCT']
+        'TOKEN_POINTER', 'TOKEN_STRUCT','TOKEN_ENUM']
 
 RESERVED = {'auto'  : 'AUTO','break' : 'BREAK','case' : 'CASE','char' : 'CHAR',
         'const' : 'CONST','continue' : 'CONTINUE','default' : 'DEFAULT','do' : 'DO',
@@ -23,16 +24,23 @@ RESERVED = {'auto'  : 'AUTO','break' : 'BREAK','case' : 'CASE','char' : 'CHAR',
         'double' : 'DOUBLE','else' : 'ELSE','enum' : 'ENUM','extern' : 'EXTERN',
         'float' : 'FLOAT','for' : 'FOR','goto' : 'GOTO','if' : 'IF'}
 
-PREPROCESSOR_DIRECTIVES = {'#include' : 'TOKEN_PREPROCESS','#define' : 'TOKEN_PREPROCESS','#undef' : 'TOKEN_PREPROCESS',
-        '#if' : 'TOKEN_PREPROCESS','#ifdef' : 'TOKEN_PREPROCESS','#ifndef' : 'TOKEN_PREPROCESS','#error' : 'TOKEN_PREPROCESS',
-        '__FILE__' : 'TOKEN_PREPROCESS','__LINE__' : 'TOKEN_PREPROCESS','__DATE__' : 'TOKEN_PREPROCESS',
-        '__TIME__' : 'TOKEN_PREPROCESS','__TIMESTAMP__' : 'TOKEN_PREPROCESS','pragma' : 'TOKEN_PREPROCESS',
-        '#' : 'TOKEN_PREPROCESS','##' : 'TOKEN_PREPROCESS','#endif' : 'TOKEN_PREPROCESS'}
+PREPROCESSOR_DIRECTIVES = {'#include' : 'TOKEN_INCLUDE','#define' : 'TOKEN_DEFINE','#undef' : 'TOKEN_UNDEFINE',
+        '#if' : 'TOKEN_IF','#ifdef' : 'TOKEN_IFDEF','#ifndef' : 'TOKEN_IFNDEF','#error' : 'TOKEN_ERROR',
+        '__FILE__' : 'TOKEN_BASE_FILE','__LINE__' : 'TOKEN_BASE_LINE','__DATE__' : 'TOKEN_BASE_DATE',
+        '__TIME__' : 'TOKEN_BASE_TIME','__TIMESTAMP__' : 'TOKEN_BASE_TIMESTAMP','pragma' : 'TOKEN_PRAGMA',
+        '#' : 'TOKEN_HASH','##' : 'TOKEN_DOUBLEHASH','#endif' : 'TOKEN_ENDIF'}
 
-REGULAR = {'/*' : 'TOKEN_CSTART','*/' : 'TOKEN_CEND', '*' : 'TOKEN_CMID', '=' : 'TOKEN_ASSIGN','==' : 'TOKEN_EQUAL',
-        '{' : 'TOKEN_LBRACE','}' : 'TOKEN_RBRACE','\+' : 'TOKEN_PLUS','-' : 'TOKEN_MINUS',
-        '\*' : 'TOKEN_MULT','/' : 'TOKEN_DIV','\(' : 'TOKEN_LPAREN','\)' : 'TOKEN_RPAREN',
-        ',' : 'TOKEN_COMMA',';' : 'TOKEN_SEMICOLON','\<' : 'TOKEN_LANGLE','\>' : 'TOKEN_RANGLE'}
+REGULAR = {'/*' : 'TOKEN_CSTART','/**' : 'TOKEN_CSTART','*/' : 'TOKEN_CEND', '*' : 'TOKEN_CMID', '=' : 'TOKEN_ASSIGN',
+        '==' : 'TOKEN_EQUAL','{' : 'TOKEN_LBRACE','}' : 'TOKEN_RBRACE','};' : 'TOKEN_ENDBRACE','+' : 'TOKEN_PLUS','-' : 'TOKEN_MINUS',
+        '*' : 'TOKEN_MULT','/' : 'TOKEN_DIV','(' : 'TOKEN_LPAREN',')' : 'TOKEN_RPAREN',',' : 'TOKEN_COMMA',
+        ';' : 'TOKEN_SEMICOLON','<' : 'TOKEN_LANGLE','>' : 'TOKEN_RANGLE','TYPEDEF' : 'TOKEN_TYPEDEF',
+        'typedef' : 'TOKEN_TYPEDEF','enum' : 'TOKEN_ENUM','ENUM' : 'TOKEN_ENUM','struct' : 'TOKEN_STRUCT',
+        'STRUCT' : 'TOKEN_STRUCT','char' : 'TOKEN_CHAR','CHAR' : 'TOKEN_CHAR','const' : 'TOKEN_CONST',
+        'CONST' : 'TOKEN_CONST','int' : 'TOKEN_INT','INT' : 'TOKEN_INT','long' : 'TOKEN_LONG','LONG' : 'TOKEN_LONG',
+        'short' : 'TOKEN_SHORT','SHORT' : 'TOKEN_SHORT','signed' : 'TOKEN_SIGNED','SIGNED' : 'TOKEN_SIGNED',
+        'unsigned' : 'TOKEN_UNSIGNED','UNSIGNED' : 'TOKEN_UNSIGNED','void' : 'TOKEN_VOID','VOID' : 'TOKEN_VOID',
+        'volatile' : 'TOKEN_VOLATILE','VOLATILE' : 'TOKEN_VOLATILE','double' : 'TOKEN_DOUBLE','DOUBLE' : 'TOKEN_DOUBLE',
+        'float' : 'TOKEN_FLOAT','FLOAT' : 'TOKEN_FLOAT', '!defined' : 'TOKEN_NOT_DEFINED', '!DEFINED' : 'TOKEN_NOT_DEFINED'}
 
 NASM_PREPROCESS_DIRECTIVES = {'#include' : '%include','#define' : '%define','#undef' : '%undef',
         '#if' : '%if','#ifdef' : '%ifdef','#ifndef' : '%ifndef','#endif' : '%endif',
@@ -44,11 +52,17 @@ NASM_ENUM = "EQU"
 
 NASM_REGULAR = {'/*' : ';', '*' : ';', '*/' : ''}
 
-TOKENS += RESERVED.values()
+#REGULAR += RESERVED.values()
+
+PARSER_TOKENS = ['PARSE_MULTILINE_COMMENT', 'PARSE_SINGLELINE_COMMENT', 'PARSE_TYPEDEF_ENUM', 'PARSE_TYPEDEF_STRUCT',
+                'PARSE_TYPEDEF_STRUCT_STRUCT', 'PARSE_STRUCT', 'PARSE_TAG_NAME', 'PARSE_STRUCT_MEMBER', 'PARSE_ENDSTRUCT',
+                'PARSE_ALIAS', 'PARSE_FUNCTION_POINTER', 'PARSE_FUNCTION']
 
 COMMENT_SINGLE_LINE = 0
 COMMENT_MULTI_LINE = 1
 
+inside_comment = False
+
 class PARSEOBJECT:
     _passes = count(0)
     
@@ -73,14 +87,28 @@ class PARSEOBJECT:
     def inc_passes(self):
         self.passes = next(self._passes)
 
-    def parseheader(self, fl):
+    def parseheader(self, fl, fn):
         tempfile = []
+        tempfile1 = []
+        outfile = ''
         self.parse_reset()
         for l in fl:
             analyzed_line = self.analyzer(l)
             tempfile.append(analyzed_line)
         self.inc_passes()
-        self.parsefile = self.parsetokens(tempfile)
+        print(tempfile)
+        for l in tempfile:
+            analyzed_line = self.token_analyzer(l)
+            tempfile1.append(analyzed_line)
+        for l in tempfile1:
+            for w in l:
+                outfile += w+" "
+            outfile += "\n"
+        outputfile = os.path.splitext(fn)[0]+'.tokenized'
+        self.write_file(outputfile,outfile)
+        self.inc_passes()
+        print(tempfile1)
+        self.parsefile = self.parsetokens(tempfile1)
         return self.parsefile
 
     def parseinclude(self, data):
@@ -101,6 +129,12 @@ class PARSEOBJECT:
         if w in REGULAR:
             token = REGULAR.get(w)
             return token
+        if w.startswith('/*'):
+            token = 'TOKEN_CSTART'
+            return token
+        if w.endswith('*/'):
+            token = 'TOKEN_CEND'
+            return token
         return False
 
     def analyzer(self, ln):
@@ -116,6 +150,29 @@ class PARSEOBJECT:
                 analysed.append(w)
         return analysed
 
+    def token_analyzer(self, ln):
+        global inside_comment
+        analyzed = []
+        for w in ln:
+            if w == 'TOKEN_CSTART':
+                inside_comment = True
+                analyzed.append(w)
+                continue
+            if inside_comment == True:
+                if w == 'TOKEN_MULT':
+                    analyzed.append('TOKEN_CMID')
+                    continue
+                else:
+                    if w == 'TOKEN_CEND':
+                        analyzed.append(w)
+                        inside_comment = False
+                        continue
+                    else:
+                        if w.startswith('TOKEN'):
+                            continue
+            analyzed.append(w)
+        return analyzed
+
     def parsetokens(self, fl):
         templine = []
         tempfile = []
@@ -244,7 +301,6 @@ class PARSEOBJECT:
                 self.typedef_enum = False
                 continue
             
-
     def parse_comment(self, l):
         templine = []
         for w in l:
@@ -273,6 +329,16 @@ class PARSEOBJECT:
             newline.append(w)
         return newline
                 
+    def write_file(self, fn, data):
+        if not os.path.exists(os.path.dirname(fn)):
+            try:  
+                os.makedirs(os.path.dirname(fn))
+            except OSError as exc: # Guard against race condition
+                if exc.errno != errno.EEXIST:
+                    raise
+        newfile = open(fn, "w")
+        newfile.write(data)
+        newfile.close()
 
 class PARSER(PARSEOBJECT):
     _ids = count(0)