diff --git a/src/ant/ant.pro b/src/ant/ant.pro
index 02b182da7..7f4196f8c 100644
--- a/src/ant/ant.pro
+++ b/src/ant/ant.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_ant
 
 include($$PWD/../klayout.pri)
 
@@ -38,5 +39,5 @@ SOURCES = \
 
 INCLUDEPATH += ../tl ../gsi ../laybasic ../db
 DEPENDPATH += ../tl ../gsi ../laybasic ../db
-LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db
 
diff --git a/src/db/db.pro b/src/db/db.pro
index 339604d0f..18190dbba 100644
--- a/src/db/db.pro
+++ b/src/db/db.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_db
 
 include($$PWD/../klayout.pri)
 
@@ -231,5 +232,5 @@ HEADERS = \
 
 INCLUDEPATH += ../tl ../gsi
 DEPENDPATH += ../tl ../gsi
-LIBS += -L$$DESTDIR -ltl -lgsi
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
 
diff --git a/src/edt/edt.pro b/src/edt/edt.pro
index 002ad0c91..943ca8920 100644
--- a/src/edt/edt.pro
+++ b/src/edt/edt.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_edt
 
 include($$PWD/../klayout.pri)
 
@@ -67,5 +68,5 @@ DEPENDPATH += ../tl ../gsi ../laybasic ../db
 INCLUDEPATH += $$DESTDIR/laybasic
 DEPENDPATH += $$DESTDIR/laybasic
 
-LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db
 
diff --git a/src/ext/ext.pro b/src/ext/ext.pro
index 5b51f2d25..11b3d9edd 100644
--- a/src/ext/ext.pro
+++ b/src/ext/ext.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_ext
 
 include($$PWD/../klayout.pri)
 
@@ -79,5 +80,5 @@ DEPENDPATH += ../tl ../gsi ../laybasic ../lay ../db ../rdb ../ant ../edt
 INCLUDEPATH += $$DESTDIR/laybasic $$OUT_PWD/../lay
 DEPENDPATH += $$DESTDIR/laybasic $$OUT_PWD/../lay
 
-LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb -lrdb -llay -lant -ledt
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db -lklayout_rdb -lklayout_lay -lklayout_ant -lklayout_edt
 
diff --git a/src/gsi/gsi.pro b/src/gsi/gsi.pro
index c91c30e7e..ec23077f7 100644
--- a/src/gsi/gsi.pro
+++ b/src/gsi/gsi.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_gsi
 
 include($$PWD/../klayout.pri)
 
@@ -50,5 +51,5 @@ SOURCES += gsiDeclTl.cc
 
 INCLUDEPATH += ../tl
 DEPENDPATH += ../tl
-LIBS += -L$$DESTDIR -ltl
+LIBS += -L$$DESTDIR -lklayout_tl
 
diff --git a/src/gsiqt/gsiqt.pro b/src/gsiqt/gsiqt.pro
index 2e151ae5b..9f7c1da0f 100644
--- a/src/gsiqt/gsiqt.pro
+++ b/src/gsiqt/gsiqt.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_gsiqt
 
 include($$PWD/../klayout.pri)
 
@@ -11,7 +12,7 @@ TEMPLATE = lib
 INCLUDEPATH += ../tl ../gsi ../db ../gsiqt
 DEPENDPATH += ../tl ../gsi ../db ../gsiqt
 
-LIBS += -L$$DESTDIR -ltl -lgsi -ldb
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db
 
 SOURCES += \
   gsiQt.cc \
diff --git a/src/img/img.pro b/src/img/img.pro
index d9e8b8ec2..2c5c97004 100644
--- a/src/img/img.pro
+++ b/src/img/img.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_img
 
 include($$PWD/../klayout.pri)
 
@@ -36,5 +37,5 @@ SOURCES = \
 
 INCLUDEPATH += ../tl ../gsi ../laybasic ../db
 DEPENDPATH += ../tl ../gsi ../laybasic ../db
-LIBS += -L$$DESTDIR -ltl -lgsi -llaybasic -ldb
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db
 
diff --git a/src/klayout_main/klayout_main.pro b/src/klayout_main/klayout_main.pro
index 8e9c832d9..b13518b94 100644
--- a/src/klayout_main/klayout_main.pro
+++ b/src/klayout_main/klayout_main.pro
@@ -1,5 +1,5 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
 
 include($$PWD/../klayout.pri)
 
