diff --git a/src/common/common.gyp b/src/common/common.gyp
index 3c871509..47fadd8c 100644
--- a/src/common/common.gyp
+++ b/src/common/common.gyp
@@ -235,6 +235,9 @@
         '../build/testing.gypi:gmock',
         '../build/testing.gypi:gtest',
       ],
+      'libraries': [
+        '-ldl',
+      ],
     },
   ],
 }
diff --git a/src/common/linux/google_crashdump_uploader.h b/src/common/linux/google_crashdump_uploader.h
index 44901620..77048ae0 100644
--- a/src/common/linux/google_crashdump_uploader.h
+++ b/src/common/linux/google_crashdump_uploader.h
@@ -28,6 +28,9 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+#ifndef COMMON_LINUX_GOOGLE_CRASHDUMP_UPLOADER_H_
+#define COMMON_LINUX_GOOGLE_CRASHDUMP_UPLOADER_H_
+
 #include <string>
 #include <map>
 
@@ -98,3 +101,5 @@ class GoogleCrashdumpUploader {
   std::map<string, string> parameters_;
 };
 }
+
+#endif  // COMMON_LINUX_GOOGLE_CRASHDUMP_UPLOADER_H_
diff --git a/src/common/linux/libcurl_wrapper.h b/src/common/linux/libcurl_wrapper.h
index 3d46c2e6..b6786e44 100644
--- a/src/common/linux/libcurl_wrapper.h
+++ b/src/common/linux/libcurl_wrapper.h
@@ -30,6 +30,9 @@
 // A wrapper for libcurl to do HTTP Uploads, to support easy mocking
 // and unit testing of the HTTPUpload class.
 
+#ifndef COMMON_LINUX_LIBCURL_WRAPPER_H_
+#define COMMON_LINUX_LIBCURL_WRAPPER_H_
+
 #include <string>
 #include <map>
 
@@ -83,3 +86,5 @@ class LibcurlWrapper {
 
 };
 }
+
+#endif  // COMMON_LINUX_LIBCURL_WRAPPER_H_