diff --git a/elfio/elfio_section.hpp b/elfio/elfio_section.hpp
index ea828c8..3e68c52 100644
--- a/elfio/elfio_section.hpp
+++ b/elfio/elfio_section.hpp
@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <string>
 #include <iostream>
 #include <new>
-#include <climits>
+#include <limits>
 
 namespace ELFIO {
 
@@ -197,7 +197,7 @@ template <class T> class section_impl : public section
             set_stream_size( stream.tellg() );
         }
         else {
-            set_stream_size( ULLONG_MAX );
+            set_stream_size( std::numeric_limits<size_t>::max() );
         }
 
         stream.seekg( ( *translator )[header_offset] );
diff --git a/elfio/elfio_segment.hpp b/elfio/elfio_segment.hpp
index f7224a4..42eac63 100644
--- a/elfio/elfio_segment.hpp
+++ b/elfio/elfio_segment.hpp
@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <iostream>
 #include <vector>
 #include <new>
-#include <climits>
+#include <limits>
 
 namespace ELFIO {
 
@@ -166,7 +166,7 @@ template <class T> class segment_impl : public segment
             set_stream_size( stream.tellg() );
         }
         else {
-            set_stream_size( ULLONG_MAX );
+            set_stream_size( std::numeric_limits<size_t>::max() );
         }
 
         stream.seekg( ( *translator )[header_offset] );