@@ -18,7 +18,7 @@ RESOURCES = \
 
 INCLUDEPATH += ../tl ../gsi ../db ../rdb ../laybasic ../lay ../ext ../img ../ant ../lib
 DEPENDPATH += ../tl ../gsi ../db ../rdb ../laybasic ../lay ../ext ../img ../ant ../lib
-LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -ltl -lgsi -ldb -lrdb -llaybasic -llay -lant -limg -ledt -lext -llib
+LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_laybasic -lklayout_lay -lklayout_ant -lklayout_img -lklayout_edt -lklayout_ext -lklayout_lib
 
 # Note: this accounts for UI-generated headers placed into the output folders in
 # shadow builds:
@@ -28,25 +28,25 @@ DEPENDPATH += $$DESTDIR/laybasic $$OUT_PWD/../lay
 equals(HAVE_QTBINDINGS, "1") {
   INCLUDEPATH += ../gsiqt
   DEPENDPATH += ../gsiqt
-  LIBS += -lgsiqt
+  LIBS += -lklayout_gsiqt
 }
 
 equals(HAVE_RUBY, "1") {
   INCLUDEPATH += ../rba
   DEPENDPATH += ../rba
-  LIBS += -lrba 
+  LIBS += -lklayout_rba
 } else {
   INCLUDEPATH += ../rbastub
   DEPENDPATH += ../rbastub
-  LIBS += -lrbastub 
+  LIBS += -lklayout_rbastub
 }
 
 equals(HAVE_PYTHON, "1") {
   INCLUDEPATH += ../pya
   DEPENDPATH += ../pya
-  LIBS += -lpya 
+  LIBS += -lklayout_pya
 } else {
   INCLUDEPATH += ../pyastub
   DEPENDPATH += ../pyastub
-  LIBS += -lpyastub
+  LIBS += -lklayout_pyastub
 }
diff --git a/src/lay/lay.pro b/src/lay/lay.pro
index c1451e9b8..ce67b831d 100644
--- a/src/lay/lay.pro
+++ b/src/lay/lay.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_lay
 
 include($$PWD/../klayout.pri)
 
@@ -143,7 +144,7 @@ RESOURCES = layBuildInMacros.qrc \
 
 INCLUDEPATH += ../tl ../gsi ../db ../rdb ../laybasic ../ant ../img ../edt
 DEPENDPATH += ../tl ../gsi ../db ../rdb ../laybasic ../ant ../img ../edt
