diff --git a/samples/access/access.bkl b/samples/access/access.bkl
index 0a5b8e4b04..8e8cdf4d64 100644
--- a/samples/access/access.bkl
+++ b/samples/access/access.bkl
@@ -6,6 +6,7 @@
accesstest.cpp
core
+ base
accesstest.rc
diff --git a/samples/artprov/artprov.bkl b/samples/artprov/artprov.bkl
index d3800b35bb..1913fe84c6 100644
--- a/samples/artprov/artprov.bkl
+++ b/samples/artprov/artprov.bkl
@@ -6,6 +6,7 @@
arttest.cpp artbrows.cpp
core
+ base
arttest.rc
diff --git a/samples/calendar/calendar.bkl b/samples/calendar/calendar.bkl
index 00fc86f6de..cff1e7601a 100644
--- a/samples/calendar/calendar.bkl
+++ b/samples/calendar/calendar.bkl
@@ -6,6 +6,7 @@
calendar.cpp
core
+ base
calendar.rc
diff --git a/samples/caret/caret.bkl b/samples/caret/caret.bkl
index 713e32c056..6836d07cb1 100644
--- a/samples/caret/caret.bkl
+++ b/samples/caret/caret.bkl
@@ -6,6 +6,7 @@
caret.cpp
core
+ base
caret.rc
diff --git a/samples/checklst/checklst.bkl b/samples/checklst/checklst.bkl
index 603f83fb19..316a19bdb2 100644
--- a/samples/checklst/checklst.bkl
+++ b/samples/checklst/checklst.bkl
@@ -6,6 +6,7 @@
checklst.cpp
core
+ base
checklst.rc
diff --git a/samples/config/config.bkl b/samples/config/config.bkl
index c06b05356d..6bf5b6c755 100644
--- a/samples/config/config.bkl
+++ b/samples/config/config.bkl
@@ -6,6 +6,7 @@
conftest.cpp
core
+ base
conftest.rc
diff --git a/samples/controls/controls.bkl b/samples/controls/controls.bkl
index 178cea4d67..e1e6d3d522 100644
--- a/samples/controls/controls.bkl
+++ b/samples/controls/controls.bkl
@@ -6,6 +6,7 @@
controls.cpp
core
+ base
controls.rc
diff --git a/samples/db/db.bkl b/samples/db/db.bkl
index e6bf924048..ea8451468a 100644
--- a/samples/db/db.bkl
+++ b/samples/db/db.bkl
@@ -6,6 +6,7 @@
dbtest.cpp listdb.cpp
core
+ base
dbtest.rc
diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index a6faea65e9..9ca7a0fdde 100644
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -6,6 +6,7 @@
dialogs.cpp
core
+ base
dialogs.rc
diff --git a/samples/dialup/dialup.bkl b/samples/dialup/dialup.bkl
index 1ad1ecdb61..ce9e7716d9 100644
--- a/samples/dialup/dialup.bkl
+++ b/samples/dialup/dialup.bkl
@@ -6,6 +6,7 @@
nettest.cpp
core
+ base
nettest.rc
diff --git a/samples/display/display.bkl b/samples/display/display.bkl
index 255256f246..859b5bb4f8 100644
--- a/samples/display/display.bkl
+++ b/samples/display/display.bkl
@@ -6,6 +6,7 @@
display.cpp
core
+ base
diff --git a/samples/dnd/dnd.bkl b/samples/dnd/dnd.bkl
index fe2f8984ae..f4be529147 100644
--- a/samples/dnd/dnd.bkl
+++ b/samples/dnd/dnd.bkl
@@ -6,6 +6,7 @@
dnd.cpp
core
+ base
dnd.rc
diff --git a/samples/docview/docview.bkl b/samples/docview/docview.bkl
index 4a97d8a718..62ba8dc77d 100644
--- a/samples/docview/docview.bkl
+++ b/samples/docview/docview.bkl
@@ -6,6 +6,7 @@
docview.cpp doc.cpp view.cpp
core
+ base
docview.rc
chart.r doc.r docview.r mondrian.r
diff --git a/samples/docvwmdi/docvwmdi.bkl b/samples/docvwmdi/docvwmdi.bkl
index 8b038fb8fe..802e144eea 100644
--- a/samples/docvwmdi/docvwmdi.bkl
+++ b/samples/docvwmdi/docvwmdi.bkl
@@ -6,6 +6,7 @@
docview.cpp doc.cpp view.cpp
core
+ base
docview.rc
diff --git a/samples/dragimag/dragimag.bkl b/samples/dragimag/dragimag.bkl
index 5b8e8c1f72..e6ee22555a 100644
--- a/samples/dragimag/dragimag.bkl
+++ b/samples/dragimag/dragimag.bkl
@@ -6,6 +6,7 @@
dragimag.cpp
core
+ base
dragimag.rc
diff --git a/samples/drawing/drawing.bkl b/samples/drawing/drawing.bkl
index 5981c974d8..e2e383dafe 100644
--- a/samples/drawing/drawing.bkl
+++ b/samples/drawing/drawing.bkl
@@ -6,6 +6,7 @@
drawing.cpp
core
+ base
drawing.rc
diff --git a/samples/dynamic/dynamic.bkl b/samples/dynamic/dynamic.bkl
index 6e2d195b03..00c49d0399 100644
--- a/samples/dynamic/dynamic.bkl
+++ b/samples/dynamic/dynamic.bkl
@@ -6,6 +6,7 @@
dynamic.cpp
core
+ base
dynamic.rc
diff --git a/samples/erase/erase.bkl b/samples/erase/erase.bkl
index 25632af4f4..6239ede757 100644
--- a/samples/erase/erase.bkl
+++ b/samples/erase/erase.bkl
@@ -6,6 +6,7 @@
erase.cpp
core
+ base
erase.rc
diff --git a/samples/event/event.bkl b/samples/event/event.bkl
index 3fd2443fb2..78b9436d64 100644
--- a/samples/event/event.bkl
+++ b/samples/event/event.bkl
@@ -6,6 +6,7 @@
event.cpp
core
+ base
event.rc
diff --git a/samples/exec/exec.bkl b/samples/exec/exec.bkl
index e6e2c88ce8..9cb4a4c6c0 100644
--- a/samples/exec/exec.bkl
+++ b/samples/exec/exec.bkl
@@ -6,6 +6,7 @@
exec.cpp
core
+ base
exec.rc
diff --git a/samples/font/font.bkl b/samples/font/font.bkl
index a738b3b8c4..16ec889b76 100644
--- a/samples/font/font.bkl
+++ b/samples/font/font.bkl
@@ -6,6 +6,7 @@
font.cpp
core
+ base
font.rc
diff --git a/samples/grid/grid.bkl b/samples/grid/grid.bkl
index 986a73fc0a..a9b969c303 100644
--- a/samples/grid/grid.bkl
+++ b/samples/grid/grid.bkl
@@ -6,6 +6,7 @@
griddemo.cpp
core
+ base
grid.rc
diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index 40853aca62..5a5b09c4b4 100644
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -6,6 +6,7 @@
demo.cpp
core
+ base
help.rc
diff --git a/samples/htlbox/htlbox.bkl b/samples/htlbox/htlbox.bkl
index 5b27558dc1..796ad04982 100644
--- a/samples/htlbox/htlbox.bkl
+++ b/samples/htlbox/htlbox.bkl
@@ -6,6 +6,7 @@
htlbox.cpp
core
+ base
htlbox.rc
diff --git a/samples/image/image.bkl b/samples/image/image.bkl
index df4ba1f5f2..67aa2bd188 100644
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -8,6 +8,7 @@
image.cpp
core
+ base
image.rc
diff --git a/samples/internat/internat.bkl b/samples/internat/internat.bkl
index 21ea4535ca..6ca3c47d09 100644
--- a/samples/internat/internat.bkl
+++ b/samples/internat/internat.bkl
@@ -6,6 +6,7 @@
internat.cpp
core
+ base
internat.rc
diff --git a/samples/ipc/ipc.bkl b/samples/ipc/ipc.bkl
index b852b3a01a..45c33f085b 100644
--- a/samples/ipc/ipc.bkl
+++ b/samples/ipc/ipc.bkl
@@ -6,6 +6,7 @@
ipc.cpp
core
+ base
ipc.rc
diff --git a/samples/joytest/joytest.bkl b/samples/joytest/joytest.bkl
index 8743404f4f..2105c40a01 100644
--- a/samples/joytest/joytest.bkl
+++ b/samples/joytest/joytest.bkl
@@ -6,6 +6,7 @@
joytest.cpp
core
+ base
joytest.rc
diff --git a/samples/keyboard/keyboard.bkl b/samples/keyboard/keyboard.bkl
index f95d96e49c..d0ef3a6946 100644
--- a/samples/keyboard/keyboard.bkl
+++ b/samples/keyboard/keyboard.bkl
@@ -6,6 +6,7 @@
keyboard.cpp
core
+ base
keyboard.rc
diff --git a/samples/layout/layout.bkl b/samples/layout/layout.bkl
index 2e77deb266..5d6f4b732a 100644
--- a/samples/layout/layout.bkl
+++ b/samples/layout/layout.bkl
@@ -6,6 +6,7 @@
layout.cpp
core
+ base
layout.rc
diff --git a/samples/listbox/listbox.bkl b/samples/listbox/listbox.bkl
index cc412e9430..ea30fec420 100644
--- a/samples/listbox/listbox.bkl
+++ b/samples/listbox/listbox.bkl
@@ -6,6 +6,7 @@
listbox.cpp
core
+ base
listbox.rc
diff --git a/samples/listctrl/listctrl.bkl b/samples/listctrl/listctrl.bkl
index fdf1c84ba2..59f2dd9271 100644
--- a/samples/listctrl/listctrl.bkl
+++ b/samples/listctrl/listctrl.bkl
@@ -6,6 +6,7 @@
listctrl.cpp
core
+ base
listctrl.rc
diff --git a/samples/mdi/mdi.bkl b/samples/mdi/mdi.bkl
index 642b412221..01e2f566b1 100644
--- a/samples/mdi/mdi.bkl
+++ b/samples/mdi/mdi.bkl
@@ -6,6 +6,7 @@
mdi.cpp
core
+ base
mdi.rc
diff --git a/samples/memcheck/memcheck.bkl b/samples/memcheck/memcheck.bkl
index c16fe6e9ca..5029c09bca 100644
--- a/samples/memcheck/memcheck.bkl
+++ b/samples/memcheck/memcheck.bkl
@@ -6,6 +6,7 @@
memcheck.cpp
core
+ base
memcheck.rc
diff --git a/samples/menu/menu.bkl b/samples/menu/menu.bkl
index 4cb7ddad01..3e519fe983 100644
--- a/samples/menu/menu.bkl
+++ b/samples/menu/menu.bkl
@@ -6,6 +6,7 @@
diff --git a/samples/mfc/mfc.bkl b/samples/mfc/mfc.bkl
index 3759aa8b9f..a1f3700118 100644
--- a/samples/mfc/mfc.bkl
+++ b/samples/mfc/mfc.bkl
@@ -6,6 +6,7 @@
mfc.cpp
core
+ base
mfc.rc
diff --git a/samples/minifram/minifram.bkl b/samples/minifram/minifram.bkl
index d963b44cc6..ea8c5a3c86 100644
--- a/samples/minifram/minifram.bkl
+++ b/samples/minifram/minifram.bkl
@@ -6,6 +6,7 @@
minifram.cpp
core
+ base
minifram.rc
diff --git a/samples/mobile/mobile.bkl b/samples/mobile/mobile.bkl
index 01b544b056..476e60f770 100644
--- a/samples/mobile/mobile.bkl
+++ b/samples/mobile/mobile.bkl
@@ -6,6 +6,7 @@
mobile.cpp
core
+ base
mobile.rc
diff --git a/samples/multimon/multimon.bkl b/samples/multimon/multimon.bkl
index 0a4da9dc00..8901eb9bf1 100644
--- a/samples/multimon/multimon.bkl
+++ b/samples/multimon/multimon.bkl
@@ -6,6 +6,7 @@
multimon.cpp
core
+ base
multimon.rc
diff --git a/samples/nativdlg/nativdlg.bkl b/samples/nativdlg/nativdlg.bkl
index 851325094c..3337a8240f 100644
--- a/samples/nativdlg/nativdlg.bkl
+++ b/samples/nativdlg/nativdlg.bkl
@@ -6,6 +6,7 @@
nativdlg.cpp
core
+ base
nativdlg.rc
diff --git a/samples/newgrid/newgrid.bkl b/samples/newgrid/newgrid.bkl
index 2383c7127c..ff94a70bc6 100644
--- a/samples/newgrid/newgrid.bkl
+++ b/samples/newgrid/newgrid.bkl
@@ -6,6 +6,7 @@
newgrid.cpp
core
+ base
newgrid.rc
diff --git a/samples/notebook/notebook.bkl b/samples/notebook/notebook.bkl
index 740a1e097e..889e35e3b4 100644
--- a/samples/notebook/notebook.bkl
+++ b/samples/notebook/notebook.bkl
@@ -6,6 +6,7 @@
notebook.cpp
core
+ base
notebook.rc
diff --git a/samples/oleauto/oleauto.bkl b/samples/oleauto/oleauto.bkl
index 418fa018d7..9558e0340a 100644
--- a/samples/oleauto/oleauto.bkl
+++ b/samples/oleauto/oleauto.bkl
@@ -6,6 +6,7 @@
oleauto.cpp
core
+ base
oleauto.rc
diff --git a/samples/opengl/opengl.bkl b/samples/opengl/opengl.bkl
index 03bcf0e5bb..5903409565 100644
--- a/samples/opengl/opengl.bkl
+++ b/samples/opengl/opengl.bkl
@@ -6,6 +6,7 @@
opengl.cpp
core
+ base
opengl.rc
diff --git a/samples/ownerdrw/ownerdrw.bkl b/samples/ownerdrw/ownerdrw.bkl
index 4ede5ab5ad..087be9ff9d 100644
--- a/samples/ownerdrw/ownerdrw.bkl
+++ b/samples/ownerdrw/ownerdrw.bkl
@@ -6,6 +6,7 @@
ownerdrw.cpp
core
+ base
ownerdrw.rc
diff --git a/samples/png/png.bkl b/samples/png/png.bkl
index 6dea4b2e56..531d63893d 100644
--- a/samples/png/png.bkl
+++ b/samples/png/png.bkl
@@ -6,6 +6,7 @@
png.cpp
core
+ base
png.rc
diff --git a/samples/printing/printing.bkl b/samples/printing/printing.bkl
index 9e019ace9e..2d31ff3ead 100644
--- a/samples/printing/printing.bkl
+++ b/samples/printing/printing.bkl
@@ -6,6 +6,7 @@
printing.cpp
core
+ base
printing.rc
diff --git a/samples/propsize/propsize.bkl b/samples/propsize/propsize.bkl
index 0d5e8034f0..2c2b97b3f1 100644
--- a/samples/propsize/propsize.bkl
+++ b/samples/propsize/propsize.bkl
@@ -6,6 +6,7 @@
propsize.cpp
core
+ base
propsize.rc
diff --git a/samples/regtest/regtest.bkl b/samples/regtest/regtest.bkl
index 55c0e2fc06..1a95a64333 100644
--- a/samples/regtest/regtest.bkl
+++ b/samples/regtest/regtest.bkl
@@ -6,6 +6,7 @@
regtest.cpp
core
+ base
regtest.rc
diff --git a/samples/richedit/richedit.bkl b/samples/richedit/richedit.bkl
index 83ab70b52e..da58c28868 100644
--- a/samples/richedit/richedit.bkl
+++ b/samples/richedit/richedit.bkl
@@ -6,6 +6,7 @@
richedit.cpp
core
+ base
richedit.rc
diff --git a/samples/rotate/rotate.bkl b/samples/rotate/rotate.bkl
index c1709a08e2..894000d40c 100644
--- a/samples/rotate/rotate.bkl
+++ b/samples/rotate/rotate.bkl
@@ -6,6 +6,7 @@
rotate.cpp
core
+ base
rotate.rc
diff --git a/samples/sashtest/sashtest.bkl b/samples/sashtest/sashtest.bkl
index 73bd41bec1..da41a1e0e7 100644
--- a/samples/sashtest/sashtest.bkl
+++ b/samples/sashtest/sashtest.bkl
@@ -6,6 +6,7 @@
sashtest.cpp
core
+ base
sashtest.rc
diff --git a/samples/scroll/scroll.bkl b/samples/scroll/scroll.bkl
index 4ef1134efe..58658b5c74 100644
--- a/samples/scroll/scroll.bkl
+++ b/samples/scroll/scroll.bkl
@@ -6,6 +6,7 @@
scroll.cpp
core
+ base
scroll.rc
diff --git a/samples/scrollsub/scrollsub.bkl b/samples/scrollsub/scrollsub.bkl
index e0dc384f27..021cdf5112 100644
--- a/samples/scrollsub/scrollsub.bkl
+++ b/samples/scrollsub/scrollsub.bkl
@@ -6,6 +6,7 @@
scrollsub.cpp
core
+ base
scrollsub.rc
diff --git a/samples/shaped/shaped.bkl b/samples/shaped/shaped.bkl
index d3db04cbad..4a7db18d12 100644
--- a/samples/shaped/shaped.bkl
+++ b/samples/shaped/shaped.bkl
@@ -6,6 +6,7 @@
shaped.cpp
core
+ base
shaped.rc
diff --git a/samples/sockets/sockets.bkl b/samples/sockets/sockets.bkl
index d98fe9228e..34d0a3b937 100644
--- a/samples/sockets/sockets.bkl
+++ b/samples/sockets/sockets.bkl
@@ -6,6 +6,7 @@
sockets.cpp
core
+ base
sockets.rc
diff --git a/samples/splitter/splitter.bkl b/samples/splitter/splitter.bkl
index d1000a9e49..0b62172f5c 100644
--- a/samples/splitter/splitter.bkl
+++ b/samples/splitter/splitter.bkl
@@ -6,6 +6,7 @@
splitter.cpp
core
+ base
splitter.rc
diff --git a/samples/statbar/statbar.bkl b/samples/statbar/statbar.bkl
index 8955ba11dc..82d7904b6b 100644
--- a/samples/statbar/statbar.bkl
+++ b/samples/statbar/statbar.bkl
@@ -6,6 +6,7 @@
statbar.cpp
core
+ base
statbar.rc
diff --git a/samples/tab/tab.bkl b/samples/tab/tab.bkl
index 113fa78bfd..ff490b7b4b 100644
--- a/samples/tab/tab.bkl
+++ b/samples/tab/tab.bkl
@@ -6,6 +6,7 @@
tab.cpp
core
+ base
tab.rc
diff --git a/samples/taskbar/taskbar.bkl b/samples/taskbar/taskbar.bkl
index 8aa3b854ac..c702684725 100644
--- a/samples/taskbar/taskbar.bkl
+++ b/samples/taskbar/taskbar.bkl
@@ -6,6 +6,7 @@
taskbar.cpp
core
+ base
taskbar.rc
diff --git a/samples/text/text.bkl b/samples/text/text.bkl
index 8f29d9c74d..a9b023c48a 100644
--- a/samples/text/text.bkl
+++ b/samples/text/text.bkl
@@ -6,6 +6,7 @@
text.cpp
core
+ base
text.rc
diff --git a/samples/thread/thread.bkl b/samples/thread/thread.bkl
index 42c2236d5a..a864b6ccbd 100644
--- a/samples/thread/thread.bkl
+++ b/samples/thread/thread.bkl
@@ -6,6 +6,7 @@
thread.cpp
core
+ base
thread.rc
diff --git a/samples/toolbar/toolbar.bkl b/samples/toolbar/toolbar.bkl
index 36d556fd50..1eddc53bc3 100644
--- a/samples/toolbar/toolbar.bkl
+++ b/samples/toolbar/toolbar.bkl
@@ -6,6 +6,7 @@
toolbar.cpp
core
+ base
toolbar.rc
diff --git a/samples/treectrl/treectrl.bkl b/samples/treectrl/treectrl.bkl
index b0ae6b9479..dc0d8b0989 100644
--- a/samples/treectrl/treectrl.bkl
+++ b/samples/treectrl/treectrl.bkl
@@ -6,6 +6,7 @@
treectrl.cpp
core
+ base
treectrl.rc
diff --git a/samples/typetest/typetest.bkl b/samples/typetest/typetest.bkl
index 731e65e767..03ce78737a 100644
--- a/samples/typetest/typetest.bkl
+++ b/samples/typetest/typetest.bkl
@@ -6,6 +6,7 @@
typetest.cpp
core
+ base
typetest.rc
diff --git a/samples/validate/validate.bkl b/samples/validate/validate.bkl
index c48edd66d8..57c73162e9 100644
--- a/samples/validate/validate.bkl
+++ b/samples/validate/validate.bkl
@@ -6,6 +6,7 @@
validate.cpp
core
+ base
validate.rc
diff --git a/samples/vscroll/vscroll.bkl b/samples/vscroll/vscroll.bkl
index de4c0f67de..f0463498c6 100644
--- a/samples/vscroll/vscroll.bkl
+++ b/samples/vscroll/vscroll.bkl
@@ -6,6 +6,7 @@
vscroll.cpp
core
+ base
vscroll.rc
diff --git a/samples/widgets/widgets.bkl b/samples/widgets/widgets.bkl
index 78882fd567..6fe98b16cc 100644
--- a/samples/widgets/widgets.bkl
+++ b/samples/widgets/widgets.bkl
@@ -8,6 +8,7 @@
radiobox.cpp slider.cpp spinbtn.cpp static.cpp textctrl.cpp
widgets.cpp
core
+ base
widgets.rc
diff --git a/samples/wizard/wizard.bkl b/samples/wizard/wizard.bkl
index f0b9481237..08d102a8d5 100644
--- a/samples/wizard/wizard.bkl
+++ b/samples/wizard/wizard.bkl
@@ -6,6 +6,7 @@
wizard.cpp
core
+ base
wizard.rc
diff --git a/samples/wxtest/wxtest.bkl b/samples/wxtest/wxtest.bkl
index 282dc6aab4..c4ed8d09f7 100644
--- a/samples/wxtest/wxtest.bkl
+++ b/samples/wxtest/wxtest.bkl
@@ -6,6 +6,7 @@
wxtest.cpp
core
+ base
wxtest.rc