diff --git a/src/sst/core/activity.h b/src/sst/core/activity.h
index 07e08cb89..046f4fd8d 100644
--- a/src/sst/core/activity.h
+++ b/src/sst/core/activity.h
@@ -136,7 +136,7 @@ class Activity : public SST::Core::MemPoolItem
 
 
     /** Function which will be called when the time for this Activity comes to pass. */
-    virtual void execute(void) = 0;
+    virtual void execute() = 0;
 
     /** Set the time for which this Activity should be delivered */
     inline void setDeliveryTime(SimTime_t time) { delivery_time = time; }
diff --git a/src/sst/core/baseComponent.h b/src/sst/core/baseComponent.h
index fa075693d..e8e4c3036 100644
--- a/src/sst/core/baseComponent.h
+++ b/src/sst/core/baseComponent.h
@@ -92,7 +92,7 @@ class BaseComponent : public SST::Core::Serialization::serializable_base
     /** Called when SIGINT or SIGTERM has been seen.
      * Allows components opportunity to clean up external state.
      */
-    virtual void emergencyShutdown(void) {}
+    virtual void emergencyShutdown() {}
 
     /** Returns Component/SubComponent Name */
     inline const std::string& getName() const { return my_info->getName(); }
diff --git a/src/sst/core/checkpointAction.cc b/src/sst/core/checkpointAction.cc
index 67fcaf07b..9644e72b1 100644
--- a/src/sst/core/checkpointAction.cc
+++ b/src/sst/core/checkpointAction.cc
@@ -73,7 +73,7 @@ CheckpointAction::~CheckpointAction() {}
 
 // Generate checkpoint on simulation time period
 void
-CheckpointAction::execute(void)
+CheckpointAction::execute()
 {
     Simulation_impl* sim = Simulation_impl::getSimulation();
     createCheckpoint(sim);
diff --git a/src/sst/core/checkpointAction.h b/src/sst/core/checkpointAction.h
index 0b3aa1524..7a4eaf15f 100644
--- a/src/sst/core/checkpointAction.h
+++ b/src/sst/core/checkpointAction.h
@@ -70,7 +70,7 @@ class CheckpointAction : public Action
     void setCheckpoint();
 
     /** Called by TimeVortex to trigger checkpoint on simulation clock interval - not used in parallel simulation */
-    void execute(void) override;
+    void execute() override;
 
     /** Called by SyncManager to check whether a checkpoint should be generated */
     SimTime_t check(SimTime_t current_time);
diff --git a/src/sst/core/clock.cc b/src/sst/core/clock.cc
index 27c68c204..082e498c4 100644
--- a/src/sst/core/clock.cc
+++ b/src/sst/core/clock.cc
@@ -82,7 +82,7 @@ Clock::getNextCycle()
 }
 
 void
-Clock::execute(void)
+Clock::execute()
 {
     Simulation_impl* sim = Simulation_impl::getSimulation();
 
diff --git a/src/sst/core/clock.h b/src/sst/core/clock.h
index 5868b40b3..eb53709a2 100644
--- a/src/sst/core/clock.h
+++ b/src/sst/core/clock.h
@@ -107,7 +107,7 @@ class Clock : public Action
 
     Clock() {}
 
-    void execute(void) override;
+    void execute() override;
 
     Cycle_t            currentCycle;
     TimeConverter*     period;
diff --git a/src/sst/core/configBase.cc b/src/sst/core/configBase.cc
index f5cf196ed..644a40965 100644
--- a/src/sst/core/configBase.cc
+++ b/src/sst/core/configBase.cc
@@ -95,7 +95,7 @@ ConfigBase::parseWallTimeToSeconds(const std::string& arg, bool& success, const
 void
 ConfigBase::addOption(
     struct option opt, const char* argname, const char* desc, std::function<int(const char* arg)> callback,
-    std::vector<bool> annotations, std::function<std::string(void)> ext_help)
+    std::vector<bool> annotations, std::function<std::string()> ext_help)
 {
     // Put this into the options vector
     options.emplace_back(opt, argname, desc, callback, false, annotations, ext_help, false);
@@ -143,7 +143,7 @@ ConfigBase::addHeading(const char* desc)
     struct option     opt = { "", optional_argument, 0, 0 };
     std::vector<bool> vec;
     options.emplace_back(
-        opt, "", desc, std::function<int(const char* arg)>(), true, vec, std::function<std::string(void)>(), false);
+        opt, "", desc, std::function<int(const char* arg)>(), true, vec, std::function<std::string()>(), false);
 }
 
 std::string
