Cleanup include

phaag · Mar 1, 2024 · 5cdc989 · 5cdc989
1 parent 539902c
commit 5cdc989
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/src/lib/nffile.c b/src/lib/nffile.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2004-2023, Peter Haag
+ *  Copyright (c) 2004-2024, Peter Haag
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -27,21 +27,29 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#include "nffile.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <arpa/inet.h>
 #include <assert.h>
 
+#include "nffile.h"
+
 #ifdef HAVE_BZIP2
 #include <bzlib.h>
 #endif
+
 #ifdef HAVE_ZSTD
 #include <zstd.h>
 #endif
+
 #ifdef HAVE_LZ4
 #include <lz4.h>
 #include <lz4hc.h>
 #endif
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/netflow/netflow_v1.c b/src/netflow/netflow_v1.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2009-2023, Peter Haag
+ *  Copyright (c) 2009-2024, Peter Haag
  *  Copyright (c) 2004-2008, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
  *  All rights reserved.
  *
@@ -29,27 +29,21 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "netflow_v1.h"
 
 #include <arpa/inet.h>
 #include <errno.h>
 #include <netinet/in.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 #include "collector.h"
 #include "metric.h"
-#include "netflow_v1.h"
 #include "nfdump.h"
 #include "nffile.h"
 #include "nfnet.h"

diff --git a/src/netflow/nfd_raw.c b/src/netflow/nfd_raw.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2023, Peter Haag
+ *  Copyright (c) 2024, Peter Haag
  *  All rights reserved.
  *
  *  Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "nfd_raw.h"
 
 #include <arpa/inet.h>
 #include <errno.h>
@@ -46,7 +44,6 @@
 #include "bookkeeper.h"
 #include "collector.h"
 #include "metric.h"
-#include "nfd_raw.h"
 #include "nfdump.h"
 #include "nffile.h"
 #include "nfnet.h"