diff --git a/res/loc/Makefile.am b/res/loc/Makefile.am
index b105f0eb..5baa2813 100644
--- a/res/loc/Makefile.am
+++ b/res/loc/Makefile.am
@@ -10,7 +10,7 @@ AM_V_SED_  = $(AM_V_SED_$(AM_DEFAULT_VERBOSITY))
 AM_V_SED   = $(AM_V_SED_$(V))
 
 embedded.loc: rufus.loc
-	$(AM_V_SED) -f embedded.sed $< > $@
+	$(AM_V_SED) -f $(srcdir)/embedded.sed $< > $@
 
 clean-local:
 	-rm -rf embedded.loc
diff --git a/res/loc/Makefile.in b/res/loc/Makefile.in
index 677b56c5..11dda9d0 100644
--- a/res/loc/Makefile.in
+++ b/res/loc/Makefile.in
@@ -367,7 +367,7 @@ uninstall-am:
 all-local: embedded.loc
 
 embedded.loc: rufus.loc
-	$(AM_V_SED) -f embedded.sed $< > $@
+	$(AM_V_SED) -f $(srcdir)/embedded.sed $< > $@
 
 clean-local:
 	-rm -rf embedded.loc
diff --git a/src/Makefile.am b/src/Makefile.am
index ceb6b841..38dba118 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,8 @@ AM_V_WINDRES   = $(AM_V_WINDRES_$(V))
 
 rufus_SOURCES = badblocks.c checksum.c dev.c dos.c dos_locale.c drive.c format.c icon.c iso.c localization.c \
 	net.c parser.c pki.c process.c rufus.c smart.c stdfn.c stdio.c stdlg.c syslinux.c ui.c vhd.c
-rufus_CFLAGS = -I./ms-sys/inc -I./syslinux/libfat -I./syslinux/libinstaller -I./syslinux/win -I./libcdio $(AM_CFLAGS) -DEXT2_FLAT_INCLUDES=0
+rufus_CFLAGS = -I$(srcdir)/ms-sys/inc -I$(srcdir)/syslinux/libfat -I$(srcdir)/syslinux/libinstaller -I$(srcdir)/syslinux/win -I$(srcdir)/libcdio $(AM_CFLAGS) \
+	-DEXT2_FLAT_INCLUDES=0
 rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows
 rufus_LDADD = rufus_rc.o bled/libbled.a ext2fs/libext2fs.a ms-sys/libmssys.a syslinux/libfat/libfat.a syslinux/libinstaller/libinstaller.a syslinux/win/libwin.a \
 	libcdio/iso9660/libiso9660.a libcdio/udf/libudf.a libcdio/driver/libdriver.a -lsetupapi -lole32 -lgdi32 -lshlwapi -lcrypt32 -lwintrust -lcomdlg32 -lcomctl32 -luuid -lpsapi
diff --git a/src/Makefile.in b/src/Makefile.in
index 53a49ccb..1db35975 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -275,7 +275,9 @@ AM_V_WINDRES = $(AM_V_WINDRES_$(V))
 rufus_SOURCES = badblocks.c checksum.c dev.c dos.c dos_locale.c drive.c format.c icon.c iso.c localization.c \
 	net.c parser.c pki.c process.c rufus.c smart.c stdfn.c stdio.c stdlg.c syslinux.c ui.c vhd.c
 
-rufus_CFLAGS = -I./ms-sys/inc -I./syslinux/libfat -I./syslinux/libinstaller -I./syslinux/win -I./libcdio $(AM_CFLAGS) -DEXT2_FLAT_INCLUDES=0
+rufus_CFLAGS = -I$(srcdir)/ms-sys/inc -I$(srcdir)/syslinux/libfat -I$(srcdir)/syslinux/libinstaller -I$(srcdir)/syslinux/win -I$(srcdir)/libcdio $(AM_CFLAGS) \
+	-DEXT2_FLAT_INCLUDES=0
+
 rufus_LDFLAGS = $(AM_LDFLAGS) -mwindows
 rufus_LDADD = rufus_rc.o bled/libbled.a ext2fs/libext2fs.a ms-sys/libmssys.a syslinux/libfat/libfat.a syslinux/libinstaller/libinstaller.a syslinux/win/libwin.a \
 	libcdio/iso9660/libiso9660.a libcdio/udf/libudf.a libcdio/driver/libdriver.a -lsetupapi -lole32 -lgdi32 -lshlwapi -lcrypt32 -lwintrust -lcomdlg32 -lcomctl32 -luuid -lpsapi
