diff --git a/Makefile b/Makefile
index ddc9886..a86c213 100644
--- a/Makefile
+++ b/Makefile
@@ -48,10 +48,10 @@ clean:
 	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}; \
diff --git a/ObjPgSQL.h b/ObjPgSQL.h
index 25201ab..b650924 100644
--- a/ObjPgSQL.h
+++ b/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"
diff --git a/exceptions/PGException.h b/exceptions/PGException.h
index 71648fa..3e9b73b 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
 {