2 files changed, 2 insertions, 4 deletions
diff --git a/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp b/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp
index 360ac4fb0b5..929caa39011 100644
--- a/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp
+++ b/fastlib/src/vespa/fastlib/net/httpheaderparser.cpp
@@ -81,8 +81,8 @@ Fast_HTTPHeaderParser::ReadHeader(const char *&name, const char *&value)
     idx++;
   }
 
-  while (idx < (_bufferSize-1)) {
-    size_t readLen = _input->ReadBufferFullUntil(&_lineBuffer[idx], _bufferSize - idx - 1, '\n');
+  while ((idx + 1) < _bufferSize) {
+    size_t readLen = _input->ReadBufferFullUntil(&_lineBuffer[idx], _bufferSize - idx, '\n');
     if (readLen <= 0) {
       return false;
     }
diff --git a/fastlib/src/vespa/fastlib/net/httpheaderparser.h b/fastlib/src/vespa/fastlib/net/httpheaderparser.h
index 643d8252d52..59c5cb01f8a 100644
--- a/fastlib/src/vespa/fastlib/net/httpheaderparser.h
+++ b/fastlib/src/vespa/fastlib/net/httpheaderparser.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include <vector>
-
 class Fast_BufferedInputStream;
 
 class Fast_HTTPHeaderParser