1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
|
diff --git a/src/channel.c b/src/channel.c
index d7215a9..932522d 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -19,8 +19,6 @@
*/
#include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
#include <string.h>
#include "mw_channel.h"
diff --git a/src/mw_debug.c b/src/mw_debug.c
index cf47a38..d22d287 100644
--- a/src/mw_debug.c
+++ b/src/mw_debug.c
@@ -19,7 +19,7 @@
*/
-#include <glib/gstring.h>
+#include <glib.h>
#include "mw_debug.h"
diff --git a/src/mw_message.h b/src/mw_message.h
index 8402b8b..a825ec2 100644
--- a/src/mw_message.h
+++ b/src/mw_message.h
@@ -22,7 +22,7 @@
#define _MW_MESSAGE_H
-#include <glib/glist.h>
+#include <glib.h>
#include "mw_common.h"
diff --git a/src/mw_srvc_conf.h b/src/mw_srvc_conf.h
index 156c639..66d885b 100644
--- a/src/mw_srvc_conf.h
+++ b/src/mw_srvc_conf.h
@@ -22,7 +22,7 @@
#define _MW_SRVC_CONF_H
-#include <glib/glist.h>
+#include <glib.h>
#include "mw_common.h"
diff --git a/src/mw_srvc_dir.h b/src/mw_srvc_dir.h
index b9230bb..8fd1c85 100644
--- a/src/mw_srvc_dir.h
+++ b/src/mw_srvc_dir.h
@@ -22,7 +22,7 @@
#include <glib.h>
-#include <glib/glist.h>
+#include <glib.h>
#ifdef __cplusplus
diff --git a/src/mw_srvc_place.h b/src/mw_srvc_place.h
index e17aa71..bba97b6 100644
--- a/src/mw_srvc_place.h
+++ b/src/mw_srvc_place.h
@@ -22,7 +22,7 @@
#define _MW_SRVC_PLACE_H
-#include <glib/glist.h>
+#include <glib.h>
#include "mw_common.h"
diff --git a/src/mw_srvc_resolve.h b/src/mw_srvc_resolve.h
index 3b06b75..55aefdf 100644
--- a/src/mw_srvc_resolve.h
+++ b/src/mw_srvc_resolve.h
@@ -23,7 +23,7 @@
#include <glib.h>
-#include <glib/glist.h>
+#include <glib.h>
#ifdef __cplusplus
diff --git a/src/mw_st_list.h b/src/mw_st_list.h
index 39e1cbf..c0032d4 100644
--- a/src/mw_st_list.h
+++ b/src/mw_st_list.h
@@ -30,7 +30,7 @@
#include <glib.h>
-#include <glib/glist.h>
+#include <glib.h>
#include "mw_common.h"
diff --git a/src/mw_util.h b/src/mw_util.h
index b8e0b7e..10dcd69 100644
--- a/src/mw_util.h
+++ b/src/mw_util.h
@@ -23,9 +23,6 @@
#include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
-
#define map_guint_new() \
g_hash_table_new(g_direct_hash, g_direct_equal)
diff --git a/src/srvc_aware.c b/src/srvc_aware.c
index 869f973..dc2c12f 100644
--- a/src/srvc_aware.c
+++ b/src/srvc_aware.c
@@ -19,8 +19,6 @@
*/
#include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
#include <string.h>
#include "mw_channel.h"
diff --git a/src/srvc_conf.c b/src/srvc_conf.c
index da8e6f3..eee0051 100644
--- a/src/srvc_conf.c
+++ b/src/srvc_conf.c
@@ -19,8 +19,6 @@
*/
#include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/srvc_dir.c b/src/srvc_dir.c
index cf49152..ed5997e 100644
--- a/src/srvc_dir.c
+++ b/src/srvc_dir.c
@@ -18,7 +18,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib/ghash.h>
+#include <glib.h>
#include "mw_channel.h"
#include "mw_common.h"
diff --git a/src/srvc_ft.c b/src/srvc_ft.c
index 0564732..ff9f010 100644
--- a/src/srvc_ft.c
+++ b/src/srvc_ft.c
@@ -19,7 +19,7 @@
*/
-#include <glib/glist.h>
+#include <glib.h>
#include "mw_channel.h"
#include "mw_common.h"
diff --git a/src/srvc_im.c b/src/srvc_im.c
index 5930687..16714c7 100644
--- a/src/srvc_im.c
+++ b/src/srvc_im.c
@@ -19,7 +19,7 @@
*/
#include <glib.h>
-#include <glib/glist.h>
+#include <glib.h>
#include <string.h>
#include "mw_channel.h"
diff --git a/src/srvc_place.c b/src/srvc_place.c
index fc979ff..58ba574 100644
--- a/src/srvc_place.c
+++ b/src/srvc_place.c
@@ -19,8 +19,6 @@
*/
#include <glib.h>
-#include <glib/ghash.h>
-#include <glib/glist.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/srvc_resolve.c b/src/srvc_resolve.c
index aac0d49..c71d7b3 100644
--- a/src/srvc_resolve.c
+++ b/src/srvc_resolve.c
@@ -18,7 +18,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib/ghash.h>
+#include <glib.h>
#include "mw_channel.h"
#include "mw_common.h"
diff --git a/src/srvc_store.c b/src/srvc_store.c
index 90f2efc..afbd2b6 100644
--- a/src/srvc_store.c
+++ b/src/srvc_store.c
@@ -18,7 +18,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <glib/glist.h>
+#include <glib.h>
#include "mw_channel.h"
#include "mw_debug.h"
diff --git a/src/st_list.c b/src/st_list.c
index 949696a..e47ec35 100644
--- a/src/st_list.c
+++ b/src/st_list.c
@@ -20,7 +20,7 @@
#include <stdio.h>
#include <string.h>
-#include <glib/gstring.h>
+#include <glib.h>
#include "mw_debug.h"
#include "mw_util.h"
|