[PATCH 2/2] Include config.h from compat.h

[Ladislav Michl]

compat.h configuration depends on defines from config.h, however
it does not include it. Explicitely include config.h and remove
it from all files which did so only to satisfy compat.h
configuration.
---
 common/cfgreader.c         | 1 -
 common/compat.c            | 1 -
 common/data/at-emulator.c  | 4 +---
 common/data/datapump.c     | 5 +----
 common/data/rlp-common.c   | 2 --
 common/device.c            | 1 -
 common/devices/unixirda.c  | 3 +--
 common/gsm-api.c           | 2 --
 common/gsm-bitmaps.c       | 2 --
 common/gsm-common.c        | 2 --
 common/gsm-encoding.c      | 2 --
 common/gsm-error.c         | 1 -
 common/gsm-filetypes.c     | 1 -
 common/gsm-networks.c      | 2 --
 common/gsm-ringtones.c     | 1 -
 common/ldif.c              | 2 --
 common/libfunctions.c      | 1 -
 common/links/atbus.c       | 2 --
 common/links/cbus.c        | 1 -
 common/links/fbus-3110.c   | 2 --
 common/links/fbus-phonet.c | 2 --
 common/links/fbus.c        | 2 --
 common/links/gnbus.c       | 2 --
 common/links/m2bus.c       | 2 --
 common/links/utils.c       | 2 --
 common/map.c               | 1 -
 common/misc.c              | 1 -
 common/nokia-decoding.c    | 5 ++---
 common/phones/ateric.c     | 2 --
 common/phones/atlg.c       | 2 --
 common/phones/atmot.c      | 2 --
 common/phones/atnok.c      | 2 --
 common/phones/atsag.c      | 2 --
 common/phones/atsam.c      | 2 --
 common/phones/atsie.c      | 2 --
 common/phones/atsoer.c     | 2 --
 common/phones/dc2711.c     | 2 --
 common/phones/fake.c       | 2 --
 common/phones/gnapplet.c   | 1 -
 common/phones/nk3110.c     | 1 -
 common/phones/nk6100.c     | 1 -
 common/phones/nk6160.c     | 1 -
 common/phones/nk6510.c     | 2 --
 common/phones/nk7110.c     | 2 --
 common/phones/nokia.c      | 2 --
 common/pkt.c               | 1 -
 common/vcal.c              | 2 --
 common/vcal.lx             | 3 ---
 common/vcard.c             | 2 --
 gnokii/gnokii-calendar.c   | 3 +--
 gnokii/gnokii-dial.c       | 1 -
 gnokii/gnokii-file.c       | 3 +--
 gnokii/gnokii-logo.c       | 3 +--
 gnokii/gnokii-mms.c        | 3 +--
 gnokii/gnokii-monitor.c    | 3 +--
 gnokii/gnokii-other.c      | 3 +--
 gnokii/gnokii-phonebook.c  | 3 +--
 gnokii/gnokii-profile.c    | 3 +--
 gnokii/gnokii-ringtone.c   | 3 +--
 gnokii/gnokii-security.c   | 3 +--
 gnokii/gnokii-settings.c   | 3 +--
 gnokii/gnokii-sms.c        | 3 +--
 gnokii/gnokii-todo.c       | 3 +--
 gnokii/gnokii-utils.c      | 3 +--
 gnokii/gnokii-wap.c        | 3 +--
 gnokii/gnokii.c            | 3 +--
 include/compat.h           | 8 ++++++++
 smsd/smsd.h                | 1 -
 68 files changed, 29 insertions(+), 122 deletions(-)

diff --git a/common/cfgreader.c b/common/cfgreader.c
index abf2ae4e..5204f82d 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -20,7 +20,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 #include "misc.h"
 
diff --git a/common/compat.c b/common/compat.c
index a1e1a9b5..35673caa 100644
--- a/common/compat.c
+++ b/common/compat.c
@@ -13,7 +13,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 
 #ifdef WIN32
diff --git a/common/data/at-emulator.c b/common/data/at-emulator.c
index 52a1c104..2071b401 100644
--- a/common/data/at-emulator.c
+++ b/common/data/at-emulator.c
@@ -16,8 +16,6 @@
 
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -34,9 +32,9 @@
 #  include <termios.h>
 #endif
 
