diff -r 6d9066951cdb -r bcb3c7d486f3 ui/win32/container.h
--- a/ui/win32/container.h	Wed Oct 08 09:46:23 2025 +0200
+++ b/ui/win32/container.h	Wed Oct 08 10:41:35 2025 +0200
@@ -1,5 +1,5 @@
 /*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
  * Copyright 2025 Olaf Wintermann. All rights reserved.
  *
@@ -30,6 +30,7 @@
 #define CONTAINER_H
 
 #include "../ui/container.h"
+#include "toolkit.h"
 #include "grid.h"
 
 #ifdef __cplusplus
@@ -37,6 +38,7 @@
 #endif
 
 
+typedef struct UiGridLayoutContainer UiGridLayoutContainer;
 
 enum UiBoxOrientation {
     UI_BOX_VERTICAL = 0,
@@ -65,7 +67,7 @@
     HWND            (*parent)(UiContainerPrivate*);
     void            (*add)(UiContainerPrivate*, W32Widget*, UiLayout*);
     UiContainerType type;
-    UiLayout        layout;
+    HWND            hwnd;
 };
 
 struct UiGridLayoutContainer {
@@ -75,6 +77,13 @@
     int y;
 };
 
+UiContainerPrivate* ui_obj_container(UiObject *obj);
+HWND ui_container_get_parent(UiContainerPrivate *ctn);
+void ui_container_add(UiContainerPrivate *ctn, W32Widget *widget, UiLayout *layout);
+
+UiContainerX* ui_grid_container_create(UiObject *obj, HWND hwnd, short padding_top, short padding_bottom, short padding_left, short padding_right);
+void ui_grid_container_add(UiContainerPrivate *ctn, W32Widget *widget, UiLayout *layout);
+
 #ifdef __cplusplus
 }
 #endif