diff --git a/Cache/BlockCache.cpp b/Cache/BlockCache.cpp
index 0467fa1..e450797 100644
--- a/Cache/BlockCache.cpp
+++ b/Cache/BlockCache.cpp
@@ -1,11 +1,13 @@
 
 #include <algorithm>
 #include <cerrno>
+#include <cstring>
 
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
+
 #include <Cache/BlockCache.h>
 #include <Device/BlockDevice.h>
 
diff --git a/Cache/ConcreteBlockCache.cpp b/Cache/ConcreteBlockCache.cpp
index eb6474b..cc24971 100644
--- a/Cache/ConcreteBlockCache.cpp
+++ b/Cache/ConcreteBlockCache.cpp
@@ -1,6 +1,7 @@
 
 #include <algorithm>
 #include <cerrno>
+#include <cstring>
 
 #include <sys/types.h>
 #include <sys/mman.h>
diff --git a/Device/BlockDevice.h b/Device/BlockDevice.h
index 17f6369..592bea2 100644
--- a/Device/BlockDevice.h
+++ b/Device/BlockDevice.h
@@ -40,7 +40,7 @@ public:
 protected:
     BlockDevice();
     
-    friend BlockCache;
+    friend class BlockCache;
     virtual BlockCache *createBlockCache();
 };
 
@@ -48,4 +48,4 @@ protected:
 
 }
 
-#endif
\ No newline at end of file
+#endif