1 files changed, 2 insertions, 23 deletions
diff --git a/obt/obt.h b/obt/obt.h
index 7fb59d2c..0343a6a7 100644
--- a/obt/obt.h
+++ b/obt/obt.h
@@ -19,28 +19,7 @@
 #ifndef __obt_h
 #define __obt_h
 
-#include <X11/Xlib.h>
-#include <glib.h>
-
-#ifdef HAVE_STRING_H
-#  include <string.h> /* for memset() */
-#endif
-
-G_BEGIN_DECLS
-
-typedef struct _ObtInstance ObtInstance;
-
-/* Instance funcs */
-ObtInstance* obt_instance_new   (const char *display_name);
-void         obt_instance_ref   (ObtInstance *inst);
-void         obt_instance_unref (ObtInstance *inst);
-
-Display*     obt_display        (const ObtInstance *inst);
-
-/* Util funcs */
-#define obt_free g_free
-#define obt_free0(p, type, num) memset((p), 0, sizeof(type) * (num)), g_free(p)
-
-G_END_DECLS
+#include "obt/instance.h"
+#include "obt/util.h"
 
 #endif /*__obt_h*/