Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -46,14 +46,14 @@
 clean:
 	rm -f test libobjpgsql.* exceptions/*~ *~
 	rm -fr build
 
 install:
-	mkdir -p ${destdir}${prefix}/include/ObjPgSQL/exceptions
+	mkdir -p ${destdir}${prefix}/include/ObjPgSQL
 	for i in ${HEADERS}; do \
 		${INSTALL} -m 644 $$i \
-			${destdir}${prefix}/include/ObjPgSQL/$$i; \
+			${destdir}${prefix}/include/ObjPgSQL/$$(basename $$i); \
 	done
 	mkdir -p ${destdir}${prefix}/lib
 	export LIB_MAJOR=${LIB_MAJOR}; \
 	export LIB_MINOR=${LIB_MINOR}; \
 	${INSTALL} -m 755 ${LIB_FILE} ${destdir}${prefix}/lib/${LIB_FILE}

Index: ObjPgSQL.h
==================================================================
--- ObjPgSQL.h
+++ ObjPgSQL.h
@@ -1,6 +1,7 @@
-#import "PGConnection.h"
 #import "PGResult.h"
 #import "PGResultRow.h"
-#import "exceptions/PGCommandFailedException.h"
-#import "exceptions/PGConnectionFailedException.h"
-#import "exceptions/PGException.h"
+#import "PGConnection.h"
+
+#import "PGException.h"
+#import "PGCommandFailedException.h"
+#import "PGConnectionFailedException.h"

Index: exceptions/PGException.h
==================================================================
--- exceptions/PGException.h
+++ exceptions/PGException.h
@@ -1,8 +1,8 @@
 #import <ObjFW/ObjFW.h>
 
-#import "../PGConnection.h"
+#import "PGConnection.h"
 
 @interface PGException: OFException
 {
 	PGConnection *connection;
 }