diff --git a/frontends/yasm/yasm-module.c b/frontends/yasm/yasm-module.c
index 432b23582..cfe19d530 100644
--- a/frontends/yasm/yasm-module.c
+++ b/frontends/yasm/yasm-module.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "ltdl.h"
diff --git a/frontends/yasm/yasm-options.c b/frontends/yasm/yasm-options.c
index fd8ba5601..5b309acb3 100644
--- a/frontends/yasm/yasm-options.c
+++ b/frontends/yasm/yasm-options.c
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "yasm-options.h"
diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 498fd4943..1463a0660 100644
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #ifndef WIN32
diff --git a/libyasm.h b/libyasm.h
index 9206f279b..74fa288de 100644
--- a/libyasm.h
+++ b/libyasm.h
@@ -45,35 +45,35 @@
  *                    (used when compiling the library itself)
  */
 
-#include "libyasm/util.h"
-#include "libyasm/linemgr.h"
+#include <libyasm/util.h>
+#include <libyasm/linemgr.h>
 
-#include "libyasm/errwarn.h"
-#include "libyasm/intnum.h"
-#include "libyasm/floatnum.h"
-#include "libyasm/expr.h"
-#include "libyasm/symrec.h"
+#include <libyasm/errwarn.h>
+#include <libyasm/intnum.h>
+#include <libyasm/floatnum.h>
+#include <libyasm/expr.h>
+#include <libyasm/symrec.h>
 
-#include "libyasm/bytecode.h"
-#include "libyasm/section.h"
+#include <libyasm/bytecode.h>
+#include <libyasm/section.h>
 
-#include "libyasm/arch.h"
-#include "libyasm/dbgfmt.h"
-#include "libyasm/objfmt.h"
-#include "libyasm/optimizer.h"
-#include "libyasm/parser.h"
-#include "libyasm/preproc.h"
+#include <libyasm/arch.h>
+#include <libyasm/dbgfmt.h>
+#include <libyasm/objfmt.h>
+#include <libyasm/optimizer.h>
+#include <libyasm/parser.h>
+#include <libyasm/preproc.h>
 
 #ifdef YASM_INTERNAL
 #ifdef YASM_BC_INTERNAL
-#include "libyasm/bc-int.h"
+#include <libyasm/bc-int.h>
 #endif
 #ifdef YASM_EXPR_INTERNAL
-#include "libyasm/expr-int.h"
+#include <libyasm/expr-int.h>
 #endif
-#include "libyasm/file.h"
-#include "libyasm/hamt.h"
-#include "libyasm/bitvect.h"
+#include <libyasm/file.h>
+#include <libyasm/hamt.h>
+#include <libyasm/bitvect.h>
 #endif
 
 #endif
diff --git a/libyasm/util.h b/libyasm/util.h
index 9cf5a0bc0..ca3e26233 100644
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -42,7 +42,7 @@
 # include <stdarg.h>
 
 #if defined(YASM_LIB_AC_INTERNAL) && defined(HAVE_CONFIG_H)
-# include "libyasm/config.h"
+# include <libyasm/config.h>
 #endif
 
 #if !defined(lint) && !defined(NDEBUG)
@@ -126,7 +126,7 @@ int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
 
 #endif	/*YASM_AUTOCONF_INTERNAL*/
 
-#include "libyasm/compat-queue.h"
+#include <libyasm/compat-queue.h>
 
 #if defined(YASM_AUTOCONF_INTERNAL) && defined(HAVE_SYS_CDEFS_H)
 # include <sys/cdefs.h>
@@ -195,8 +195,8 @@ extern void (*yasm_xfree) (/*@only@*/ /*@out@*/ /*@null@*/ void *p)
 
 #endif	/*YASM_INTERNAL*/
 
-#include "libyasm/coretype.h"
+#include <libyasm/coretype.h>
 
-#include "libyasm/valparam.h"
+#include <libyasm/valparam.h>
 
 #endif
diff --git a/modules/arch/x86/x86arch.c b/modules/arch/x86/x86arch.c
index 4b44906f6..138a8caf2 100644
--- a/modules/arch/x86/x86arch.c
+++ b/modules/arch/x86/x86arch.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "x86arch.h"
diff --git a/modules/arch/x86/x86bc.c b/modules/arch/x86/x86bc.c
index e812459cc..ff78ba0e1 100644
--- a/modules/arch/x86/x86bc.c
+++ b/modules/arch/x86/x86bc.c
@@ -26,7 +26,7 @@
  */
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "x86arch.h"
diff --git a/modules/arch/x86/x86expr.c b/modules/arch/x86/x86expr.c
index e218fd226..1cd0a275d 100644
--- a/modules/arch/x86/x86expr.c
+++ b/modules/arch/x86/x86expr.c
@@ -26,7 +26,7 @@
  */
 #define YASM_LIB_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "x86arch.h"
