diff --git a/project/include/ui/Window.h b/project/include/ui/Window.h
index 453082049..618502d58 100644
--- a/project/include/ui/Window.h
+++ b/project/include/ui/Window.h
@@ -4,6 +4,10 @@
 
 #include <app/Application.h>
 
+#ifdef CreateWindow
+#undef CreateWindow
+#endif
+
 
 namespace lime {
 	
diff --git a/project/include/utils/ByteArray.h b/project/include/utils/ByteArray.h
index 5dc71def0..d588173cb 100644
--- a/project/include/utils/ByteArray.h
+++ b/project/include/utils/ByteArray.h
@@ -12,10 +12,7 @@ namespace lime {
 	
 	typedef unsigned char uint8;
 	
-	//this was //HX_WINDOWS,
-	//but we aren't using _wfopen by
-	//default anymore
-	#if 0
+	#if HX_WINDOWS
 	
 	typedef wchar_t OSChar;
 	#define val_os_string val_wstring
diff --git a/project/src/utils/ByteArray.cpp b/project/src/utils/ByteArray.cpp
index 4bdc3f97d..af04c7b0c 100644
--- a/project/src/utils/ByteArray.cpp
+++ b/project/src/utils/ByteArray.cpp
@@ -164,26 +164,6 @@ extern int gFixedOrientation;
 }
 
 
-#ifdef HX_WINDOWS
-ByteArray ByteArray::FromFile(const char *inFilename)
-{
-   FILE *file = fopen(inFilename,"rb");
-   if (!file)
-      return ByteArray();
-
-   fseek(file,0,SEEK_END);
-   int len = ftell(file);
-   fseek(file,0,SEEK_SET);
-
-   ByteArray result(len);
-   fread(result.Bytes(),len,1,file);
-   fclose(file);
-
-   return result;
-}
-#endif
-
-
 value lime_byte_array_overwrite_file(value inFilename, value inBytes) {
 
         // file is created if it doesn't exist,