10 files changed, 11 insertions, 7 deletions
diff --git a/src/common/msgbox.nim b/src/msgbox.nim
index 5071dfb..5071dfb 100755
--- a/src/common/msgbox.nim
+++ b/src/msgbox.nim
diff --git a/src/common/nigui.nim b/src/nigui.nim
index c81c02d..4ecdebd 100755
--- a/src/common/nigui.nim
+++ b/src/nigui.nim
@@ -2,9 +2,11 @@
 
 # This file contains all common code except extra widgets.
 # All public procedures are declared here.
-# Public types are declared here or in the platform-specific file "nigui_platform_types".
-# The platform-specific files "nigui_platform_types" and "nigui_platform_procs" will be
-# included to this file.
+# Platform-specific code will added by "include".
+
+# Templates for "include":
+template useWindows(): bool = defined(windows) and not defined(forceGtk)
+template useGtk(): bool = not useWindows()
 
 # ========================================================================================
 #
@@ -258,9 +260,9 @@ type
     data*: pointer
   TimerProc* = proc(event: TimerEvent)
 
-
 # Platform-specific extension of Window and Control:
-include nigui_platform_types1
+when useWindows(): include "nigui/private/windows/platform_types1"
+when useGtk():     include "nigui/private/gtk3/platform_types1"
 
 
 # ----------------------------------------------------------------------------------------
@@ -290,7 +292,8 @@ type
 
 
 # Platform-specific extension of basic controls:
-include nigui_platform_types2
+when useWindows(): include "nigui/private/windows/platform_types2"
+when useGtk():     include "nigui/private/gtk3/platform_types2"
 
 
 # ----------------------------------------------------------------------------------------
@@ -2247,4 +2250,5 @@ method `wrap=`(textArea: TextArea, wrap: bool) =
 #                             Platform-specific implementation
 # ----------------------------------------------------------------------------------------
 
-include nigui_platform_impl
+when useWindows(): include "nigui/private/windows/platform_impl"
+when useGtk():     include "nigui/private/gtk3/platform_impl"
diff --git a/src/gtk3/gtk3.nim b/src/nigui/private/gtk3/gtk3.nim
index f2c7eba..f2c7eba 100755
--- a/src/gtk3/gtk3.nim
+++ b/src/nigui/private/gtk3/gtk3.nim
diff --git a/src/gtk3/nigui_platform_impl.nim b/src/nigui/private/gtk3/platform_impl.nim
index fbb7b45..fbb7b45 100755
--- a/src/gtk3/nigui_platform_impl.nim
+++ b/src/nigui/private/gtk3/platform_impl.nim
diff --git a/src/gtk3/nigui_platform_types1.nim b/src/nigui/private/gtk3/platform_types1.nim
index d0178cd..d0178cd 100755
--- a/src/gtk3/nigui_platform_types1.nim
+++ b/src/nigui/private/gtk3/platform_types1.nim
diff --git a/src/gtk3/nigui_platform_types2.nim b/src/nigui/private/gtk3/platform_types2.nim
index c176ffc..c176ffc 100755
--- a/src/gtk3/nigui_platform_types2.nim
+++ b/src/nigui/private/gtk3/platform_types2.nim
diff --git a/src/windows/nigui_platform_impl.nim b/src/nigui/private/windows/platform_impl.nim
index c4c3010..c4c3010 100755
--- a/src/windows/nigui_platform_impl.nim
+++ b/src/nigui/private/windows/platform_impl.nim
diff --git a/src/windows/nigui_platform_types1.nim b/src/nigui/private/windows/platform_types1.nim
index ddf36cf..ddf36cf 100755
--- a/src/windows/nigui_platform_types1.nim
+++ b/src/nigui/private/windows/platform_types1.nim
diff --git a/src/windows/nigui_platform_types2.nim b/src/nigui/private/windows/platform_types2.nim
index bbe7caf..bbe7caf 100755
--- a/src/windows/nigui_platform_types2.nim
+++ b/src/nigui/private/windows/platform_types2.nim
diff --git a/src/windows/windows.nim b/src/nigui/private/windows/windows.nim
index 543985a..543985a 100755
--- a/src/windows/windows.nim
+++ b/src/nigui/private/windows/windows.nim