diff --git a/src/bled/Makefile.am b/src/bled/Makefile.am
index cc6a6fe8..df3e702a 100644
--- a/src/bled/Makefile.am
+++ b/src/bled/Makefile.am
@@ -5,4 +5,4 @@ libbled_a_SOURCES = bled.c crc32.c data_align.c data_extract_all.c data_skip.c d
   filter_accept_all.c filter_accept_list.c filter_accept_reject_list.c find_list_entry.c \
   header_list.c header_skip.c header_verbose_list.c init_handle.c open_transformer.c \
   seek_by_jump.c seek_by_read.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c
-libbled_a_CFLAGS = $(AM_CFLAGS) -I.. -Wno-undef -Wno-strict-aliasing
\ No newline at end of file
+libbled_a_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/.. -Wno-undef -Wno-strict-aliasing
diff --git a/src/bled/Makefile.in b/src/bled/Makefile.in
index c65a2042..f574a7ac 100644
--- a/src/bled/Makefile.in
+++ b/src/bled/Makefile.in
@@ -270,7 +270,7 @@ libbled_a_SOURCES = bled.c crc32.c data_align.c data_extract_all.c data_skip.c d
   header_list.c header_skip.c header_verbose_list.c init_handle.c open_transformer.c \
   seek_by_jump.c seek_by_read.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c
 
-libbled_a_CFLAGS = $(AM_CFLAGS) -I.. -Wno-undef -Wno-strict-aliasing
+libbled_a_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/.. -Wno-undef -Wno-strict-aliasing
 all: all-am
 
 .SUFFIXES:
diff --git a/src/ext2fs/Makefile.am b/src/ext2fs/Makefile.am
index 15456648..3730e481 100644
--- a/src/ext2fs/Makefile.am
+++ b/src/ext2fs/Makefile.am
@@ -7,4 +7,4 @@ libext2fs_a_SOURCES = alloc.c alloc_sb.c alloc_stats.c alloc_tables.c badblocks.
 	inline.c inline_data.c inode.c io_manager.c link.c lookup.c mkdir.c mkjournal.c namei.c mmp.c    \
 	newdir.c nt_io.c openfs.c punch.c rbtree.c read_bb.c rw_bitmaps.c sha512.c symlink.c valid_blk.c
 
-libext2fs_a_CFLAGS = $(AM_CFLAGS) -DEXT2_FLAT_INCLUDES=0 -DHAVE_CONFIG_H -I. -I.. -Wno-undef -Wno-strict-aliasing -Wno-shadow
+libext2fs_a_CFLAGS = $(AM_CFLAGS) -DEXT2_FLAT_INCLUDES=0 -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/.. -Wno-undef -Wno-strict-aliasing -Wno-shadow
diff --git a/src/ext2fs/Makefile.in b/src/ext2fs/Makefile.in
index c8496b1e..52b00dc4 100644
--- a/src/ext2fs/Makefile.in
+++ b/src/ext2fs/Makefile.in
@@ -278,7 +278,7 @@ libext2fs_a_SOURCES = alloc.c alloc_sb.c alloc_stats.c alloc_tables.c badblocks.
 	inline.c inline_data.c inode.c io_manager.c link.c lookup.c mkdir.c mkjournal.c namei.c mmp.c    \
 	newdir.c nt_io.c openfs.c punch.c rbtree.c read_bb.c rw_bitmaps.c sha512.c symlink.c valid_blk.c
 
-libext2fs_a_CFLAGS = $(AM_CFLAGS) -DEXT2_FLAT_INCLUDES=0 -DHAVE_CONFIG_H -I. -I.. -Wno-undef -Wno-strict-aliasing -Wno-shadow
+libext2fs_a_CFLAGS = $(AM_CFLAGS) -DEXT2_FLAT_INCLUDES=0 -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/.. -Wno-undef -Wno-strict-aliasing -Wno-shadow
 all: all-am
 
 .SUFFIXES:
diff --git a/src/libcdio/driver/Makefile.am b/src/libcdio/driver/Makefile.am
index 76df59b6..c7af9c4f 100644
--- a/src/libcdio/driver/Makefile.am
+++ b/src/libcdio/driver/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libdriver.a
 libdriver_a_SOURCES = disc.c ds.c logging.c memory.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c
 # Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
-libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I..
+libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/..
diff --git a/src/libcdio/driver/Makefile.in b/src/libcdio/driver/Makefile.in
index f24df3df..5bf19464 100644
--- a/src/libcdio/driver/Makefile.in
+++ b/src/libcdio/driver/Makefile.in
@@ -248,7 +248,7 @@ top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libdriver.a
 libdriver_a_SOURCES = disc.c ds.c logging.c memory.c read.c sector.c track.c util.c _cdio_stdio.c _cdio_stream.c utf8.c
 # Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
-libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I..
+libdriver_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/..
 all: all-am
 
 .SUFFIXES:
diff --git a/src/libcdio/iso9660/Makefile.am b/src/libcdio/iso9660/Makefile.am
index 61690208..52b59070 100644
--- a/src/libcdio/iso9660/Makefile.am
+++ b/src/libcdio/iso9660/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libiso9660.a
 libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c
 # Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
-libiso9660_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver
+libiso9660_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../driver
diff --git a/src/libcdio/iso9660/Makefile.in b/src/libcdio/iso9660/Makefile.in
index 1b659a8e..76ebfc87 100644
--- a/src/libcdio/iso9660/Makefile.in
+++ b/src/libcdio/iso9660/Makefile.in
@@ -245,7 +245,7 @@ top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libiso9660.a
 libiso9660_a_SOURCES = iso9660.c iso9660_fs.c rock.c xa.c
 # Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
-libiso9660_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver
+libiso9660_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../driver
 all: all-am
 
 .SUFFIXES:
diff --git a/src/libcdio/udf/Makefile.am b/src/libcdio/udf/Makefile.am
index 5e101028..a0ead73c 100644
--- a/src/libcdio/udf/Makefile.am
+++ b/src/libcdio/udf/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libudf.a
 libudf_a_SOURCES = udf.c udf_file.c udf_fs.c udf_time.c filemode.c
 # Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
-libudf_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver
+libudf_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../driver
diff --git a/src/libcdio/udf/Makefile.in b/src/libcdio/udf/Makefile.in
index 760b495e..6684f121 100644
--- a/src/libcdio/udf/Makefile.in
+++ b/src/libcdio/udf/Makefile.in
@@ -245,7 +245,7 @@ top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libudf.a
 libudf_a_SOURCES = udf.c udf_file.c udf_fs.c udf_time.c filemode.c
 # Boy do you NOT want to have HAVE_CONFIG_H set before $(AM_CFLAGS) with Clang!
-libudf_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I. -I.. -I../driver
+libudf_a_CFLAGS = $(AM_CFLAGS) -DHAVE_CONFIG_H -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../driver
 all: all-am
 
 .SUFFIXES:
diff --git a/src/ms-sys/Makefile.am b/src/ms-sys/Makefile.am
index 734c14fa..48eb6420 100644
--- a/src/ms-sys/Makefile.am
+++ b/src/ms-sys/Makefile.am
@@ -1,4 +1,4 @@
 noinst_LIBRARIES = libmssys.a
 
 libmssys_a_SOURCES = fat12.c fat16.c fat32.c ntfs.c partition_info.c br.c file.c
-libmssys_a_CFLAGS = -I./inc $(AM_CFLAGS)
+libmssys_a_CFLAGS = -I$(srcdir)/inc $(AM_CFLAGS)
diff --git a/src/ms-sys/Makefile.in b/src/ms-sys/Makefile.in
index 1cf79224..9cc0181d 100644
--- a/src/ms-sys/Makefile.in
+++ b/src/ms-sys/Makefile.in
@@ -245,7 +245,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libmssys.a
 libmssys_a_SOURCES = fat12.c fat16.c fat32.c ntfs.c partition_info.c br.c file.c
-libmssys_a_CFLAGS = -I./inc $(AM_CFLAGS)
+libmssys_a_CFLAGS = -I$(srcdir)/inc $(AM_CFLAGS)
 all: all-am
 
 .SUFFIXES:
diff --git a/src/rufus.rc b/src/rufus.rc
index 273eb426..cb3f3606 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.9.1602"
+CAPTION "Rufus 3.9.1603"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,9,1602,0
- PRODUCTVERSION 3,9,1602,0
+ FILEVERSION 3,9,1603,0
+ PRODUCTVERSION 3,9,1603,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.9.1602"
+            VALUE "FileVersion", "3.9.1603"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.9.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.9.1602"
+            VALUE "ProductVersion", "3.9.1603"
         END
     END
     BLOCK "VarFileInfo"