+#include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
-#include "compat.h"
 #include "data/at-emulator.h"
 #include "data/datapump.h"
 
diff --git a/common/data/datapump.c b/common/data/datapump.c
index 891facc0..b8ce95cc 100644
--- a/common/data/datapump.c
+++ b/common/data/datapump.c
@@ -18,8 +18,6 @@
 
 #define                __data_datapump_c
 
-#include "config.h"
-
 #include <stdio.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -31,10 +29,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-
+#include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
-#include "compat.h"
 #include "device.h"
 #include "data/at-emulator.h"
 #include "data/datapump.h"
diff --git a/common/data/rlp-common.c b/common/data/rlp-common.c
index cad47f21..19d9bf87 100644
--- a/common/data/rlp-common.c
+++ b/common/data/rlp-common.c
@@ -18,8 +18,6 @@
 
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/common/device.c b/common/device.c
index 794106b7..68257955 100644
--- a/common/device.c
+++ b/common/device.c
@@ -14,7 +14,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
diff --git a/common/devices/unixirda.c b/common/devices/unixirda.c
index 96b9a58a..0a175ed3 100644
--- a/common/devices/unixirda.c
+++ b/common/devices/unixirda.c
@@ -13,10 +13,9 @@
  *
  */
 
-#include "config.h"
+#include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
-#include "compat.h"
 
 #ifdef HAVE_IRDA
 
diff --git a/common/gsm-api.c b/common/gsm-api.c
index 1a1dc8ca..d634227d 100644
--- a/common/gsm-api.c
+++ b/common/gsm-api.c
@@ -25,8 +25,6 @@
 
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/common/gsm-bitmaps.c b/common/gsm-bitmaps.c
index 3dcaedf7..cf6a20fd 100644
--- a/common/gsm-bitmaps.c
+++ b/common/gsm-bitmaps.c
@@ -19,8 +19,6 @@
 
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/common/gsm-common.c b/common/gsm-common.c
index 02d0ec3c..54fc3d69 100644
--- a/common/gsm-common.c
+++ b/common/gsm-common.c
@@ -13,8 +13,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include "compat.h"
 #include "gnokii.h"
diff --git a/common/gsm-encoding.c b/common/gsm-encoding.c
index bcf55cc5..dfd81941 100644
--- a/common/gsm-encoding.c
+++ b/common/gsm-encoding.c
@@ -16,8 +16,6 @@
 
 */
 
-#include "config.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/common/gsm-error.c b/common/gsm-error.c
index 35fbc057..8d171808 100644
--- a/common/gsm-error.c
+++ b/common/gsm-error.c
@@ -15,7 +15,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c
index 85e73d0b..dc049f76 100644
--- a/common/gsm-filetypes.c
+++ b/common/gsm-filetypes.c
@@ -18,7 +18,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 
 #include <stdio.h>
diff --git a/common/gsm-networks.c b/common/gsm-networks.c
index 8632321c..05069715 100644
--- a/common/gsm-networks.c
+++ b/common/gsm-networks.c
@@ -14,8 +14,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 
 #include "compat.h"
diff --git a/common/gsm-ringtones.c b/common/gsm-ringtones.c
index 8fcf78dc..69fa3ebf 100644
--- a/common/gsm-ringtones.c
+++ b/common/gsm-ringtones.c
@@ -16,7 +16,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 #include "gnokii.h"
 #include "misc.h"
diff --git a/common/ldif.c b/common/ldif.c
index a590b218..e9e6391e 100644
--- a/common/ldif.c
+++ b/common/ldif.c
@@ -14,8 +14,6 @@
 
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/common/libfunctions.c b/common/libfunctions.c
index a056f8ab..d72cf4aa 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -26,7 +26,6 @@
 # define GNOKII_DEPRECATED /* do not warn about deprecated functions here */
 #endif
 
-#include "config.h"
 #include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
diff --git a/common/links/atbus.c b/common/links/atbus.c
index 36303683..59f9f134 100644
--- a/common/links/atbus.c
+++ b/common/links/atbus.c
@@ -14,8 +14,6 @@
 
 */
 
-#include "config.h"
-
 /* System header files */
 #include <stdio.h>
 #include <string.h>