@@ -287,8 +287,8 @@ ConfigBase::printExtHelp(const std::string& option)
     else {
         Util::SmartTextFormatter formatter({ 2, 5, 8 }, 1);
 
-        std::function<std::string(void)>& func = extra_help_map[option];
-        std::string                       help = func();
+        std::function<std::string()>& func = extra_help_map[option];
+        std::string                   help = func();
         formatter.append(help);
         fprintf(stderr, "%s\n", formatter.str().c_str());
     }
diff --git a/src/sst/core/configBase.h b/src/sst/core/configBase.h
index 73d63e5b4..10dd26c0c 100644
--- a/src/sst/core/configBase.h
+++ b/src/sst/core/configBase.h
@@ -38,12 +38,12 @@ struct LongOption
     std::function<int(const char* arg)> callback;
     bool                                header; // if true, desc is actually the header
     std::vector<bool>                   annotations;
-    std::function<std::string(void)>    ext_help;
+    std::function<std::string()>        ext_help;
     mutable bool                        set_cmdline;
 
     LongOption(
         struct option opt, const char* argname, const char* desc, const std::function<int(const char* arg)>& callback,
-        bool header, std::vector<bool> annotations, std::function<std::string(void)> ext_help, bool set_cmdline) :
+        bool header, std::vector<bool> annotations, std::function<std::string()> ext_help, bool set_cmdline) :
         opt(opt),
         argname(argname),
         desc(desc),
@@ -148,7 +148,7 @@ class ConfigBase
      */
     void addOption(
         struct option opt, const char* argname, const char* desc, std::function<int(const char* arg)> callback,
-        std::vector<bool> annotations, std::function<std::string(void)> ext_help = std::function<std::string(void)>());
+        std::vector<bool> annotations, std::function<std::string()> ext_help = std::function<std::string()>());
 
     /**
        Adds a heading to the usage output
@@ -222,7 +222,7 @@ class ConfigBase
     std::function<int(int num, const char* arg)> positional_args;
 
     // Map to hold extended help function calls
-    std::map<std::string, std::function<std::string(void)>> extra_help_map;
+    std::map<std::string, std::function<std::string()>> extra_help_map;
 
     // Annotations
     std::vector<AnnotationInfo> annotations_;
diff --git a/src/sst/core/configShared.cc b/src/sst/core/configShared.cc
index d5c6c1e8b..60e93773b 100644
--- a/src/sst/core/configShared.cc
+++ b/src/sst/core/configShared.cc
@@ -83,7 +83,7 @@ ConfigShared::addVerboseOptions(bool sdl_avail)
 
  */
 std::string
-ConfigShared::getLibPath(void) const
+ConfigShared::getLibPath() const
 {
     std::string fullLibPath;
 
diff --git a/src/sst/core/configShared.h b/src/sst/core/configShared.h
index 64a2f7392..e256b1254 100644
--- a/src/sst/core/configShared.h
+++ b/src/sst/core/configShared.h
@@ -141,7 +141,7 @@ class ConfigShared : public ConfigBase
     std::string libpath() const { return libpath_; }
     std::string addLibPath() const { return addlibpath_; }
 
-    std::string getLibPath(void) const;
+    std::string getLibPath() const;
 };
 
 } // namespace SST
diff --git a/src/sst/core/event.cc b/src/sst/core/event.cc
index 0aa7d3070..c48527686 100644
--- a/src/sst/core/event.cc
+++ b/src/sst/core/event.cc
@@ -26,7 +26,7 @@ const SST::Event::id_type SST::Event::NO_ID = std::make_pair(0, -1);
 Event::~Event() {}
 
 void
-Event::execute(void)
+Event::execute()
 {
     (*reinterpret_cast<HandlerBase*>(delivery_info))(this);
 }
diff --git a/src/sst/core/event.h b/src/sst/core/event.h
index c144e3fdc..737aa8167 100644
--- a/src/sst/core/event.h
+++ b/src/sst/core/event.h
@@ -159,7 +159,7 @@ class Event : public Activity
 
 
     /** Cause this event to fire */