diff --git a/modules/arch/x86/x86id.re b/modules/arch/x86/x86id.re
index 8b5619e3c..d7a8bc74f 100644
--- a/modules/arch/x86/x86id.re
+++ b/modules/arch/x86/x86id.re
@@ -27,7 +27,7 @@
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 RCSID("$IdPath$");
 
 #include "modules/arch/x86/x86arch.h"
diff --git a/modules/dbgfmts/null/null-dbgfmt.c b/modules/dbgfmts/null/null-dbgfmt.c
index c3e875edc..a3b6b9b36 100644
--- a/modules/dbgfmts/null/null-dbgfmt.c
+++ b/modules/dbgfmts/null/null-dbgfmt.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 
diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c
index 7afadbcb2..23d57b7f7 100644
--- a/modules/objfmts/bin/bin-objfmt.c
+++ b/modules/objfmts/bin/bin-objfmt.c
@@ -27,7 +27,7 @@
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 
diff --git a/modules/objfmts/coff/coff-objfmt.c b/modules/objfmts/coff/coff-objfmt.c
index 7cc5a5119..2095a4d6b 100644
--- a/modules/objfmts/coff/coff-objfmt.c
+++ b/modules/objfmts/coff/coff-objfmt.c
@@ -27,7 +27,7 @@
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 
diff --git a/modules/objfmts/dbg/dbg-objfmt.c b/modules/objfmts/dbg/dbg-objfmt.c
index 06a587ee5..dbdf5a32d 100644
--- a/modules/objfmts/dbg/dbg-objfmt.c
+++ b/modules/objfmts/dbg/dbg-objfmt.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 
diff --git a/modules/optimizers/basic/basic-optimizer.c b/modules/optimizers/basic/basic-optimizer.c
index fea7f8fcf..ff47e1755 100644
--- a/modules/optimizers/basic/basic-optimizer.c
+++ b/modules/optimizers/basic/basic-optimizer.c
@@ -26,7 +26,7 @@
  */
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 
diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index 3032d501b..0e0203de4 100644
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -27,7 +27,7 @@
 %{
 #define YASM_LIB_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS
diff --git a/modules/parsers/nasm/nasm-parser.c b/modules/parsers/nasm/nasm-parser.c
index 5d48ae05e..a9796abe7 100644
--- a/modules/parsers/nasm/nasm-parser.c
+++ b/modules/parsers/nasm/nasm-parser.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "nasm-parser.h"
diff --git a/modules/parsers/nasm/nasm-token.re b/modules/parsers/nasm/nasm-token.re
index af1b45e54..50b1bedc0 100644
--- a/modules/parsers/nasm/nasm-token.re
+++ b/modules/parsers/nasm/nasm-token.re
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 RCSID("$IdPath$");
 
 #include "modules/parsers/nasm/nasm-parser.h"
diff --git a/util.h b/util.h
index 9cf5a0bc0..ca3e26233 100644
--- a/util.h
+++ b/util.h
@@ -42,7 +42,7 @@
 # include <stdarg.h>
 
 #if defined(YASM_LIB_AC_INTERNAL) && defined(HAVE_CONFIG_H)
-# include "libyasm/config.h"
+# include <libyasm/config.h>
 #endif
 
 #if !defined(lint) && !defined(NDEBUG)
@@ -126,7 +126,7 @@ int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
 
 #endif	/*YASM_AUTOCONF_INTERNAL*/
 
-#include "libyasm/compat-queue.h"
+#include <libyasm/compat-queue.h>
 
 #if defined(YASM_AUTOCONF_INTERNAL) && defined(HAVE_SYS_CDEFS_H)
 # include <sys/cdefs.h>
@@ -195,8 +195,8 @@ extern void (*yasm_xfree) (/*@only@*/ /*@out@*/ /*@null@*/ void *p)
 
 #endif	/*YASM_INTERNAL*/
 
-#include "libyasm/coretype.h"
+#include <libyasm/coretype.h>
 
-#include "libyasm/valparam.h"
+#include <libyasm/valparam.h>
 
 #endif