diff --git a/common/links/cbus.c b/common/links/cbus.c
index 59bf64b0..bfa3f898 100644
--- a/common/links/cbus.c
+++ b/common/links/cbus.c
@@ -16,7 +16,6 @@
 
 #include <errno.h>
 
-#include "config.h"
 #include "compat.h"
 #include "device.h"
 #include "misc.h"
diff --git a/common/links/fbus-3110.c b/common/links/fbus-3110.c
index a8708676..b4d8ea41 100644
--- a/common/links/fbus-3110.c
+++ b/common/links/fbus-3110.c
@@ -19,8 +19,6 @@
 
 */
 
-#include "config.h"
-
 /* System header files */
 
 #include <stdio.h>
diff --git a/common/links/fbus-phonet.c b/common/links/fbus-phonet.c
index 276de1d6..66cd99d0 100644
--- a/common/links/fbus-phonet.c
+++ b/common/links/fbus-phonet.c
@@ -20,8 +20,6 @@
 
 */
 
-#include "config.h"
-
 /* System header files */
 #include <stdio.h>
 #include <string.h>
diff --git a/common/links/fbus.c b/common/links/fbus.c
index 7c49fd14..8429d5fa 100644
--- a/common/links/fbus.c
+++ b/common/links/fbus.c
@@ -21,8 +21,6 @@
 
 */
 
-#include "config.h"
-
 /* System header files */
 
 #include <stdio.h>
diff --git a/common/links/gnbus.c b/common/links/gnbus.c
index 8fd45a02..7f68d150 100644
--- a/common/links/gnbus.c
+++ b/common/links/gnbus.c
@@ -17,8 +17,6 @@
 
 */
 
-#include "config.h"
-
 /* System header files */
 
 #include <stdio.h>
diff --git a/common/links/m2bus.c b/common/links/m2bus.c
index b32cdb66..8925f6ec 100644
--- a/common/links/m2bus.c
+++ b/common/links/m2bus.c
@@ -19,8 +19,6 @@
 
 */
 
-#include "config.h"
-
 /* System header files */
 
 #include <stdio.h>
diff --git a/common/links/utils.c b/common/links/utils.c
index f7e5fc24..26cf1262 100644
--- a/common/links/utils.c
+++ b/common/links/utils.c
@@ -13,8 +13,6 @@
 
 */
 
-#include "config.h"
-
 /* System header files */
 #include <stdio.h>
 #include <string.h>
diff --git a/common/map.c b/common/map.c
index 675aa75e..81244dda 100644
--- a/common/map.c
+++ b/common/map.c
@@ -12,7 +12,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 #include "map.h"
 #include "misc.h"
diff --git a/common/misc.c b/common/misc.c
index f06e5817..421e1847 100644
--- a/common/misc.c
+++ b/common/misc.c
@@ -21,7 +21,6 @@
 
 */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/common/nokia-decoding.c b/common/nokia-decoding.c
index ee7a77a2..1996ef2c 100644
--- a/common/nokia-decoding.c
+++ b/common/nokia-decoding.c
@@ -20,13 +20,12 @@
 
 */
 
-#include "config.h"
-
 #include <time.h>
+
+#include "compat.h"
 #include "gnokii-internal.h"
 #include "gnokii.h"
 #include "nokia-decoding.h"
-#include "compat.h"
 
 /**
  * nokia_phonebook_error:
diff --git a/common/phones/ateric.c b/common/phones/ateric.c
index 5eefc4d0..6454a49e 100644
--- a/common/phones/ateric.c
+++ b/common/phones/ateric.c
@@ -14,8 +14,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/atlg.c b/common/phones/atlg.c
index c81c5402..638fd328 100644
--- a/common/phones/atlg.c
+++ b/common/phones/atlg.c
@@ -13,8 +13,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/atmot.c b/common/phones/atmot.c
index 8c740fbb..83970d1c 100644
--- a/common/phones/atmot.c
+++ b/common/phones/atmot.c
@@ -13,8 +13,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/atnok.c b/common/phones/atnok.c
index b7243e83..d049e29a 100644
--- a/common/phones/atnok.c
+++ b/common/phones/atnok.c
@@ -15,8 +15,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/atsag.c b/common/phones/atsag.c
index 44503225..54addf0a 100644
--- a/common/phones/atsag.c
+++ b/common/phones/atsag.c
@@ -13,8 +13,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/atsam.c b/common/phones/atsam.c
index 7aa85f9c..c4b70cd0 100644
--- a/common/phones/atsam.c
+++ b/common/phones/atsam.c
@@ -15,8 +15,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/atsie.c b/common/phones/atsie.c
index bff42bc9..6fcbfeef 100644
--- a/common/phones/atsie.c
+++ b/common/phones/atsie.c
@@ -14,8 +14,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/atsoer.c b/common/phones/atsoer.c
index 5a4d8ce6..8fa1d26f 100644
--- a/common/phones/atsoer.c
+++ b/common/phones/atsoer.c
@@ -14,8 +14,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/dc2711.c b/common/phones/dc2711.c
index 1b2ec30d..3ab47b8f 100644
--- a/common/phones/dc2711.c
+++ b/common/phones/dc2711.c
@@ -16,8 +16,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/common/phones/fake.c b/common/phones/fake.c
index 9a7769e6..ccf24c74 100644
--- a/common/phones/fake.c
+++ b/common/phones/fake.c
@@ -13,8 +13,6 @@
 
 */
 