-LIBS += -L$$DESTDIR -ltl -lgsi -ldb -lrdb -llaybasic -lant -limg -ledt
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_laybasic -lklayout_ant -lklayout_img -lklayout_edt
 
 win32 {
   # for stack trace support:
@@ -161,26 +162,26 @@ INCLUDEPATH += ../gsiqt
 DEPENDPATH += ../gsiqt
 
 equals(HAVE_QTBINDINGS, "1") {
-  LIBS += -lgsiqt
+  LIBS += -lklayout_gsiqt
 }
 
 equals(HAVE_RUBY, "1") {
   INCLUDEPATH += ../rba
   DEPENDPATH += ../rba
-  LIBS += -lrba 
+  LIBS += -lklayout_rba
 } else {
   INCLUDEPATH += ../rbastub
   DEPENDPATH += ../rbastub
-  LIBS += -lrbastub 
+  LIBS += -lklayout_rbastub
 }
 
 equals(HAVE_PYTHON, "1") {
   INCLUDEPATH += ../pya
   DEPENDPATH += ../pya
-  LIBS += -lpya 
+  LIBS += -lklayout_pya
 } else {
   INCLUDEPATH += ../pyastub
   DEPENDPATH += ../pyastub
-  LIBS += -lpyastub
+  LIBS += -lklayout_pyastub
 }
 
diff --git a/src/laybasic/laybasic.pro b/src/laybasic/laybasic.pro
index 0f07c6e0e..74fc3adb5 100644
--- a/src/laybasic/laybasic.pro
+++ b/src/laybasic/laybasic.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_laybasic
 
 include($$PWD/../klayout.pri)
 
@@ -275,12 +276,12 @@ HEADERS = \
 
 INCLUDEPATH += ../tl ../gsi ../db ../rdb
 DEPENDPATH += ../tl ../gsi ../db ../rdb
-LIBS += -L$$DESTDIR -ltl -lgsi -ldb -lrdb
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb
 
 INCLUDEPATH += ../gsiqt
 DEPENDPATH += ../gsiqt
 
 equals(HAVE_QTBINDINGS, "1") {
-  LIBS += -lgsiqt
+  LIBS += -lklayout_gsiqt
 }
 
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 611a9dc13..1bf90db61 100644
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_lib
 
 include($$PWD/../klayout.pri)
 
@@ -37,5 +38,5 @@ RESOURCES = \
 
 INCLUDEPATH += ../gsi ../tl ../db
 DEPENDPATH += ../gsi ../tl ../db
-LIBS += -L$$DESTDIR -lgsi -ltl -ldb
+LIBS += -L$$DESTDIR -lklayout_gsi -lklayout_tl -lklayout_db
 
diff --git a/src/pya/pya.pro b/src/pya/pya.pro
index bc66b7bfb..1468d62f6 100644
--- a/src/pya/pya.pro
+++ b/src/pya/pya.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_pya
 
 include($$PWD/../klayout.pri)
 
@@ -19,7 +20,7 @@ SOURCES = \
 
 INCLUDEPATH += $$PYTHONINCLUDE ../tl ../gsi
 DEPENDPATH += $$PYTHONINCLUDE ../tl ../gsi
-LIBS += $$PYTHONLIBFILE -L$$DESTDIR -ltl -lgsi
+LIBS += $$PYTHONLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
 
 # Python is somewhat sloppy and relies on the compiler initializing fields 
 # of strucs to 0:
diff --git a/src/pyastub/pyastub.pro b/src/pyastub/pyastub.pro
index 13e1639a4..e60aadc94 100644
--- a/src/pyastub/pyastub.pro
+++ b/src/pyastub/pyastub.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_pyastub
 
 include($$PWD/../klayout.pri)
 
@@ -11,7 +12,7 @@ SOURCES = pya.cc
 
 INCLUDEPATH += ../tl ../gsi
 DEPENDPATH += ../tl ../gsi
-LIBS += -L$$DESTDIR -ltl -lgsi
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
 
 HEADERS += \
     pyaCommon.h
diff --git a/src/rba/rba.pro b/src/rba/rba.pro
index 22d79031d..838f8b4b5 100644
--- a/src/rba/rba.pro
+++ b/src/rba/rba.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_rba
 
 include($$PWD/../klayout.pri)
 
@@ -17,7 +18,7 @@ SOURCES = rba.cc \
 # NOTE: ../common needs to be before RUBYINCLUDE since there is a config.h too.
 INCLUDEPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 ../tl ../gsi
 DEPENDPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 ../tl ../gsi
-LIBS += $$RUBYLIBFILE -L$$DESTDIR -ltl -lgsi
+LIBS += $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
   
 
 HEADERS += \
diff --git a/src/rbastub/rbastub.pro b/src/rbastub/rbastub.pro
index 586dafd5e..2b7d6abe4 100644
--- a/src/rbastub/rbastub.pro
+++ b/src/rbastub/rbastub.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_rbastub
 
 include($$PWD/../klayout.pri)
 
@@ -13,5 +14,5 @@ SOURCES = rba.cc
 
 INCLUDEPATH += ../tl ../gsi
 DEPENDPATH += ../tl ../gsi
-LIBS += -L$$DESTDIR -ltl -lgsi
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi
   
diff --git a/src/rdb/rdb.pro b/src/rdb/rdb.pro
index 22795caba..e13cd4e1d 100644
--- a/src/rdb/rdb.pro
+++ b/src/rdb/rdb.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_rdb
 
 include($$PWD/../klayout.pri)
 
@@ -29,5 +30,5 @@ HEADERS = \
 
 INCLUDEPATH += ../tl ../gsi ../db
 DEPENDPATH += ../tl ../gsi ../db
-LIBS += -L$$DESTDIR -ltl -lgsi -ldb
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db
 
diff --git a/src/tl/tl.pro b/src/tl/tl.pro
index 95f8f9870..bcccb8173 100644
--- a/src/tl/tl.pro
+++ b/src/tl/tl.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_tl
 
 include($$PWD/../klayout.pri)
 
diff --git a/src/unit_tests.pri b/src/unit_tests.pri
index 237803e9b..5c437c6f7 100644
--- a/src/unit_tests.pri
+++ b/src/unit_tests.pri
@@ -2,7 +2,7 @@
 INCLUDEPATH += $$PYTHONINCLUDE $$PWD/tl $$PWD/gsi $$PWD/db $$PWD/rdb $$PWD/laybasic $$PWD/lay $$PWD/ant $$PWD/img $$PWD/edt $$PWD/ext $$PWD/lib $$PWD/common $$PWD/ut
 DEPENDPATH += $$PYTHONINCLUDE $$PWD/tl $$PWD/gsi $$PWD/db $$PWD/rdb $$PWD/laybasic $$PWD/lay $$PWD/ant $$PWD/img $$PWD/edt $$PWD/ext $$PWD/lib $$PWD/commo $$PWD/ut
 
-LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -ltl -lgsi -ldb -lrdb -llaybasic -llay -lant -limg -ledt -lext -llib -lut
+LIBS += $$PYTHONLIBFILE $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_db -lklayout_rdb -lklayout_laybasic -lklayout_lay -lklayout_ant -lklayout_img -lklayout_edt -lklayout_ext -lklayout_lib -lklayout_ut
 
 # Note: this accounts for UI-generated headers placed into the output folders in
 # shadow builds:
@@ -12,25 +12,25 @@ DEPENDPATH += $$DESTDIR/laybasic $$DESTDIR/lay $$DESTDIR/ext
 equals(HAVE_QTBINDINGS, "1") {
   INCLUDEPATH += $$PWD/gsiqt
   DEPENDPATH += $$PWD/gsiqt
-  LIBS += -lgsiqt
+  LIBS += -lklayout_gsiqt
 }
 
 equals(HAVE_RUBY, "1") {
   INCLUDEPATH += $$PWD/rba
   DEPENDPATH += $$PWD/rba
-  LIBS += -lrba
+  LIBS += -lklayout_rba
 } else {
   INCLUDEPATH += $$PWD/rbastub
   DEPENDPATH += $$PWD/rbastub
-  LIBS += -lrbastub
+  LIBS += -lklayout_rbastub
 }
 
 equals(HAVE_PYTHON, "1") {
   INCLUDEPATH += $$PWD/pya
   DEPENDPATH += $$PWD/pya
-  LIBS += -lpya
+  LIBS += -lklayout_pya
 } else {
   INCLUDEPATH += $$PWD/pyastub
   DEPENDPATH += $$PWD/pyastub
-  LIBS += -lpyastub
+  LIBS += -lklayout_pyastub
 }
diff --git a/src/ut/ut.pro b/src/ut/ut.pro
index 7ffd4290a..4633385ca 100644
--- a/src/ut/ut.pro
+++ b/src/ut/ut.pro
@@ -1,5 +1,6 @@
 
-DESTDIR=$$OUT_PWD/..
+DESTDIR = $$OUT_PWD/..
+TARGET = klayout_ut
 
 include($$PWD/../klayout.pri)
 
@@ -18,25 +19,25 @@ SOURCES = \
 INCLUDEPATH = ../tl ../db ../gsi ../lay ../ext ../lib
 DEPENDPATH = ../tl ../db ../gsi ../lay ../ext ../lib
 
-LIBS += -L$$DESTDIR -ltl -ldb -lgsi -llay -lext -llib
+LIBS += -L$$DESTDIR -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_lay -lklayout_ext -lklayout_lib
 
 equals(HAVE_RUBY, "1") {
   INCLUDEPATH += ../rba
   DEPENDPATH += ../rba
-  LIBS += -lrba
+  LIBS += -lklayout_rba
 } else {
   INCLUDEPATH += ../rbastub
   DEPENDPATH += ../rbastub
-  LIBS += -lrbastub
+  LIBS += -lklayout_rbastub
 }
 
 equals(HAVE_PYTHON, "1") {
   INCLUDEPATH += ../pya
   DEPENDPATH += ../pya
-  LIBS += -lpya
+  LIBS += -lklayout_pya
 } else {
   INCLUDEPATH += ../pyastub
   DEPENDPATH += ../pyastub
-  LIBS += -lpyastub
+  LIBS += -lklayout_pyastub
 }