diff --git a/gtk-traymanager.cabal b/gtk-traymanager.cabal
--- a/gtk-traymanager.cabal
+++ b/gtk-traymanager.cabal
@@ -1,5 +1,5 @@
 name: gtk-traymanager
-version: 0.1.0
+version: 0.1.1
 synopsis: A wrapper around the eggtraymanager library for Linux system trays
 license: LGPL-2.1
 license-file: LICENSE
@@ -8,7 +8,10 @@
 category: Graphics
 build-type: Simple
 cabal-version: >=1.10
-extra-source-files: README.md
+extra-source-files: README.md,
+                    src/c/eggmarshalers.h,
+                    src/c/eggtraymanager.h,
+                    src/c/gdk-helper.h
 stability: experimental
 homepage: http://github.com/travitch/gtk-traymanager
 description: This package provides a wrapper around the prolific eggtraymanager code.
diff --git a/src/c/eggmarshalers.h b/src/c/eggmarshalers.h
new file mode 100644
--- /dev/null
+++ b/src/c/eggmarshalers.h
@@ -0,0 +1,25 @@
+#include	<glib-object.h>
+
+/* VOID:OBJECT,OBJECT (eggmarshalers.list:1) */
+void _egg_marshal_VOID__OBJECT_OBJECT (GClosure     *closure,
+                                              GValue       *return_value,
+                                              guint         n_param_values,
+                                              const GValue *param_values,
+                                              gpointer      invocation_hint,
+                                              gpointer      marshal_data);
+
+/* VOID:OBJECT,STRING,LONG,LONG (eggmarshalers.list:2) */
+void _egg_marshal_VOID__OBJECT_STRING_LONG_LONG (GClosure     *closure,
+                                                        GValue       *return_value,
+                                                        guint         n_param_values,
+                                                        const GValue *param_values,
+                                                        gpointer      invocation_hint,
+                                                        gpointer      marshal_data);
+
+/* VOID:OBJECT,LONG (eggmarshalers.list:3) */
+void _egg_marshal_VOID__OBJECT_LONG (GClosure     *closure,
+                                            GValue       *return_value,
+                                            guint         n_param_values,
+                                            const GValue *param_values,
+                                            gpointer      invocation_hint,
+                                            gpointer      marshal_data);
diff --git a/src/c/eggtraymanager.h b/src/c/eggtraymanager.h
new file mode 100644
--- /dev/null
+++ b/src/c/eggtraymanager.h
@@ -0,0 +1,88 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* eggtraymanager.h
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * 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 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
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __EGG_TRAY_MANAGER_H__
+#define __EGG_TRAY_MANAGER_H__
+
+#include <gtk/gtkwidget.h>
+#include <gdk/gdkx.h>
+
+G_BEGIN_DECLS
+
+#define EGG_TYPE_TRAY_MANAGER			(egg_tray_manager_get_type ())
+#define EGG_TRAY_MANAGER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_MANAGER, EggTrayManager))
+#define EGG_TRAY_MANAGER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_MANAGER, EggTrayManagerClass))
+#define EGG_IS_TRAY_MANAGER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_MANAGER))
+#define EGG_IS_TRAY_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_MANAGER))
+#define EGG_TRAY_MANAGER_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_MANAGER, EggTrayManagerClass))
+	
+typedef struct _EggTrayManager	     EggTrayManager;
+typedef struct _EggTrayManagerClass  EggTrayManagerClass;
+typedef struct _EggTrayManagerChild  EggTrayManagerChild;
+
+struct _EggTrayManager
+{
+  GObject parent_instance;
+
+  Atom opcode_atom;
+  Atom selection_atom;
+  Atom message_data_atom;
+  
+  GtkWidget *invisible;
+  GdkScreen *screen;
+
+  GList *messages;
+  GHashTable *socket_table;
+};
+
+struct _EggTrayManagerClass
+{
+  GObjectClass parent_class;
+
+  void (* tray_icon_added)   (EggTrayManager      *manager,
+			      EggTrayManagerChild *child);
+  void (* tray_icon_removed) (EggTrayManager      *manager,
+			      EggTrayManagerChild *child);
+
+  void (* message_sent)      (EggTrayManager      *manager,
+			      EggTrayManagerChild *child,
+			      const gchar         *message,
+			      glong                id,
+			      glong                timeout);
+  
+  void (* message_cancelled) (EggTrayManager      *manager,
+			      EggTrayManagerChild *child,
+			      glong                id);
+
+  void (* lost_selection)    (EggTrayManager      *manager);
+};
+
+GType           egg_tray_manager_get_type        (void);
+
+gboolean        egg_tray_manager_check_running   (GdkScreen           *screen);
+EggTrayManager *egg_tray_manager_new             (void);
+gboolean        egg_tray_manager_manage_screen   (EggTrayManager      *manager,
+						  GdkScreen           *screen);
+char           *egg_tray_manager_get_child_title (EggTrayManager      *manager,
+						  EggTrayManagerChild *child);
+
+G_END_DECLS
+
+#endif /* __EGG_TRAY_MANAGER_H__ */
diff --git a/src/c/gdk-helper.h b/src/c/gdk-helper.h
new file mode 100644
--- /dev/null
+++ b/src/c/gdk-helper.h
@@ -0,0 +1,4 @@
+#include <gdk/gdkx.h>
+#include <gdk/gdk.h>
+
+Display* gdk_helper_display();