-#include "config.h"
-
 #include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
diff --git a/common/phones/gnapplet.c b/common/phones/gnapplet.c
index 5be21175..c5e13698 100644
--- a/common/phones/gnapplet.c
+++ b/common/phones/gnapplet.c
@@ -13,7 +13,6 @@
 
 */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/nk3110.c b/common/phones/nk3110.c
index abec7de4..853f7403 100644
--- a/common/phones/nk3110.c
+++ b/common/phones/nk3110.c
@@ -16,7 +16,6 @@
 
 */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/nk6100.c b/common/phones/nk6100.c
index 8251882e..04b2d7bc 100644
--- a/common/phones/nk6100.c
+++ b/common/phones/nk6100.c
@@ -17,7 +17,6 @@
 
 */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/nk6160.c b/common/phones/nk6160.c
index 552c4159..74ecb716 100644
--- a/common/phones/nk6160.c
+++ b/common/phones/nk6160.c
@@ -13,7 +13,6 @@
 
 */
 
-#include "config.h"
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 679f1dc2..b78b04fb 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -17,8 +17,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/nk7110.c b/common/phones/nk7110.c
index b8dcbdf0..c49707e7 100644
--- a/common/phones/nk7110.c
+++ b/common/phones/nk7110.c
@@ -22,8 +22,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/common/phones/nokia.c b/common/phones/nokia.c
index 2688da58..1d23eb5c 100644
--- a/common/phones/nokia.c
+++ b/common/phones/nokia.c
@@ -18,8 +18,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 
 #include "compat.h"
diff --git a/common/pkt.c b/common/pkt.c
index 3ce05c25..795b0225 100644
--- a/common/pkt.c
+++ b/common/pkt.c
@@ -12,7 +12,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 
 #include <stdio.h>
diff --git a/common/vcal.c b/common/vcal.c
index 8483bbbe..a0d953e0 100644
--- a/common/vcal.c
+++ b/common/vcal.c
@@ -11,8 +11,6 @@
 
 */
 
-#include "config.h"
-
 #include <string.h>
 
 #include "compat.h"
