diff --git a/libyara/filemap.h b/libyara/filemap.h
index 30aa4718e8..bd727b0242 100755
--- a/libyara/filemap.h
+++ b/libyara/filemap.h
@@ -46,3 +46,6 @@ int yr_filemap_map(
 
 void yr_filemap_unmap(
     MAPPED_FILE* pmapped_file);
+
+#endif
+
diff --git a/threading.h b/threading.h
index 19d4432866..11383a616d 100644
--- a/threading.h
+++ b/threading.h
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 
-#ifndef _THREADING_H
-#define _THREADING_H
+#ifndef YR_THREADING_H
+#define YR_THREADING_H
 
 #ifdef WIN32
 #include <windows.h>