[pan2] forgot those

[Heinrich MÃller <henmull src gnome org>]

commit 53c8f7446879d8b4bef36096352b73d4a6bd7c5c
Author: Heinrich MÃller <henmull src gnome org>
Date:   Tue Jan 17 08:22:45 2012 +0100

    forgot those

 pan/data/encode-cache.h    |    2 +-
 pan/general/macros.h       |    5 -----
 pan/general/time-elapsed.h |    2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h
index b805825..37861f0 100644
--- a/pan/data/encode-cache.h
+++ b/pan/data/encode-cache.h
@@ -23,7 +23,7 @@
 #include <map>
 #include <vector>
 extern "C" {
-  #include <glib/gtypes.h> // for guint64
+  #include <glib/glib.h> // for guint64
 }
 #include <pan/general/string-view.h>
 #include <pan/general/quark.h>
diff --git a/pan/general/macros.h b/pan/general/macros.h
index 1429fa6..628a522 100644
--- a/pan/general/macros.h
+++ b/pan/general/macros.h
@@ -66,11 +66,6 @@
 extern "C"
 {
   #include <glib.h>
-
-  // pick up g_assert()
-  #if !GLIB_CHECK_VERSION(2,16,0)
-    #include <glib/gmessages.h>
-  #endif
 }
 
 #endif
diff --git a/pan/general/time-elapsed.h b/pan/general/time-elapsed.h
index ec4e76d..f8e059e 100644
--- a/pan/general/time-elapsed.h
+++ b/pan/general/time-elapsed.h
@@ -1,7 +1,7 @@
 #ifndef __Time_Elapsed_h__
 #define __Time_Elapsed_h__
 
-#include <glib.h>
+#include <glib.h> // for GTimeVal, g_get_current_time and GUSEC_PER_SEC
 
 namespace pan
 {