Merge pull request #116 from pcc/fix2

Fix autotools build.
diff --git a/src/config.h.in b/src/config.h.in
index e41635a..8190f23 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -178,12 +178,3 @@
 
 /* Puts following code inside the Google namespace */
 #undef _START_GOOGLE_NAMESPACE_
-
-// Annoying stuff for windows -- makes sure clients can import these functions
-#ifndef GOOGLE_GLOG_DLL_DECL
-# if defined(_WIN32) && !defined(__CYGWIN__)
-#   define GOOGLE_GLOG_DLL_DECL  __declspec(dllimport)
-# else
-#   define GOOGLE_GLOG_DLL_DECL
-# endif
-#endif
diff --git a/src/demangle.h b/src/demangle.h
index 2653029..991b6ff 100644
--- a/src/demangle.h
+++ b/src/demangle.h
@@ -71,6 +71,7 @@
 #define BASE_DEMANGLE_H_
 
 #include "config.h"
+#include "glog/logging.h"
 
 _START_GOOGLE_NAMESPACE_