diff --git a/programs/bpf/rust/ristretto/src/ristretto.rs b/programs/bpf/rust/ristretto/src/ristretto.rs
index 43034f04908c50..76f652ad1502d3 100644
--- a/programs/bpf/rust/ristretto/src/ristretto.rs
+++ b/programs/bpf/rust/ristretto/src/ristretto.rs
@@ -1,5 +1,5 @@
 use curve25519_dalek::{ristretto::RistrettoPoint, scalar::Scalar};
-use solana_program_sdk::{entrypoint::SUCCESS, program_error::ProgramError};
+use solana_program_sdk::program_error::ProgramError;
 
 /// Multiply a ristretto point with a scalar
 ///
@@ -37,7 +37,7 @@ pub fn ristretto_mul(
             )
         };
         match status {
-            SUCCESS => Ok(result),
+            solana_program_sdk::entrypoint::SUCCESS => Ok(result),
             _ => Err(status.into()),
         }
     }
diff --git a/sdk/program/src/lib.rs b/sdk/program/src/lib.rs
index 67650c7d0bc810..3deffd4962849e 100644
--- a/sdk/program/src/lib.rs
+++ b/sdk/program/src/lib.rs
@@ -5,8 +5,8 @@
 extern crate self as solana_program_sdk;
 
 pub mod account;
-pub mod account_utils;
 pub mod account_info;
+pub mod account_utils;
 pub mod bpf_loader;
 pub mod bpf_loader_deprecated;
 pub mod clock;
diff --git a/sdk/program/src/sysvar/instructions.rs b/sdk/program/src/sysvar/instructions.rs
index 9582c688a70415..7aad1843bdfb08 100644
--- a/sdk/program/src/sysvar/instructions.rs
+++ b/sdk/program/src/sysvar/instructions.rs
@@ -1,10 +1,6 @@
 //! This account contains the serialized transaction instructions
 
-use crate::{
-    instruction::Instruction,
-    sanitize::SanitizeError,
-    sysvar::Sysvar,
-};
+use crate::{instruction::Instruction, sanitize::SanitizeError, sysvar::Sysvar};
 
 pub type Instructions = Vec<Instruction>;
 
diff --git a/sdk/src/epoch_schedule.rs b/sdk/src/epoch_schedule.rs
index 7b7c52b6c478c4..d7e18bad8ecf4e 100644
--- a/sdk/src/epoch_schedule.rs
+++ b/sdk/src/epoch_schedule.rs
@@ -1,2 +1 @@
 pub use solana_program_sdk::epoch_schedule::*;
-
diff --git a/sdk/src/secp256k1_program.rs b/sdk/src/secp256k1_program.rs
index 0d5e7b2110c6ec..12b4df7f0074c5 100644
--- a/sdk/src/secp256k1_program.rs
+++ b/sdk/src/secp256k1_program.rs
@@ -1,2 +1 @@
 pub use solana_program_sdk::secp256k1_program::*;
-
diff --git a/sdk/src/serialize_utils.rs b/sdk/src/serialize_utils.rs
index 2208f4c6e633da..dd95d314e3b59f 100644
--- a/sdk/src/serialize_utils.rs
+++ b/sdk/src/serialize_utils.rs
@@ -1,2 +1 @@
 pub use solana_program_sdk::serialize_utils::*;
-
diff --git a/sdk/src/slot_history.rs b/sdk/src/slot_history.rs
index cefa258cc107ef..2e9971f2a30af8 100644
--- a/sdk/src/slot_history.rs
+++ b/sdk/src/slot_history.rs
@@ -1,2 +1 @@
 pub use solana_program_sdk::slot_history::*;
-
diff --git a/sdk/src/stake_history.rs b/sdk/src/stake_history.rs
index 77aa6d1c9a06a3..565c72b6e5dcce 100644
--- a/sdk/src/stake_history.rs
+++ b/sdk/src/stake_history.rs
@@ -1,2 +1 @@
 pub use solana_program_sdk::stake_history::*;
-