diff --git a/BBB_GOFILES/datetimepicker.go b/datetimepicker.go
similarity index 76%
rename from BBB_GOFILES/datetimepicker.go
rename to datetimepicker.go
index 3436b3c..986b43f 100644
--- a/BBB_GOFILES/datetimepicker.go
+++ b/datetimepicker.go
@@ -7,17 +7,7 @@ import (
 	"unsafe"
 )
 
-// #include <stdlib.h>
-// #include <time.h>
-// #include "ui.h"
-// #include "util.h"
-// static inline struct tm *allocTimeStruct(void)
-// {
-// 	return (struct tm *) pkguiAlloc(sizeof (struct tm));
-// }
-// extern void doDateTimePickerOnChanged(uiDateTimePicker *, void *);
-// // see golang/go#19835
-// typedef void (*dtpCallback)(uiDateTimePicker *, void *);
+// #include "pkgui.h"
 import "C"
 
 // DateTimePicker is a Control that represents a field where the user
@@ -33,7 +23,7 @@ func finishNewDateTimePicker(dd *C.uiDateTimePicker) *DateTimePicker {
 
 	d.d = dd
 
-	C.uiDateTimePickerOnChanged(d.d, C.dtpCallback(C.doDateTimePickerOnChanged), nil)
+	C.pkguiDateTimePickerOnChanged(d.d)
 
 	d.ControlBase = NewControlBase(d, uintptr(unsafe.Pointer(d.d)))
 	return d
@@ -60,8 +50,8 @@ func NewTimePicker() *DateTimePicker {
 // Time returns the time stored in the uiDateTimePicker.
 // The time is assumed to be local time.
 func (d *DateTimePicker) Time() time.Time {
-	tm := C.allocTimeStruct()
-	defer C.free(unsafe.Pointer(tm))
+	tm := C.pkguiAllocTime()
+	defer C.pkguiFreeTime(tm)
 	C.uiDateTimePickerTime(d.d, tm)
 	return time.Date(
 		int(tm.tm_year + 1900),
@@ -77,8 +67,8 @@ func (d *DateTimePicker) Time() time.Time {
 // t's components are read as-is via t.Date() and t.Clock();
 // no time zone manipulations are done.
 func (d *DateTimePicker) SetTime(t time.Time) {
-	tm := C.allocTimeStruct()
-	defer C.free(unsafe.Pointer(tm))
+	tm := C.pkguiAllocTime()
+	defer C.pkguiFreeTime(tm)
 	year, mon, mday := t.Date()
 	tm.tm_year = C.int(year - 1900)
 	tm.tm_mon = C.int(mon - 1)
@@ -98,8 +88,8 @@ func (d *DateTimePicker) OnChanged(f func(*DateTimePicker)) {
 	d.onChanged = f
 }
 
-//export doDateTimePickerOnChanged
-func doDateTimePickerOnChanged(dd *C.uiDateTimePicker, data unsafe.Pointer) {
+//export pkguiDoDateTimePickerOnChanged
+func pkguiDoDateTimePickerOnChanged(dd *C.uiDateTimePicker, data unsafe.Pointer) {
 	d := ControlFromLibui(uintptr(unsafe.Pointer(dd))).(*DateTimePicker)
 	if d.onChanged != nil {
 		d.onChanged(d)
diff --git a/pkgui.c b/pkgui.c
index cdc2a3f..18f1a5b 100644
--- a/pkgui.c
+++ b/pkgui.c
@@ -42,6 +42,21 @@ void pkguiComboboxOnSelected(uiCombobox *c)
 	uiComboboxOnSelected(c, pkguiDoComboboxOnSelected, NULL);
 }
 
+void pkguiDateTimePickerOnChanged(uiDateTimePicker *d)
+{
+	uiDateTimePickerOnChanged(d, pkguiDoDateTimePickerOnChanged, NULL);
+}
+
+struct tm *pkguiAllocTime(void)
+{
+	return (struct tm *) pkguiAlloc(sizeof (struct tm));
+}
+
+void pkguiFreeTime(struct tm *t)
+{
+	free(t);
+}
+
 void pkguiEditableComboboxOnChanged(uiEditableCombobox *c)
 {
 	uiEditableComboboxOnChanged(c, pkguiDoEditableComboboxOnChanged, NULL);
diff --git a/pkgui.h b/pkgui.h
index 418f781..e9739a8 100644
--- a/pkgui.h
+++ b/pkgui.h
@@ -3,6 +3,7 @@
 #define pkguiHFileIncluded
 
 #include <stdlib.h>
+#include <time.h>
 #include "ui.h"
 
 // main.go
@@ -23,6 +24,11 @@ extern void pkguiCheckboxOnToggled(uiCheckbox *c);
 // combobox.go
 extern void pkguiComboboxOnSelected(uiCombobox *c);
 
+// datetimepicker.go
+extern void pkguiDateTimePickerOnChanged(uiDateTimePicker *d);
+extern struct tm *pkguiAllocTime(void);
+extern void pkguiFreeTime(struct tm *t);
+
 // editablecombobox.go
 extern void pkguiEditableComboboxOnChanged(uiEditableCombobox *c);
 
diff --git a/BBB_GOFILES/stddialogs.go b/stddialogs.go
similarity index 97%
rename from BBB_GOFILES/stddialogs.go
rename to stddialogs.go
index 0ff8a01..7767dd7 100644
--- a/BBB_GOFILES/stddialogs.go
+++ b/stddialogs.go
@@ -2,7 +2,7 @@
 
 package ui
 
-// #include "ui.h"
+// #include "pkgui.h"
 import "C"
 
 // TODO