diff --git a/libglpng/include/GL/glpng.h b/libglpng/include/GL/glpng.h
index b98ab88..4664c75 100644
--- a/libglpng/include/GL/glpng.h
+++ b/libglpng/include/GL/glpng.h
@@ -24,6 +24,9 @@
 #define _GLPNG_H_
 
 #include <stdio.h>
+#include <png.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libglpng/src/glpng.c b/libglpng/src/glpng.c
index 1ddceac..40d7ccb 100644
--- a/libglpng/src/glpng.c
+++ b/libglpng/src/glpng.c
@@ -276,7 +276,7 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRawInfo *pinfo) {
 	endinfo = png_create_info_struct(png);
 
 	// DH: added following lines
-	if (setjmp(png->jmpbuf))
+	if (setjmp(png_jmpbuf(png)))
 	{
 		png_destroy_read_struct(&png, &info, &endinfo);
 		return 0;
@@ -380,7 +380,7 @@ int APIENTRY pngLoadF(FILE *fp, int mipmap, int trans, pngInfo *pinfo) {
 	endinfo = png_create_info_struct(png);
 
 	// DH: added following lines
-	if (setjmp(png->jmpbuf))
+	if (setjmp(png_jmpbuf(png)))
 	{
 		png_destroy_read_struct(&png, &info, &endinfo);
 		return 0;