diff --git a/src/librnode.c b/src/librnode.c
index f7e090f..73d5bf4 100755
--- a/src/librnode.c
+++ b/src/librnode.c
@@ -11,27 +11,7 @@
  * with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include <string.h>
-#include <time.h>
-#include <sys/types.h>
-#include <md5.h>
-#include <openssl/sha.h>
-#include <libgen.h>
-#include <time.h>
-
 #include "librnode.h"
-#include "libs/framing.h"
-#include "libs/serial.h"
-#include "libs/logging/log.h"
-#include "libs/util.h"
-#include "libs/slip_enc.h"
-#include "libs/eeprom.h"
-#include "libs/zip.h"
-
-// flashing
-#include "libs/flashers/nrf/dfu.h"
-#include "libs/flashers/nrf/uart_drv.h"
-#include "libs/flashers/esp32/esputil.h"
 
 /* Handles incoming RNode communications from serial
  * Scope: private
diff --git a/src/librnode.h b/src/librnode.h
index ac4a22f..e2e58e2 100644
--- a/src/librnode.h
+++ b/src/librnode.h
@@ -15,11 +15,26 @@
 
 #define LIBRNODE_H
 
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#include <md5.h>
+#include <openssl/sha.h>
+#include <libgen.h>
+#include <time.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 
+#include "libs/framing.h"
+#include "libs/serial.h"
+#include "libs/logging/log.h"
+#include "libs/util.h"
+#include "libs/slip_enc.h"
+#include "libs/eeprom.h"
+#include "libs/zip.h"
+
 #define MIN_FW_VER 1.66
 
 // PLATFORMS
@@ -519,5 +534,9 @@ int rnode_flash(struct RNode* rn, char* zip_path, bool update, uint8_t* serial,
 
 int rnode_cleanup(struct RNode* rn);
 
+// flashing
+#include "libs/flashers/nrf/dfu.h"
+#include "libs/flashers/nrf/uart_drv.h"
+#include "libs/flashers/esp32/esputil.h"
 
 #endif