diff --git a/redo/common_windows.c b/redo/common_windows.c
index f12050c..e317595 100644
--- a/redo/common_windows.c
+++ b/redo/common_windows.c
@@ -1,6 +1,7 @@
 // 17 july 2014
 
 #include "winapi_windows.h"
+#include "_cgo_export.h"
 
 LRESULT getWindowTextLen(HWND hwnd)
 {
diff --git a/redo/controls_windows.c b/redo/controls_windows.c
index 77cf758..64bf273 100644
--- a/redo/controls_windows.c
+++ b/redo/controls_windows.c
@@ -1,6 +1,7 @@
 /* 17 july 2014 */
 
 #include "winapi_windows.h"
+#include "_cgo_export.h"
 
 HWND newWidget(LPCWSTR class, DWORD style, DWORD extstyle)
 {
@@ -49,7 +50,7 @@ static LRESULT CALLBACK buttonSubProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
 	switch (uMsg) {
 	case msgCOMMAND:
 		if (HIWORD(wParam) == BN_CLICKED) {
-			buttonClicked(data);
+			buttonClicked((void *) data);
 			return 0;
 		}
 		return (*fv_DefSubclassProc)(hwnd, uMsg, wParam, lParam);
diff --git a/redo/sizing_windows.c b/redo/sizing_windows.c
index 0b1620b..2b0357d 100644
--- a/redo/sizing_windows.c
+++ b/redo/sizing_windows.c
@@ -1,6 +1,7 @@
 /* 17 july 2014 */
 
 #include "winapi_windows.h"
+#include "_cgo_export.h"
 
 HDC getDC(HWND hwnd)
 {
diff --git a/redo/window_windows.c b/redo/window_windows.c
index 02eaddd..4380094 100644
--- a/redo/window_windows.c
+++ b/redo/window_windows.c
@@ -1,6 +1,7 @@
 /* 17 july 2014 */
 
 #include "winapi_windows.h"
+#include "_cgo_export.h"
 
 #define windowclass L"gouiwindow"