-    void execute(void) override;
+    void execute() override;
 
     /**
        This sets the information needed to get the event properly
@@ -184,7 +184,7 @@ class Event : public Activity
     inline Link* getDeliveryLink() { return reinterpret_cast<Link*>(delivery_info); }
 
     /** Gets the link id associated with this event.  For use by SST Core only */
-    inline LinkId_t getTag(void) const { return getOrderTag(); }
+    inline LinkId_t getTag() const { return getOrderTag(); }
 
 
     /** Holds the delivery information.  This is stored as a
diff --git a/src/sst/core/exit.h b/src/sst/core/exit.h
index 9a92c9b18..b5b04efa3 100644
--- a/src/sst/core/exit.h
+++ b/src/sst/core/exit.h
@@ -72,7 +72,7 @@ class Exit : public Action
      * @return End time of the simulation
      */
     SimTime_t computeEndTime();
-    void      execute(void) override;
+    void      execute() override;
     void      check();
 
     /**
diff --git a/src/sst/core/heartbeat.cc b/src/sst/core/heartbeat.cc
index 72ee8b7fd..053849b36 100644
--- a/src/sst/core/heartbeat.cc
+++ b/src/sst/core/heartbeat.cc
@@ -56,7 +56,7 @@ SimulatorHeartbeat::schedule()
 }
 
 void
-SimulatorHeartbeat::execute(void)
+SimulatorHeartbeat::execute()
 {
     Simulation_impl* sim = Simulation_impl::getSimulation();
     const double     now = sst_get_cpu_time();
diff --git a/src/sst/core/heartbeat.h b/src/sst/core/heartbeat.h
index f7db83081..a0824f4ef 100644
--- a/src/sst/core/heartbeat.h
+++ b/src/sst/core/heartbeat.h
@@ -49,7 +49,7 @@ class SimulatorHeartbeat : public Action
     SimulatorHeartbeat(const SimulatorHeartbeat&);
 
     void           operator=(SimulatorHeartbeat const&);
-    void           execute(void) override;
+    void           execute() override;
     int            rank;
     TimeConverter* m_period;
     double         lastTime;
diff --git a/src/sst/core/interfaces/simpleNetwork.h b/src/sst/core/interfaces/simpleNetwork.h
index 56ea75d5f..55d8326a1 100644
--- a/src/sst/core/interfaces/simpleNetwork.h
+++ b/src/sst/core/interfaces/simpleNetwork.h
@@ -236,7 +236,7 @@ class SimpleNetwork : public SubComponent
     // /**
     //  * Returns a handle to the underlying SST::Link
     //  */
-    // virtual Link* getLink(void) const = 0;
+    // virtual Link* getLink() const = 0;
 
     /**
      * Send a Request to the network.
diff --git a/src/sst/core/interfaces/stdMem.h b/src/sst/core/interfaces/stdMem.h
index d71626c48..11f45b3da 100644
--- a/src/sst/core/interfaces/stdMem.h
+++ b/src/sst/core/interfaces/stdMem.h
@@ -1242,7 +1242,7 @@ class StandardMem : public SubComponent
      * @return Pointer to a Request response
      *          Upon receipt, the receiver takes responsibility for deleting the event
      */
-    virtual Request* poll(void) = 0;
+    virtual Request* poll() = 0;
 
     /**
      * Get cache/memory line size (in bytes) from the memory system
diff --git a/src/sst/core/interfaces/stringEvent.h b/src/sst/core/interfaces/stringEvent.h
index 8ab4cfa13..87a00b033 100644
--- a/src/sst/core/interfaces/stringEvent.h
+++ b/src/sst/core/interfaces/stringEvent.h
@@ -35,7 +35,7 @@ class StringEvent : public SST::Event
     virtual Event* clone() override { return new StringEvent(*this); }
 
     /** Returns the contents of this Event */
-    const std::string& getString(void) { return str; }
+    const std::string& getString() { return str; }
 
 private:
     std::string str;
diff --git a/src/sst/core/interprocess/ipctunnel.h b/src/sst/core/interprocess/ipctunnel.h
index a4bb43db5..6c9b0c2b8 100644
--- a/src/sst/core/interprocess/ipctunnel.h
+++ b/src/sst/core/interprocess/ipctunnel.h
@@ -194,7 +194,7 @@ class IPCTunnel
         }
     }
 
