diff --git a/cube/Makefile.am b/cube/Makefile.am
index 57c3a5350..9e7a66b08 100644
--- a/cube/Makefile.am
+++ b/cube/Makefile.am
@@ -12,7 +12,7 @@ include_HEADERS = \
     altlist.h beam_search.h bmp_8.h cached_file.h \
     char_altlist.h char_bigrams.h char_samp.h char_samp_enum.h \
     char_samp_set.h char_set.h classifier_base.h classifier_factory.h \
-    con_comp.h const.h conv_net_classifier.h cube_line_object.h \
+    con_comp.h cube_const.h conv_net_classifier.h cube_line_object.h \
     cube_line_segmenter.h cube_object.h cube_search_object.h \
     cube_tuning_params.h cube_utils.h feature_base.h feature_bmp.h \
     feature_chebyshev.h feature_hybrid.h hybrid_neural_net_classifier.h \
diff --git a/cube/char_bigrams.cpp b/cube/char_bigrams.cpp
index 443daf4dd..05bca908a 100644
--- a/cube/char_bigrams.cpp
+++ b/cube/char_bigrams.cpp
@@ -26,6 +26,7 @@
 #include "cube_utils.h"
 #include "ndminx.h"
 #include "unicharset.h"
+#include "cube_const.h"
 
 namespace tesseract {
 
diff --git a/cube/char_set.h b/cube/char_set.h
index baa77a1a5..8229c232d 100644
--- a/cube/char_set.h
+++ b/cube/char_set.h
@@ -35,6 +35,7 @@
 #include "string_32.h"
 #include "tessdatamanager.h"
 #include "unicharset.h"
+#include "cube_const.h"
 
 namespace tesseract {
 
diff --git a/cube/con_comp.cpp b/cube/con_comp.cpp
index 0df05f37f..f043253ad 100644
--- a/cube/con_comp.cpp
+++ b/cube/con_comp.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "con_comp.h"
-#include "const.h"
+#include "cube_const.h"
 
 namespace tesseract {
 
diff --git a/cube/const.h b/cube/cube_const.h
similarity index 95%
rename from cube/const.h
rename to cube/cube_const.h
index 0154b8a6e..36376f1f1 100644
--- a/cube/const.h
+++ b/cube/cube_const.h
@@ -32,4 +32,10 @@
 #define HIST_WND_RATIO    0.1f
 #define SEG_PT_WND_RATIO  0.1f
 
+#ifdef __MSW32__
+#ifdef __GNUC__
+#include <climits>
+#endif
+#endif
+
 #endif  // CUBE_CONST_H
diff --git a/vs2008/cube.vcproj b/vs2008/cube.vcproj
index d9409a69d..26f212dc7 100644
--- a/vs2008/cube.vcproj
+++ b/vs2008/cube.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="cube"
 	ProjectGUID="{CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}"
 	RootNamespace="cube"
@@ -402,11 +402,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\cube\const.h"
+				RelativePath="..\cube\conv_net_classifier.h"
 				>
 			</File>
 			<File
-				RelativePath="..\cube\conv_net_classifier.h"
+				RelativePath="..\cube\cube_const.h"
 				>
 			</File>
 			<File
diff --git a/vs2010/cube.vcxproj b/vs2010/cube.vcxproj
index c770a678b..245420f62 100644
--- a/vs2010/cube.vcxproj
+++ b/vs2010/cube.vcxproj
@@ -57,7 +57,7 @@
     <ClInclude Include="..\cube\classifier_base.h" />
     <ClInclude Include="..\cube\classifier_factory.h" />
     <ClInclude Include="..\cube\con_comp.h" />
-    <ClInclude Include="..\cube\const.h" />
+    <ClInclude Include="..\cube\cube_const.h" />
     <ClInclude Include="..\cube\conv_net_classifier.h" />
     <ClInclude Include="..\cube\cube_line_object.h" />
     <ClInclude Include="..\cube\cube_line_segmenter.h" />