1diff --git a/asn.c b/asn.c
2index eac8d5e..33622ca 100644
3--- a/asn.c
4+++ b/asn.c
5@@ -16,6 +16,8 @@
6 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
7 */
8
9+#include "config.h"
10+
11 #include <unistd.h>
12 #include <stdio.h>
13 #include <stdlib.h>
14@@ -35,7 +37,6 @@
15 #include <sys/socket.h>
16 #include <search.h>
17
18-#include "config.h"
19 #include "mtr.h"
20 #include "asn.h"
21
22diff --git a/curses.c b/curses.c
23index eacc40d..b96daee 100644
24--- a/curses.c
25+++ b/curses.c
26@@ -16,7 +16,8 @@
27 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
28 */
29
30-#include <config.h>
31+#include "config.h"
32+
33 #include <strings.h>
34 #include <unistd.h>
35
36diff --git a/display.c b/display.c
37index aa369ee..3545467 100644
38--- a/display.c
39+++ b/display.c
40@@ -16,7 +16,8 @@
41 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
42 */
43
44-#include <config.h>
45+#include "config.h"
46+
47 #include <stdio.h>
48 #include <stdlib.h>
49 #include <sys/types.h>
50diff --git a/dns.c b/dns.c
51index e89fd4b..4076b71 100644
52--- a/dns.c
53+++ b/dns.c
54@@ -22,7 +22,8 @@
55 Released under GPL, as above.
56 */
57
58-#include <config.h>
59+#include "config.h"
60+
61 #include <sys/types.h>
62 #include <sys/time.h>
63 #include <sys/select.h>
64diff --git a/getopt.c b/getopt.c
65index 3d43e26..e2f8758 100644
66--- a/getopt.c
67+++ b/getopt.c
68@@ -27,7 +27,7 @@
69 #endif
70
71 #ifdef HAVE_CONFIG_H
72-#include <config.h>
73+#include "config.h"
74 #endif
75
76 #if !defined (__STDC__) || !__STDC__
77diff --git a/getopt1.c b/getopt1.c
78index bccf8b2..0a2d405 100644
79--- a/getopt1.c
80+++ b/getopt1.c
81@@ -16,7 +16,7 @@
82 Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
83
84 #ifdef HAVE_CONFIG_H
85-#include <config.h>
86+#include "config.h"
87 #endif
88
89 #include "getopt.h"
90diff --git a/gtk.c b/gtk.c
91index 38ed507..7faa132 100644
92--- a/gtk.c
93+++ b/gtk.c
94@@ -17,7 +17,7 @@
95 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
96 */
97
98-#include <config.h>
99+#include "config.h"
100
101 #include <stdio.h>
102 #include <stdlib.h>
103diff --git a/mtr.c b/mtr.c
104index 50eb464..416b744 100644
105--- a/mtr.c
106+++ b/mtr.c
107@@ -16,19 +16,21 @@
108 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
109 */
110
111+#include "config.h"
112+
113 #include <sys/types.h>
114-#include <config.h>
115-#include <netdb.h>
116 #include <stdio.h>
117 #include <stdlib.h>
118 #include <string.h>
119-#include <netinet/in.h>
120-#include <sys/socket.h>
121 #include <unistd.h>
122-#include <strings.h>
123-#include <time.h>
124 #include <errno.h>
125 #include <string.h>
126+#include <strings.h>
127+
128+#include <netdb.h>
129+#include <netinet/in.h>
130+#include <sys/socket.h>
131+#include <time.h>
132 #include <ctype.h>
133 #include <assert.h>
134 #include <fcntl.h>
135diff --git a/net.c b/net.c
136index 1c8d28f..d648804 100644
137--- a/net.c
138+++ b/net.c
139@@ -16,7 +16,7 @@
140 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
141 */
142
143-#include <config.h>
144+#include "config.h"
145
146 #if defined(HAVE_SYS_XTI_H)
147 #include <sys/xti.h>
148@@ -1562,4 +1562,4 @@ void net_harvest_fds(void)
149 net_add_fds(&writefd, &maxfd);
150 select(maxfd, NULL, &writefd, NULL, &tv);
151 net_process_fds(&writefd);
152-}
153\ No newline at end of file
154+}
155diff --git a/raw.c b/raw.c
156index 8b0df47..0e1f4f4 100644
157--- a/raw.c
158+++ b/raw.c
159@@ -18,7 +18,8 @@
160 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
161 */
162
163-#include <config.h>
164+#include "config.h"
165+
166 #include <ctype.h>
167 #include <stdlib.h>
168 #include <stdio.h>
169@@ -27,7 +28,6 @@
170 #include <netinet/in.h>
171 #include <arpa/inet.h>
172
173-
174 #include "mtr.h"
175 #include "raw.h"
176 #include "net.h"
177diff --git a/report.c b/report.c
178index 71040e4..39b2fb2 100644
179--- a/report.c
180+++ b/report.c
181@@ -16,7 +16,8 @@
182 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
183 */
184
185-#include <config.h>
186+#include "config.h"
187+
188 #include <sys/types.h>
189 #include <stdio.h>
190 #include <netdb.h>
191diff --git a/select.c b/select.c
192index 31bfd5f..7553675 100644
193--- a/select.c
194+++ b/select.c
195@@ -16,7 +16,8 @@
196 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
197 */
198
199-#include <config.h>
200+#include "config.h"
201+
202 #include <sys/types.h>
203 #include <sys/time.h>
204 #include <stdlib.h>
205diff --git a/split.c b/split.c
206index 642353e..5ead235 100644
207--- a/split.c
208+++ b/split.c
209@@ -20,7 +20,8 @@
210 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
211 */
212
213-#include <config.h>
214+#include "config.h"
215+
216 #include <ctype.h>
217 #include <stdlib.h>
218 #include <stdio.h>