diff --git a/rust/cbindgen.toml b/rust/cbindgen.toml
index 4798b2fc60..7af37fe963 100644
--- a/rust/cbindgen.toml
+++ b/rust/cbindgen.toml
@@ -95,21 +95,9 @@ include = [
 # A list of items to not include in the generated bindings
 # default: []
 exclude = [
-    "AppLayerDecoderEvents",
-    "AppLayerParserState",
     "CLuaState",
-    "DetectEngineState",
-    "DetectEngineThreadCtx",
-    "GenericVar",
-    "Flow",
-    "HttpRangeContainerBlock",
     "FileContainer",
-    "JsonT",
-    "IKEState",
-    "IKETransaction",
-    "TFTPState",
-    "TFTPTransaction",
-    "free",
+    "HttpRangeContainerBlock",
     "IPPROTO_TCP",
     "IPPROTO_UDP",
     "SRepCatGetByShortname",
@@ -123,7 +111,6 @@ exclude = [
     "SIGMATCH_INFO_MULTI_UINT",
     "SIGMATCH_INFO_ENUM_UINT",
     "SIGMATCH_INFO_BITFLAGS_UINT",
-    "FtpCommand",
 ]
 
 # Types of items that we'll generate. If empty, then all types of item are emitted.
@@ -148,7 +135,6 @@ item_types = ["enums","structs","opaque","functions","constants"]
 # [export]
 # prefix = "capi_"
 [export.rename]
-"JsonT" = "json_t"
 "CLuaState" = "lua_State"
 "JsonBuilder" = "SCJsonBuilder"
 "JsonBuilderMark" = "SCJsonBuilderMark"
diff --git a/src/rust.h b/src/rust.h
index d89da86b30..b99f81752d 100644
--- a/src/rust.h
+++ b/src/rust.h
@@ -21,13 +21,6 @@
 // Forward declarations needed by rust-bindings.h
 typedef struct HttpRangeContainerBlock HttpRangeContainerBlock;
 
-// These need to be removed by making rust using a generic void
-// in functions prototypes and then casting
-typedef struct IKEState_ IKEState;
-typedef struct IKETransaction_ IKETransaction;
-typedef struct TFTPState_ TFTPState;
-typedef struct TFTPTransaction_ TFTPTransaction;
-
 typedef struct DetectEngineState_ DetectEngineState;
 
 // may be improved by smaller include