diff --git a/common/vcal.lx b/common/vcal.lx
index 08f9c11b..345e9a56 100644
--- a/common/vcal.lx
+++ b/common/vcal.lx
@@ -11,11 +11,8 @@
 */
 
 %{
-#include "config.h"
-
 #include <string.h>
 
-#include "config.h"
 #include "compat.h"
 #include "misc.h"
 #include "gnokii.h"
diff --git a/common/vcard.c b/common/vcard.c
index 5dbbf6e0..de447c94 100644
--- a/common/vcard.c
+++ b/common/vcard.c
@@ -11,8 +11,6 @@
 
  */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/gnokii/gnokii-calendar.c b/gnokii/gnokii-calendar.c
index e32bf769..d4c588e9 100644
--- a/gnokii/gnokii-calendar.c
+++ b/gnokii/gnokii-calendar.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-dial.c b/gnokii/gnokii-dial.c
index 57e8352b..e51972f3 100644
--- a/gnokii/gnokii-dial.c
+++ b/gnokii/gnokii-dial.c
@@ -21,7 +21,6 @@
 
 */
 
-#include "config.h"
 #include "compat.h"
 
 #include <stdio.h>
diff --git a/gnokii/gnokii-file.c b/gnokii/gnokii-file.c
index 933a8001..37960bda 100644
--- a/gnokii/gnokii-file.c
+++ b/gnokii/gnokii-file.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-logo.c b/gnokii/gnokii-logo.c
index 1613d2f7..ef35423e 100644
--- a/gnokii/gnokii-logo.c
+++ b/gnokii/gnokii-logo.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #include <sys/stat.h>
diff --git a/gnokii/gnokii-mms.c b/gnokii/gnokii-mms.c
index 331cc399..868dd996 100644
--- a/gnokii/gnokii-mms.c
+++ b/gnokii/gnokii-mms.c
@@ -13,9 +13,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #include <getopt.h>
diff --git a/gnokii/gnokii-monitor.c b/gnokii/gnokii-monitor.c
index 7fde06c5..aa73ba8a 100644
--- a/gnokii/gnokii-monitor.c
+++ b/gnokii/gnokii-monitor.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-other.c b/gnokii/gnokii-other.c
index 278ade8f..abd8702f 100644
--- a/gnokii/gnokii-other.c
+++ b/gnokii/gnokii-other.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-phonebook.c b/gnokii/gnokii-phonebook.c
index dc6dad49..6998de23 100644
--- a/gnokii/gnokii-phonebook.c
+++ b/gnokii/gnokii-phonebook.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-profile.c b/gnokii/gnokii-profile.c
index 9f6b4f4e..217afd8e 100644
--- a/gnokii/gnokii-profile.c
+++ b/gnokii/gnokii-profile.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-ringtone.c b/gnokii/gnokii-ringtone.c
index 273bdacb..db01a4d5 100644
--- a/gnokii/gnokii-ringtone.c
+++ b/gnokii/gnokii-ringtone.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-security.c b/gnokii/gnokii-security.c
index b08baced..bc4904ff 100644
--- a/gnokii/gnokii-security.c
+++ b/gnokii/gnokii-security.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-settings.c b/gnokii/gnokii-settings.c
index a615a9be..c49c7ae8 100644
--- a/gnokii/gnokii-settings.c
+++ b/gnokii/gnokii-settings.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-sms.c b/gnokii/gnokii-sms.c
index 7beef878..dc54cc92 100644
--- a/gnokii/gnokii-sms.c
+++ b/gnokii/gnokii-sms.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #if defined(WIN32) && !defined(CYGWIN)
 #  include <process.h>
diff --git a/gnokii/gnokii-todo.c b/gnokii/gnokii-todo.c
index 74050868..bd845897 100644
--- a/gnokii/gnokii-todo.c
+++ b/gnokii/gnokii-todo.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii-utils.c b/gnokii/gnokii-utils.c
index bd14bb59..963d1836 100644
--- a/gnokii/gnokii-utils.c
+++ b/gnokii/gnokii-utils.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/gnokii/gnokii-wap.c b/gnokii/gnokii-wap.c
index eb91f725..9df932ce 100644
--- a/gnokii/gnokii-wap.c
+++ b/gnokii/gnokii-wap.c
@@ -21,9 +21,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifndef _GNU_SOURCE
diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 7d757815..5f45c7b6 100644
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -22,9 +22,8 @@
 
 */
 
-#include "config.h"
-#include "misc.h"
 #include "compat.h"
+#include "misc.h"
 
 #include <stdio.h>
 #ifdef HAVE_STDLIB_H
diff --git a/include/compat.h b/include/compat.h
index 009f5f0e..acb91fc6 100644
--- a/include/compat.h
+++ b/include/compat.h
@@ -18,6 +18,14 @@
 #ifndef        _gnokii_compat_h
 #define        _gnokii_compat_h
 
+#if defined(HAVE_CONFIG_H)
+#  include "config.h"
+
+#else
+#  error "compat.h requires config.h"
+
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/smsd/smsd.h b/smsd/smsd.h
index a5d4ddff..9eceac83 100644
--- a/smsd/smsd.h
+++ b/smsd/smsd.h
@@ -14,7 +14,6 @@
 #ifndef SMSD_H
 #define SMSD_H
 
-#include "config.h"
 #include "compat.h"
 
 #include "gnokii.h"
-- 
2.20.0.rc2