diff --git a/window/pub.h b/window/pub.h
index 5b5aefb..f3a2c0d 100644
--- a/window/pub.h
+++ b/window/pub.h
@@ -10,6 +10,22 @@
 
 // #include "../base/os.h"
 
+struct _MData{
+	#if defined(IS_MACOSX)
+		CGWindowID		CgID;		// Handle to a CGWindowID
+		AXUIElementRef	AxID;		// Handle to a AXUIElementRef
+	#elif defined(USE_X11)
+		Window		XWin;		// Handle to an X11 window
+	#elif defined(IS_WINDOWS)
+		HWND			HWnd;		// Handle to a window HWND
+		TCHAR 	Title[512];
+	#endif
+};
+
+typedef struct _MData MData;
+
+MData mData;
+
 #if defined(IS_MACOSX)
 
 	static Boolean(*gAXIsProcessTrustedWithOptions) (CFDictionaryRef);
@@ -24,8 +40,8 @@
 
 		// Create array storing window
 		CGWindowID window[1] = { win };
-		CFArrayRef wlist = CFArrayCreate(NULL,
-				(const void**)window, 1, NULL);
+		CFArrayRef wlist = CFArrayCreate(NULL, 
+						(const void**)window, 1, NULL);
 
 		// Get window info
 		CFArrayRef info = CGWindowListCreateDescriptionFromArray(wlist);
diff --git a/window/window.h b/window/window.h
index f17a06c..7ebfc58 100644
--- a/window/window.h
+++ b/window/window.h
@@ -13,22 +13,6 @@
 #include "process.h"
 #include "pub.h"
 
-struct _MData{
-	#if defined(IS_MACOSX)
-		CGWindowID		CgID;		// Handle to a CGWindowID
-		AXUIElementRef	AxID;		// Handle to a AXUIElementRef
-	#elif defined(USE_X11)
-		Window		XWin;		// Handle to an X11 window
-	#elif defined(IS_WINDOWS)
-		HWND			HWnd;		// Handle to a window HWND
-		TCHAR 	Title[512];
-	#endif
-};
-
-typedef struct _MData MData;
-
-MData mData;
-
 bool setHandle(uintptr handle);
 bool IsValid();
 bool IsAxEnabled(bool options);