diff --git a/headers/simdvariablebyte.h b/headers/simdvariablebyte.h
index 62832c1..b16a1ec 100644
--- a/headers/simdvariablebyte.h
+++ b/headers/simdvariablebyte.h
@@ -13,6 +13,8 @@
 #include "common.h"
 #include "codecs.h"
 
+namespace FastPForLib {
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -26,7 +28,7 @@ size_t masked_vbyte_read_loop_fromcompressedsize(const uint8_t *in,
 /**
  * SIMD-accelerated version of VariableByteAlt.
  */
-class MaskedVByte : public FastPForLib::IntegerCODEC {
+class MaskedVByte : public IntegerCODEC {
 public:
   MaskedVByte() {}
 
@@ -77,7 +79,7 @@ class MaskedVByte : public FastPForLib::IntegerCODEC {
         ++bout;
       }
     }
-    while (FastPForLib::needPaddingTo32Bits(bout)) {
+    while (needPaddingTo32Bits(bout)) {
       *bout++ = 0xFFU;
     }
     const size_t storageinbytes = bout - initbout;
@@ -93,4 +95,7 @@ class MaskedVByte : public FastPForLib::IntegerCODEC {
 
   std::string name() const { return "MaskedVByte"; }
 };
+
+} // namespace FastPForLib
+
 #endif /* SIMDVARIABLEBYTE_H_ */