diff --git a/.gitignore b/.gitignore
index e344dde..5414c03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 build
+test
 *.dll
 *.dylib
 *.so
diff --git a/Makefile b/Makefile
index 074c839..6e36282 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,9 @@ SRCS = PGConnection.m				\
        exceptions/PGCommandFailedException.m	\
        exceptions/PGConnectionFailedException.m	\
        exceptions/PGException.m
-HEADERS = ${SRCS:.m=.h}
+
+HEADERS = ${SRCS:.m=.h}	\
+	  ObjPgSQL.h
 
 CPPFLAGS += -Wall -Iexceptions -I.
 LIBS += -lpq
diff --git a/ObjPgSQL.h b/ObjPgSQL.h
new file mode 100644
index 0000000..25201ab
--- /dev/null
+++ b/ObjPgSQL.h
@@ -0,0 +1,6 @@
+#import "PGConnection.h"
+#import "PGResult.h"
+#import "PGResultRow.h"
+#import "exceptions/PGCommandFailedException.h"
+#import "exceptions/PGConnectionFailedException.h"
+#import "exceptions/PGException.h"
diff --git a/exceptions/PGException.h b/exceptions/PGException.h
index 3e9b73b..71648fa 100644
--- a/exceptions/PGException.h
+++ b/exceptions/PGException.h
@@ -1,6 +1,6 @@
 #import <ObjFW/ObjFW.h>
 
-#import "PGConnection.h"
+#import "../PGConnection.h"
 
 @interface PGException: OFException
 {