-    const std::string& getRegionName(void) const { return filename; }
+    const std::string& getRegionName() const { return filename; }
 
     /** return a pointer to the ShareDataType region */
     ShareDataType* getSharedData() { return sharedData; }
diff --git a/src/sst/core/interprocess/mmapchild_pin3.h b/src/sst/core/interprocess/mmapchild_pin3.h
index 01a8a2223..fb79f5d0e 100644
--- a/src/sst/core/interprocess/mmapchild_pin3.h
+++ b/src/sst/core/interprocess/mmapchild_pin3.h
@@ -94,7 +94,7 @@ class MMAPChild_Pin3
     TunnelType* getTunnel() { return tunnel; }
 
     /** Return the name of the mmap'd file */
-    const std::string& getRegionName(void) const { return filename; }
+    const std::string& getRegionName() const { return filename; }
 
 private:
     void*       shmPtr;
diff --git a/src/sst/core/interprocess/mmapparent.h b/src/sst/core/interprocess/mmapparent.h
index 1709e53c9..f7d390536 100644
--- a/src/sst/core/interprocess/mmapparent.h
+++ b/src/sst/core/interprocess/mmapparent.h
@@ -103,7 +103,7 @@ class MMAPParent
     }
 
     /** returns name of the mmap'd file */
-    const std::string& getRegionName(void) const { return filename; }
+    const std::string& getRegionName() const { return filename; }
 
     /** return the created tunnel pointer */
     TunnelType* getTunnel() { return tunnel; }
diff --git a/src/sst/core/interprocess/shmchild.h b/src/sst/core/interprocess/shmchild.h
index 7993f526a..ca1696fe2 100644
--- a/src/sst/core/interprocess/shmchild.h
+++ b/src/sst/core/interprocess/shmchild.h
@@ -95,7 +95,7 @@ class SHMChild
     TunnelType* getTunnel() { return tunnel; }
 
     /** return the name of the shared memory region */
-    const std::string& getRegionName(void) const { return filename; }
+    const std::string& getRegionName() const { return filename; }
 
 private:
     void* shmPtr;
diff --git a/src/sst/core/interprocess/shmparent.h b/src/sst/core/interprocess/shmparent.h
index 58b0b6b86..b7a2b714d 100644
--- a/src/sst/core/interprocess/shmparent.h
+++ b/src/sst/core/interprocess/shmparent.h
@@ -106,7 +106,7 @@ class SHMParent
     }
 
     /** returns name of the mmap'd region */
-    const std::string& getRegionName(void) const { return filename; }
+    const std::string& getRegionName() const { return filename; }
 
     /** return the created tunnel pointer */
     TunnelType* getTunnel() { return tunnel; }
diff --git a/src/sst/core/link.cc b/src/sst/core/link.cc
index c9e7b9c65..54805d31b 100644
--- a/src/sst/core/link.cc
+++ b/src/sst/core/link.cc
@@ -582,7 +582,7 @@ class NullEvent : public Event
     NullEvent() : Event() {}
     ~NullEvent() {}
 
