diff --git a/celt/celt_decoder.c b/celt/celt_decoder.c
index ada5938e26aefcaccf08958606d81f46be1f7594..d83d68a5bb65318d782366a141ff6c29ee2a52fd 100644
--- a/celt/celt_decoder.c
+++ b/celt/celt_decoder.c
@@ -51,7 +51,7 @@
 #include "celt_lpc.h"
 #include "vq.h"
 #include "lpcnet.h"
-#include "dnn/lpcnet_private.h"
+#include "lpcnet_private.h"
 
 /* The maximum pitch lag to allow in the pitch-based PLC. It's possible to save
    CPU time in the PLC pitch search by making this smaller than MAX_PERIOD. The
diff --git a/dnn/lpcnet.h b/dnn/lpcnet.h
index 3c1870b3a2298068b4ca60cc232cfceda8319c6a..52813c21e4ff7dfadd7cedf2001459a4cf3cb13e 100644
--- a/dnn/lpcnet.h
+++ b/dnn/lpcnet.h
@@ -32,10 +32,6 @@
 #define NB_FEATURES 20
 #define NB_TOTAL_FEATURES 36
 
-/** Number of bytes in a compressed packet. */
-#define LPCNET_COMPRESSED_SIZE 8
-/** Number of audio samples in a packet. */
-#define LPCNET_PACKET_SAMPLES (4*160)
 /** Number of audio samples in a feature frame (not for encoding/decoding). */
 #define LPCNET_FRAME_SIZE (160)
 
diff --git a/silk/API.h b/silk/API.h
index 408638831a8341afd8e38fe465837d6c8f951520..918ad696cf88ae58e606ce3b3b55472bb45e7262 100644
--- a/silk/API.h
+++ b/silk/API.h
@@ -33,7 +33,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "errors.h"
 #include "entenc.h"
 #include "entdec.h"
-#include "dnn/lpcnet_private.h"
+#include "lpcnet_private.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/silk/dred_encoder.h b/silk/dred_encoder.h
index 0e220848be605e506c45667679db5dee6d9af4eb..4c7c8b67b31a63bccd260275e844a02441d8b55d 100644
--- a/silk/dred_encoder.h
+++ b/silk/dred_encoder.h
@@ -32,9 +32,9 @@
 #include "dred_config.h"
 #include "dred_rdovae.h"
 #include "entcode.h"
-#include "dnn/lpcnet_private.h"
-#include "dnn/dred_rdovae_enc.h"
-#include "dnn/dred_rdovae_enc_data.h"
+#include "lpcnet_private.h"
+#include "dred_rdovae_enc.h"
+#include "dred_rdovae_enc_data.h"
 
 #define RESAMPLING_ORDER 8
 
diff --git a/silk/structs.h b/silk/structs.h
index 01f733b7a574cc9b2ccbdd341f64fba6ec4ef17e..0882696cf3aff2ea4de1fe59564a0074260325c6 100644
--- a/silk/structs.h
+++ b/silk/structs.h
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef NEURAL_PLC
 #include "lpcnet.h"
-#include "dnn/lpcnet_private.h"
+#include "lpcnet_private.h"
 #endif
 
 #ifdef ENABLE_NEURAL_FEC
diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index e0949f8c3b6b5d2eb9978a207dd2e555c770245b..88571157dce0e4a254eb6b7a11814d667b3f946e 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -51,7 +51,7 @@
 #include "define.h"
 #include "mathops.h"
 #include "cpu_support.h"
-#include "dnn/dred_rdovae_dec_data.h"
+#include "dred_rdovae_dec_data.h"
 
 struct OpusDecoder {
    int          celt_dec_offset;