diff --git a/lua/librsvg-helper.h b/lua/librsvg-helper.h
index ca527ea0..8918f558 100644
--- a/lua/librsvg-helper.h
+++ b/lua/librsvg-helper.h
@@ -25,7 +25,7 @@
 #ifndef _LIBRSVG_HELPER_H_
 #define _LIBRSVG_HELPER_H_
 
-#include <glib>
+#include <glib.h>
 #include <stdlib.h>
 #include <librsvg/rsvg.h>
 
diff --git a/lua/rsvg.pkg b/lua/rsvg.pkg
index 22791744..538c5f90 100644
--- a/lua/rsvg.pkg
+++ b/lua/rsvg.pkg
@@ -42,8 +42,9 @@
    Author: Carl Worth <cworth@cworth.org>
 */
 
-$#include <glib>
+$#include <glib.h>
 $#include <librsvg/rsvg.h>
+$#include "librsvg-helper.h"
 
 typedef struct _RsvgHandle RsvgHandle;
 typedef struct RsvgHandlePrivate RsvgHandlePrivate;
@@ -62,7 +63,8 @@ typedef struct _RsvgDimensionData {
     double em;
     double ex;
     static tolua_outside RsvgDimensionData * rsvgDimensionDataCreate @ create();
-    tolua_outside rsvgDimensionDataGet @ get(int width, int height, double em, double ex);
+    tolua_outside void rsvgDimensionDataGet @ get(int * width, int * height,
+                                                  double * em, double * ex);
 } RsvgDimensionData;
 
 /**
@@ -73,7 +75,7 @@ typedef struct _RsvgPositionData {
     int x;
     int y;
     static tolua_outside RsvgPositionData * rsvgPositionDataCreate @ create();
-    tolua_outside rsvgPositionDataGet @ get(int x, int y);
+    tolua_outside void rsvgPositionDataGet @ get(int * x, int * y);
 } RsvgPositionData;
 
 RsvgHandle  *rsvg_handle_new		(void);
@@ -101,3 +103,6 @@ int         rsvg_handle_render_cairo_sub (RsvgHandle * handle, cairo_t * cr, con
 
 void g_type_init(void);
 void g_object_unref(gpointer object);
+
+RsvgHandle * rsvg_create_handle_from_file(const char *);
+int rsvg_destroy_handle(RsvgHandle *);