-    void execute(void) override
+    void execute() override
     {
         (*reinterpret_cast<HandlerBase*>(delivery_info))(nullptr);
         delete this;
diff --git a/src/sst/core/model/python/pymodel.cc b/src/sst/core/model/python/pymodel.cc
index a7336acba..28a1b234c 100644
--- a/src/sst/core/model/python/pymodel.cc
+++ b/src/sst/core/model/python/pymodel.cc
@@ -1017,7 +1017,7 @@ static struct PyModuleDef sstModuleDef
 #endif
 
 static PyObject*
-PyInit_sst(void)
+PyInit_sst()
 {
     // Initialize our types
     PyModel_ComponentType.tp_new    = PyType_GenericNew;
@@ -1347,7 +1347,7 @@ SSTPythonModelDefinition::pushNamePrefix(const char* name)
 }
 
 void
-SSTPythonModelDefinition::popNamePrefix(void)
+SSTPythonModelDefinition::popNamePrefix()
 {
     if ( nameStack.empty() ) return;
     size_t off = nameStack.back();
diff --git a/src/sst/core/model/python/pymodel.h b/src/sst/core/model/python/pymodel.h
index 7ad7ceb83..2b319584c 100644
--- a/src/sst/core/model/python/pymodel.h
+++ b/src/sst/core/model/python/pymodel.h
@@ -77,14 +77,14 @@ class SSTPythonModelDefinition : public SSTModelDescription
 #endif
 
 public: /* Public, but private.  Called only from Python functions */
-    Config* getConfig(void) const { return config; }
+    Config* getConfig() const { return config; }
 
     bool setConfigEntryFromModel(const std::string& entryName, const std::string& value)
     {
         return setOptionFromModel(entryName, value);
     }
 
-    ConfigGraph* getGraph(void) const { return graph; }
+    ConfigGraph* getGraph() const { return graph; }
 
     Output* getOutput() const { return output; }
 
@@ -110,7 +110,7 @@ class SSTPythonModelDefinition : public SSTModelDescription
     void setLinkNoCut(const char* link_name) const { graph->setLinkNoCut(link_name); }
 
     void  pushNamePrefix(const char* name);
-    void  popNamePrefix(void);
+    void  popNamePrefix();
     char* addNamePrefix(const char* name) const;
 
     void setStatisticOutput(const char* Name) { graph->setStatisticOutput(Name); }
diff --git a/src/sst/core/oneshot.cc b/src/sst/core/oneshot.cc
index cb4d097cb..324b4cda3 100644
--- a/src/sst/core/oneshot.cc
+++ b/src/sst/core/oneshot.cc
@@ -99,7 +99,7 @@ OneShot::scheduleOneShot()
 }
 
 void
-OneShot::execute(void)
+OneShot::execute()
 {
     // Execute the OneShot when the TimeVortex tells us to go.
     // This will call all registered callbacks.
diff --git a/src/sst/core/oneshot.h b/src/sst/core/oneshot.h
index 7862c3927..e268a61b7 100644
--- a/src/sst/core/oneshot.h
+++ b/src/sst/core/oneshot.h
@@ -93,7 +93,7 @@ class OneShot : public Action
     OneShot() {}
 
     // Called by the Simulation (Activity Queue) when delay time as elapsed
-    void execute(void) override;
+    void execute() override;
 
     // Activates this OneShot object, by inserting into the simulation's
     // timeVortex for future execution.
diff --git a/src/sst/core/serialization/serializer.h b/src/sst/core/serialization/serializer.h
index fc20bc78c..d3163e03c 100644
--- a/src/sst/core/serialization/serializer.h
+++ b/src/sst/core/serialization/serializer.h
@@ -169,7 +169,7 @@ class serializer
         }
     }
 
-    // For void*, we get sizeof(void), which errors.
+    // For void*, we get sizeof(), which errors.
     // Create a wrapper that casts to char* and uses above
     template <typename Int>
     void binary(void*& buffer, Int& size)
diff --git a/src/sst/core/simulation.cc b/src/sst/core/simulation.cc
index a49dc2bd7..a30084b29 100644
--- a/src/sst/core/simulation.cc
+++ b/src/sst/core/simulation.cc
@@ -985,7 +985,7 @@ Simulation_impl::signalShutdown(bool abnormal)
 // If this version is called, we need to set the end time in the exit
 // object as well
 void
-Simulation_impl::endSimulation(void)
+Simulation_impl::endSimulation()
 {
     m_exit->setEndTime(currentSimCycle);
     endSimulation(currentSimCycle);
@@ -1232,7 +1232,7 @@ Simulation_impl::getSyncQueueDataSize() const
 }
 
 Statistics::StatisticProcessingEngine*
-Simulation_impl::getStatisticsProcessingEngine(void)
+Simulation_impl::getStatisticsProcessingEngine()
 {
     return &stat_engine;
 }
diff --git a/src/sst/core/simulation_impl.h b/src/sst/core/simulation_impl.h
index 3da5a94c3..ce0bf5737 100644
--- a/src/sst/core/simulation_impl.h
+++ b/src/sst/core/simulation_impl.h
@@ -142,7 +142,7 @@ class Simulation_impl
     static Simulation_impl* getSimulation() { return instanceMap.at(std::this_thread::get_id()); }
 
     /** Return the TimeLord associated with this Simulation */
-    static TimeLord* getTimeLord(void) { return &timeLord; }
+    static TimeLord* getTimeLord() { return &timeLord; }
 
     /** Return the base simulation Output class instance */
     static Output& getSimulationOutput() { return sim_output; }
