Align with legacy_6x.

* Normalize include order.
* Backport missed bug fixes.
* Remove dead code.

1 files changed, 1 insertions, 1 deletions

diff --git a/smbutil.c b/smbutil.c
index d1d127fc..66f5d565 100644
--- a/smbutil.c
+++ b/smbutil.c
@@ -1,3 +1,4 @@
+#include "fetchmail.h"
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -7,7 +8,6 @@
 #include "ntlm.h"
 #include "smbencrypt.h"
 #include "smbbyteorder.h"
-#include "fetchmail.h"
 
 char versionString[] ="libntlm version 0.21";