@@ -237,7 +237,7 @@ class Simulation_impl
     }
 
     /** Returns reference to the Component Info Map */
-    const ComponentInfoMap& getComponentInfoMap(void) { return compInfoMap; }
+    const ComponentInfoMap& getComponentInfoMap() { return compInfoMap; }
 
     /** returns the component with the given ID */
     BaseComponent* getComponent(const ComponentId_t& id) const
@@ -323,7 +323,7 @@ class Simulation_impl
     SimTime_t getClockForHandler(Clock::HandlerBase* handler);
 
     /** Return the Statistic Processing Engine associated with this Simulation */
-    Statistics::StatisticProcessingEngine* getStatisticsProcessingEngine(void);
+    Statistics::StatisticProcessingEngine* getStatisticsProcessingEngine();
 
 
     friend class Link;
@@ -400,7 +400,7 @@ class Simulation_impl
 
     /** Normal Shutdown
      */
-    void endSimulation(void);
+    void endSimulation();
     void endSimulation(SimTime_t end);
 
     typedef enum {
diff --git a/src/sst/core/statapi/statengine.h b/src/sst/core/statapi/statengine.h
index 1bcac3e5d..3248be714 100644
--- a/src/sst/core/statapi/statengine.h
+++ b/src/sst/core/statapi/statengine.h
@@ -26,7 +26,7 @@
 
 /* Forward declare for Friendship */
 extern int  main(int argc, char** argv);
-extern void finalize_statEngineConfig(void);
+extern void finalize_statEngineConfig();
 
 namespace SST {
 class BaseComponent;
@@ -100,7 +100,7 @@ class StatisticProcessingEngine : public SST::Core::Serialization::serializable
 private:
     friend class SST::Simulation_impl;
     friend int ::main(int argc, char** argv);
-    friend void ::finalize_statEngineConfig(void);
+    friend void ::finalize_statEngineConfig();
 
     StatisticProcessingEngine();
     void setup(Simulation_impl* sim, ConfigGraph* graph);
diff --git a/src/sst/core/statapi/statoutputcsv.cc b/src/sst/core/statapi/statoutputcsv.cc
index b1826ea71..d4366a98d 100644
--- a/src/sst/core/statapi/statoutputcsv.cc
+++ b/src/sst/core/statapi/statoutputcsv.cc
@@ -268,7 +268,7 @@ StatisticOutputCSV::outputField(fieldHandle_t fieldHandle, double data)
 }
 
 bool
-StatisticOutputCSV::openFile(void)
+StatisticOutputCSV::openFile()
 {
     if ( m_useCompression ) {
 #ifdef HAVE_LIBZ
@@ -301,7 +301,7 @@ StatisticOutputCSV::openFile(void)
 }
 
 void
-StatisticOutputCSV::closeFile(void)
+StatisticOutputCSV::closeFile()
 {
     if ( m_useCompression ) {
 #ifdef HAVE_LIBZ
diff --git a/src/sst/core/statapi/statoutputjson.cc b/src/sst/core/statapi/statoutputjson.cc
index b19a6414a..009df5517 100644
--- a/src/sst/core/statapi/statoutputjson.cc
+++ b/src/sst/core/statapi/statoutputjson.cc
@@ -231,7 +231,7 @@ StatisticOutputJSON::outputField(fieldHandle_t UNUSED(fieldHandle), double data)
 }
 
 bool
-StatisticOutputJSON::openFile(void)
+StatisticOutputJSON::openFile()
 {
     m_hFile = fopen(m_FilePath.c_str(), "w");
 
@@ -248,7 +248,7 @@ StatisticOutputJSON::openFile(void)
 }
 
 void
-StatisticOutputJSON::closeFile(void)
+StatisticOutputJSON::closeFile()
 {
     fclose(m_hFile);
 }
diff --git a/src/sst/core/statapi/statoutputtxt.cc b/src/sst/core/statapi/statoutputtxt.cc
index 190cb6b8c..68b9a0486 100644
--- a/src/sst/core/statapi/statoutputtxt.cc
+++ b/src/sst/core/statapi/statoutputtxt.cc
@@ -311,7 +311,7 @@ StatisticOutputTextBase::outputField(fieldHandle_t fieldHandle, double data)
 
 
 bool
-StatisticOutputTextBase::openFile(void)
+StatisticOutputTextBase::openFile()
 {
     if ( !outputsToFile() ) {
         m_hFile = stdout;
@@ -349,7 +349,7 @@ StatisticOutputTextBase::openFile(void)
 }
 
 void
-StatisticOutputTextBase::closeFile(void)
+StatisticOutputTextBase::closeFile()
 {
     if ( !outputsToFile() ) return;
     if ( m_useCompression ) {
diff --git a/src/sst/core/sync/rankSyncSerialSkip.cc b/src/sst/core/sync/rankSyncSerialSkip.cc
index 7a5ef3297..29dc4a7c3 100644
--- a/src/sst/core/sync/rankSyncSerialSkip.cc
+++ b/src/sst/core/sync/rankSyncSerialSkip.cc
@@ -142,7 +142,7 @@ RankSyncSerialSkip::execute(int thread)
 }
 
 void
-RankSyncSerialSkip::exchange(void)
+RankSyncSerialSkip::exchange()
 {
 #ifdef SST_CONFIG_HAVE_MPI
     // Maximum number of outstanding requests is 3 times the number
diff --git a/src/sst/core/sync/syncManager.cc b/src/sst/core/sync/syncManager.cc
index 21c2ad956..92f95a33d 100644
--- a/src/sst/core/sync/syncManager.cc
+++ b/src/sst/core/sync/syncManager.cc
@@ -365,7 +365,7 @@ SyncManager::exchangeLinkInfo()
 }
 
 void
-SyncManager::execute(void)
+SyncManager::execute()
 {
     SST_SYNC_PROFILE_START
 
diff --git a/src/sst/core/sync/syncManager.h b/src/sst/core/sync/syncManager.h
index 07446486d..758a1c08c 100644
--- a/src/sst/core/sync/syncManager.h
+++ b/src/sst/core/sync/syncManager.h
@@ -140,7 +140,7 @@ class SyncManager : public Action
     ActivityQueue*
          registerLink(const RankInfo& to_rank, const RankInfo& from_rank, const std::string& name, Link* link);
     void exchangeLinkInfo();
-    void execute(void) override;
+    void execute() override;
 
     /** Cause an exchange of Initialization Data to occur */
     void exchangeLinkUntimedData(std::atomic<int>& msg_count);
diff --git a/src/sst/core/sync/threadSyncDirectSkip.h b/src/sst/core/sync/threadSyncDirectSkip.h
index 4bc7b800b..852f94602 100644
--- a/src/sst/core/sync/threadSyncDirectSkip.h
+++ b/src/sst/core/sync/threadSyncDirectSkip.h
@@ -41,7 +41,7 @@ class ThreadSyncDirectSkip : public ThreadSync
 
     void before() override {}
     void after() override;
-    void execute(void) override;
+    void execute() override;
 
     /** Cause an exchange of Untimed Data to occur */
     void processLinkUntimedData() override {}
diff --git a/src/sst/core/sync/threadSyncSimpleSkip.h b/src/sst/core/sync/threadSyncSimpleSkip.h
index 2b9bfe853..773fb09af 100644
--- a/src/sst/core/sync/threadSyncSimpleSkip.h
+++ b/src/sst/core/sync/threadSyncSimpleSkip.h
@@ -42,7 +42,7 @@ class ThreadSyncSimpleSkip : public ThreadSync
 
     void before() override;
     void after() override;
-    void execute(void) override;
+    void execute() override;
 
     /** Set signals to exchange during sync */
     void setSignals(int end, int usr, int alrm) override;
diff --git a/src/sst/core/testElements/coreTest_MemPoolTest.h b/src/sst/core/testElements/coreTest_MemPoolTest.h
index 21c9943e1..3e76cb7e9 100644
--- a/src/sst/core/testElements/coreTest_MemPoolTest.h
+++ b/src/sst/core/testElements/coreTest_MemPoolTest.h
@@ -162,8 +162,8 @@ class MemPoolTestComponent : public SST::Component
     ~MemPoolTestComponent() {}
 
     void eventHandler(Event* ev, int port);
-    void setup(void) override;
-    void finish(void) override;
+    void setup() override;
+    void finish() override;
     void complete(unsigned int phase) override;
 
 private: